support build suffixes

Author: linkdata

pkg/versioninfo.go

@@ -89,16 +89,30 @@ func (vi *VersionInfo) HasTag(tag string) bool {
 
 // IncPatch increments the patch level of the version, returning the new tag.
 func (vi *VersionInfo) IncPatch() string {
+	baseTag := vi.Tag
+	// Ignore prerelease/build suffixes when incrementing the patch level.
+	if idx := strings.IndexAny(baseTag, "-+"); idx > -1 {
+		if core := baseTag[:idx]; reMatchSemver.MatchString(core) {
+			baseTag = core
+		}
+	}
+	if !reMatchSemver.MatchString(baseTag) {
+		vi.SameTree = true
+		return vi.Tag
+	}
+	vi.Tag = baseTag
 	for strings.Count(vi.Tag, ".") < 2 {
 		vi.Tag += ".0"
 	}
 	for {
 		patchindex := strings.LastIndexByte(vi.Tag, '.') + 1
-		if patchlevel, err := strconv.Atoi(vi.Tag[patchindex:]); err == nil {
-			vi.Tag = vi.Tag[:patchindex] + strconv.Itoa(patchlevel+1)
-			if !vi.HasTag(vi.Tag) {
-				break
-			}
+		patchlevel, err := strconv.Atoi(vi.Tag[patchindex:])
+		if err != nil {
+			break
+		}
+		vi.Tag = vi.Tag[:patchindex] + strconv.Itoa(patchlevel+1)
+		if !vi.HasTag(vi.Tag) {
+			break
 		}
 	}
 	vi.SameTree = true

pkg/versioninfo_test.go

@@ -45,6 +45,20 @@ func Test_VersionInfo_IncPatch(t *testing.T) {
 	}
 }
 
+func Test_VersionInfo_IncPatch_PrereleaseTag(t *testing.T) {
+	vi := &gitsemver.VersionInfo{Tag: "v1.2.3-rc.1"}
+	if got := vi.IncPatch(); got != "v1.2.4" {
+		t.Fatalf("expected v1.2.4, got %q", got)
+	}
+}
+
+func Test_VersionInfo_IncPatch_InvalidTagNoLoop(t *testing.T) {
+	vi := &gitsemver.VersionInfo{Tag: "not-a-semver-tag"}
+	if got := vi.IncPatch(); got != "not-a-semver-tag" {
+		t.Fatalf("expected unchanged tag, got %q", got)
+	}
+}
+
 func Test_CleanBranch(t *testing.T) {
 	isEqual(t, "branch-with-dots", gitsemver.CleanBranch("-branch.with..dots"))
 	isEqual(t, "gitlab-branch", gitsemver.CleanBranch("gitlab---branch"))