fix: use regex to strip git describe suffix, fixing tags with dashes (#31)

Replace naive dash-splitting with a regex that matches the exact
-<N>-g<hex> git describe suffix pattern. The old approach broke when
tag names themselves contained dashes (e.g. v1.0.0-beta, v1.0.0-1-ios-beta).

Author: xotahal

lib/fastlane/plugin/semantic_release/actions/analyze_commits.rb

@@ -53,12 +53,11 @@ def self.get_beginning_of_next_sprint(params)
           }
         end
 
-        # Tag format is v2.3.4-5-g7685948 (see git describe man page)
-        # Strip the git describe suffix (-<count>-g<hash>) to get the tag name
-        tag_name = tag
-        if tag.split('-').length >= 3
-          tag_name = tag.split('-')[0...-2].join('-').strip
-        end
+        # git describe appends -<N>-g<hash> when HEAD is ahead of a tag.
+        # Use a regex to strip this specific suffix rather than splitting on
+        # dashes, which breaks when the tag itself contains dashes (e.g. v1.0.0-beta).
+        tag_name = tag.strip
+        tag_name = tag_name.sub(/-\d+-g[0-9a-f]+$/, '')
         parsed_version = tag_name.match(params[:tag_version_match])
 
         if parsed_version.nil?

spec/analyze_commits_spec.rb

@@ -240,6 +240,100 @@ def execute_lane_test(params)
         expect(execute_lane_test(match: 'v*')).to eq(true)
         expect(Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::RELEASE_NEXT_VERSION]).to eq("1.0.9")
       end
+
+      it "should handle tag without git describe suffix" do
+        commits = [
+          "fix: ...|"
+        ]
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag).and_return('v5.7.0')
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_commits_from_hash).and_return(commits)
+
+        expect(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag_hash).with(tag_name: 'v5.7.0', debug: false)
+        expect(execute_lane_test(match: 'v*')).to eq(true)
+        expect(Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::RELEASE_NEXT_VERSION]).to eq("5.7.1")
+      end
+
+      it "should handle hyphenated tag without git describe suffix" do
+        commits = [
+          "fix: ...|"
+        ]
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag).and_return('v1.0.0-1-ios-beta')
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_commits_from_hash).and_return(commits)
+
+        expect(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag_hash).with(tag_name: 'v1.0.0-1-ios-beta', debug: false)
+        expect(execute_lane_test(match: 'v*')).to eq(true)
+        expect(Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::RELEASE_NEXT_VERSION]).to eq("1.0.1")
+      end
+
+      it "should handle hyphenated tag with git describe suffix" do
+        commits = [
+          "fix: ...|"
+        ]
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag).and_return('v1.0.0-1-ios-beta-3-gabc1234')
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_commits_from_hash).and_return(commits)
+
+        expect(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag_hash).with(tag_name: 'v1.0.0-1-ios-beta', debug: false)
+        expect(execute_lane_test(match: 'v*')).to eq(true)
+        expect(Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::RELEASE_NEXT_VERSION]).to eq("1.0.1")
+      end
+
+      it "should handle prerelease tag (v1.0.0-beta) without git describe suffix" do
+        commits = [
+          "fix: ...|"
+        ]
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag).and_return('v1.0.0-beta')
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_commits_from_hash).and_return(commits)
+
+        expect(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag_hash).with(tag_name: 'v1.0.0-beta', debug: false)
+        expect(execute_lane_test(match: 'v*')).to eq(true)
+      end
+
+      it "should handle prerelease tag with git describe suffix" do
+        commits = [
+          "fix: ...|"
+        ]
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag).and_return('v1.0.0-beta-3-gabc1234')
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_commits_from_hash).and_return(commits)
+
+        expect(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag_hash).with(tag_name: 'v1.0.0-beta', debug: false)
+        expect(execute_lane_test(match: 'v*')).to eq(true)
+      end
+
+      it "should handle rc tag (v2.0.0-rc.1) with git describe suffix" do
+        commits = [
+          "fix: ...|"
+        ]
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag).and_return('v2.0.0-rc.1-5-g1234abc')
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_commits_from_hash).and_return(commits)
+
+        expect(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag_hash).with(tag_name: 'v2.0.0-rc.1', debug: false)
+        expect(execute_lane_test(match: 'v*')).to eq(true)
+        expect(Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::RELEASE_NEXT_VERSION]).to eq("2.0.1")
+      end
+
+      it "should handle release- prefix tag with git describe suffix" do
+        commits = [
+          "fix: ...|"
+        ]
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag).and_return('release-1.2.3-7-gdeadbeef')
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_commits_from_hash).and_return(commits)
+
+        expect(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag_hash).with(tag_name: 'release-1.2.3', debug: false)
+        expect(execute_lane_test(match: 'release-*')).to eq(true)
+        expect(Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::RELEASE_NEXT_VERSION]).to eq("1.2.4")
+      end
+
+      it "should not strip suffix-like parts from tag name" do
+        commits = [
+          "fix: ...|"
+        ]
+        # Tag v1.0.0-3-beta ends in -3-beta which looks like a suffix but isn't (beta is not g-prefixed hex)
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag).and_return('v1.0.0-3-beta')
+        allow(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_commits_from_hash).and_return(commits)
+
+        expect(Fastlane::Actions::AnalyzeCommitsAction).to receive(:get_last_tag_hash).with(tag_name: 'v1.0.0-3-beta', debug: false)
+        expect(execute_lane_test(match: 'v*')).to eq(true)
+      end
     end
 
     it "should provide codepush last version" do