add -incminor

Author: linkdata

README.md

@@ -50,6 +50,8 @@ Usage of gitsemver:
         write Go source with PkgName and PkgVersion
   -incpatch
         increment the patch level and create a new tag
+  -incminor
+        increment the minor level and create a new tag
   -name string
         override the Go PkgName, default is to use last portion of module in go.mod
   -nofetch
@@ -76,6 +78,8 @@ $ gitsemver
 v1.2.3-main.456
 $ gitsemver -incpatch
 v1.2.4
+$ gitsemver -incminor
+v1.3.0
 ```
 
 #### Generate a go package file with version information

internal/gitsemver/versioninfo.go

@@ -132,6 +132,53 @@ func (vi *VersionInfo) IncPatch() string {
 	return vi.Tag
 }
 
+// IncMinor increments the minor level of the version, returning the new tag.
+func (vi *VersionInfo) IncMinor() string {
+	baseTag := vi.Tag
+	// Ignore prerelease/build suffixes when incrementing the minor level.
+	if idx := strings.IndexAny(baseTag, "-+"); idx > -1 {
+		if core := baseTag[:idx]; isSemverTag(core) {
+			baseTag = core
+		}
+	}
+	if !isSemverTag(baseTag) {
+		vi.SameTree = true
+		return vi.Tag
+	}
+	hasVPrefix := strings.HasPrefix(baseTag, "v")
+	core := strings.TrimPrefix(baseTag, "v")
+	parts := strings.Split(core, ".")
+	major := parts[0]
+	minor := 0
+	var err error
+	if len(parts) > 1 {
+		if minor, err = strconv.Atoi(parts[1]); err != nil {
+			vi.SameTree = true
+			return vi.Tag
+		}
+	}
+	hasPatch := len(parts) >= 3
+	prefix := ""
+	if hasVPrefix {
+		prefix = "v"
+	}
+	for {
+		minor++
+		if len(parts) == 1 {
+			vi.Tag = prefix + major + "." + strconv.Itoa(minor)
+		} else if hasPatch {
+			vi.Tag = prefix + major + "." + strconv.Itoa(minor) + ".0"
+		} else {
+			vi.Tag = prefix + major + "." + strconv.Itoa(minor)
+		}
+		if !vi.HasTag(vi.Tag) {
+			break
+		}
+	}
+	vi.SameTree = true
+	return vi.Tag
+}
+
 func CleanBranch(branch string) string {
 	// SemVer pre-release identifiers only allow [0-9A-Za-z-].
 	branch = reNonSemVerPreRelease.ReplaceAllString(branch, "-")

internal/gitsemver/versioninfo_test.go

@@ -137,6 +137,69 @@ func Test_VersionInfo_IncPatch_OverflowPatchLevel(t *testing.T) {
 	}
 }
 
+func Test_VersionInfo_IncMinor_Mappings(t *testing.T) {
+	tests := []struct {
+		in   string
+		want string
+	}{
+		{in: "v1", want: "v1.1"},
+		{in: "v1.2", want: "v1.3"},
+		{in: "v1.2.3", want: "v1.3.0"},
+	}
+	for _, tt := range tests {
+		vi := &gitsemver.VersionInfo{Tag: tt.in}
+		if got := vi.IncMinor(); got != tt.want {
+			t.Fatalf("IncMinor(%q): expected %q, got %q", tt.in, tt.want, got)
+		}
+		if !vi.SameTree {
+			t.Fatalf("IncMinor(%q): expected SameTree=true", tt.in)
+		}
+	}
+}
+
+func Test_VersionInfo_IncMinor_PrereleaseTag(t *testing.T) {
+	vi := &gitsemver.VersionInfo{Tag: "v1.2.3-rc.1"}
+	if got := vi.IncMinor(); got != "v1.3.0" {
+		t.Fatalf("expected v1.3.0, got %q", got)
+	}
+	if !vi.SameTree {
+		t.Fatal("expected SameTree=true")
+	}
+}
+
+func Test_VersionInfo_IncMinor_AvoidsEquivalentPrefixCollisions(t *testing.T) {
+	vi := &gitsemver.VersionInfo{
+		Tag: "v1.2.3",
+		Tags: []gitsemver.GitTag{
+			{Tag: "v1.3.0"},
+			{Tag: "1.4.0"},
+		},
+	}
+	if got := vi.IncMinor(); got != "v1.5.0" {
+		t.Fatalf("expected v1.5.0, got %q", got)
+	}
+}
+
+func Test_VersionInfo_IncMinor_InvalidTagNoLoop(t *testing.T) {
+	vi := &gitsemver.VersionInfo{Tag: "not-a-semver-tag"}
+	if got := vi.IncMinor(); got != "not-a-semver-tag" {
+		t.Fatalf("expected unchanged tag, got %q", got)
+	}
+	if !vi.SameTree {
+		t.Fatal("expected SameTree=true for unchanged non-semver tag")
+	}
+}
+
+func Test_VersionInfo_IncMinor_OverflowMinorLevel(t *testing.T) {
+	vi := &gitsemver.VersionInfo{Tag: "v1.9999999999999999999999999"}
+	if got := vi.IncMinor(); got != "v1.9999999999999999999999999" {
+		t.Fatalf("expected unchanged overflow minor tag, got %q", got)
+	}
+	if !vi.SameTree {
+		t.Fatal("expected SameTree=true for unchanged overflow tag")
+	}
+}
+
 func Test_CleanBranch(t *testing.T) {
 	isEqual(t, "branch-with-dots", gitsemver.CleanBranch("-branch.with..dots"))
 	isEqual(t, "gitlab-branch", gitsemver.CleanBranch("gitlab---branch"))

main.go

@@ -83,6 +83,7 @@ var (
 	flagNoFetch   = flag.Bool("nofetch", false, "don't fetch remote tags")
 	flagNoNewline = flag.Bool("nonewline", false, "don't print a newline after the output")
 	flagIncPatch  = flag.Bool("incpatch", false, "increment the patch level and create a new tag")
+	flagIncMinor  = flag.Bool("incminor", false, "increment the minor level and create a new tag")
 	flagBranch    = flag.Bool("branch", false, "print the current branch name")
 	flagVersion   = flag.Bool("version", false, "print the version of gitsemver and exit")
 )
@@ -125,16 +126,24 @@ func mainfn() int {
 			if err == nil {
 				var vi gitsemver.VersionInfo
 				if vi, err = vs.GetVersion(repoDir); err == nil {
-					if *flagIncPatch {
+					if *flagIncPatch && *flagIncMinor {
+						err = errors.New("cannot use both -incpatch and -incminor")
+					}
+					if err == nil && (*flagIncPatch || *flagIncMinor) {
 						var clean bool
 						if clean, err = vs.Git.CleanStatus(repoDir, true); err == nil {
-							if !clean {
-								err = errors.New("cannot use -incpatch with uncommitted changes")
-							} else {
-								createTag = vi.IncPatch()
+							if clean {
+								if *flagIncPatch {
+									createTag = vi.IncPatch()
+								}
+								if *flagIncMinor {
+									createTag = vi.IncMinor()
+								}
 								if testMode {
 									createTag = ""
 								}
+							} else {
+								err = errors.New("cannot bump version with uncommitted changes")
 							}
 						}
 					}