feat: increment pre-release without pre-args

kyoh86 · Dec 19, 2024 · 33ef2f1 · 33ef2f1
1 parent 480ade9
commit 33ef2f1
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 2 deletions.
diff --git a/internal/manager.go b/internal/manager.go
@@ -141,7 +141,7 @@ func (m *Manager) update(
 }
 
 func (m *Manager) Release(build, msg []string, file string) (string, string, error) {
-	return m.release(build, msg, file, func(u Updater) UpdateBuild { return u.Pre() })
+	return m.release(build, msg, file, func(u Updater) UpdateBuild { return u.Release() })
 }
 
 func (m *Manager) Build(build, msg []string, file string) (string, string, error) {

diff --git a/internal/manager_test.go b/internal/manager_test.go
@@ -89,6 +89,19 @@ func TestManager(t *testing.T) {
 			assert.Equal(t, "test1.2.3-test-pre.1+test-bld.2", next)
 			assert.Equal(t, "git tag -l\ngit tag --message test-msg test1.2.3-test-pre.1+test-bld.2\n", buf.String())
 		})
+		t.Run("increment pre-release", func(t *testing.T) {
+			buf, run, man := tset()
+			run.output = strings.NewReader("test1.2.3-pre-release.4+build-ver.5\n")
+			cur, next, err := man.UpdatePre(
+				nil,
+				[]string{"test-bld", "2"},
+				[]string{"test-msg"},
+				"")
+			assert.NoError(t, err)
+			assert.Equal(t, "test1.2.3-pre-release.4+build-ver.5", cur)
+			assert.Equal(t, "test1.2.3-pre-release.5+test-bld.2", next)
+			assert.Equal(t, "git tag -l\ngit tag --message test-msg test1.2.3-pre-release.5+test-bld.2\n", buf.String())
+		})
 		t.Run("increment patch", func(t *testing.T) {
 			buf, run, man := tset()
 			run.output = strings.NewReader("test1.2.3-pre-release.4+build-ver.5\n")

diff --git a/internal/updater.go b/internal/updater.go
@@ -21,6 +21,7 @@ type Updater interface {
 type UpdatePre interface {
 	UpdateBuild
 	Pre(...semver.PRVersion) UpdateBuild
+	Release() UpdateBuild
 }
 
 type UpdateBuild interface {
@@ -65,9 +66,38 @@ func (i implUpdater) Patch() UpdatePre {
 	return next
 }
 
+func incrementPre(pre []semver.PRVersion) []semver.PRVersion {
+	if len(pre) == 0 {
+		return nil
+	}
+	for i := len(pre) - 1; i >= 0; i-- {
+		if pre[i].IsNum {
+			ret := make([]semver.PRVersion, i+1)
+			copy(ret, pre[:i+1])
+			ret[i].VersionNum += 1
+			return ret
+		}
+	}
+	ret := make([]semver.PRVersion, len(pre)+1)
+	copy(ret, pre)
+	ret[len(pre)] = semver.PRVersion{VersionNum: 2}
+	return ret
+}
+
 func (i implUpdater) Pre(p ...semver.PRVersion) UpdateBuild {
 	next := i
-	next.ver.Pre = p
+	if len(p) == 0 {
+		next.ver.Pre = incrementPre(i.ver.Pre)
+	} else {
+		next.ver.Pre = p
+	}
+	next.ver.Build = nil
+	return next
+}
+
+func (i implUpdater) Release() UpdateBuild {
+	next := i
+	next.ver.Pre = nil
 	next.ver.Build = nil
 	return next
 }

diff --git a/internal/updater_test.go b/internal/updater_test.go
@@ -18,6 +18,41 @@ func mustPRVer(t *testing.T, s string) semver.PRVersion {
 	return v
 }
 
+func TextIncrementPre(t *testing.T) {
+	t.Run("increment pre-release", func(t *testing.T) {
+		version, err := semver.Parse("1.2.3-pre-release.4+build-ver.5")
+		assert.NoError(t, err)
+		v, err := NewUpdater(version).
+			Pre().Version()
+		assert.NoError(t, err)
+		assert.Equal(t, "1.2.3-pre-release.5", v.String())
+	})
+	t.Run("incrementing pre-release, remaining words should be dropped", func(t *testing.T) {
+		version, err := semver.Parse("1.2.3-pre-release.4.x.y")
+		assert.NoError(t, err)
+		v, err := NewUpdater(version).
+			Pre().Version()
+		assert.NoError(t, err)
+		assert.Equal(t, "1.2.3-pre-release.5", v.String())
+	})
+	t.Run("incrementing pre-release without numeric suffix", func(t *testing.T) {
+		version, err := semver.Parse("1.2.3-pre-release")
+		assert.NoError(t, err)
+		v, err := NewUpdater(version).
+			Pre().Version()
+		assert.NoError(t, err)
+		assert.Equal(t, "1.2.3-pre-release.2", v.String())
+	})
+	t.Run("incrementing pre-release without pre-release never changes", func(t *testing.T) {
+		version, err := semver.Parse("1.2.3")
+		assert.NoError(t, err)
+		v, err := NewUpdater(version).
+			Pre().Version()
+		assert.NoError(t, err)
+		assert.Equal(t, "1.2.3", v.String())
+	})
+}
+
 func TestUpdater(t *testing.T) {
 	t.Run("source: pre-release+build-ver", func(t *testing.T) {
 		t.Run("set build", func(t *testing.T) {
@@ -45,6 +80,22 @@ func TestUpdater(t *testing.T) {
 			assert.NoError(t, err)
 			assert.Equal(t, "1.2.3-beta.6", v.String())
 		})
+		t.Run("increment pre-release", func(t *testing.T) {
+			version, err := semver.Parse("1.2.3-pre-release.4+build-ver.5")
+			assert.NoError(t, err)
+			v, err := NewUpdater(version).
+				Pre().Version()
+			assert.NoError(t, err)
+			assert.Equal(t, "1.2.3-pre-release.5", v.String())
+		})
+		t.Run("incrementing pre-release, remaining words should be dropped", func(t *testing.T) {
+			version, err := semver.Parse("1.2.3-pre-release.4.x.y")
+			assert.NoError(t, err)
+			v, err := NewUpdater(version).
+				Pre().Version()
+			assert.NoError(t, err)
+			assert.Equal(t, "1.2.3-pre-release.5", v.String())
+		})
 		t.Run("increment patch", func(t *testing.T) {
 			version, err := semver.Parse("1.2.3-pre-release.4+build-ver.5")
 			assert.NoError(t, err)