fix(prerelease): calculate right version if branch is set to alpha,beta or rc

internal/calculator/calculator.go

@@ -19,9 +19,9 @@ func New() *Calculator {
 }
 
 //IncPrerelease increase prerelease by one
-func (c *Calculator) IncPrerelease(preReleaseType string, version *semver.Version) (semver.Version, error) {
+func (c *Calculator) IncPrerelease(preReleaseType string, version semver.Version) (semver.Version, error) {
 	defaultPrerelease := preReleaseType + ".0"
-	if version.Prerelease() == "" || !strings.HasPrefix(version.Prerelease(), preReleaseType) {
+	if !c.hasPrerelease(version, preReleaseType) {
 		return version.SetPrerelease(defaultPrerelease)
 	}
 
@@ -32,19 +32,31 @@ func (c *Calculator) IncPrerelease(preReleaseType string, version *semver.Versio
 			log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String())
 			return version.SetPrerelease(defaultPrerelease)
 		}
-		return version.SetPrerelease(preReleaseType + "." + strconv.Itoa((i + 1)))
+		return version.SetPrerelease(preReleaseType + "." + strconv.Itoa(i+1))
 
 	}
 	log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String())
 	return version.SetPrerelease(defaultPrerelease)
 }
 
+func (c *Calculator) hasPrerelease(version semver.Version, preReleaseType string) bool {
+	if version.Prerelease() == "" || !strings.HasPrefix(version.Prerelease(), preReleaseType) {
+		return false
+	}
+	return true
+}
+
 //CalculateNewVersion from given commits and lastversion
 func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version, releaseType string, firstRelease bool) semver.Version {
 	switch releaseType {
 	case "beta", "alpha", "rc":
+		var version = *lastVersion
+		if !c.hasPrerelease(*lastVersion, releaseType) {
+			version, _ = c.inc(commits, lastVersion)
+		}
+
 		if len(commits["major"]) > 0 || len(commits["minor"]) > 0 || len(commits["patch"]) > 0 {
-			version, _ := c.IncPrerelease(releaseType, lastVersion)
+			version, _ := c.IncPrerelease(releaseType, version)
 			return version
 		}
 	case "release":
@@ -53,16 +65,23 @@ func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.Ana
 				newVersion, _ := lastVersion.SetPrerelease("")
 				return newVersion
 			}
-
-			if len(commits["major"]) > 0 {
-				return lastVersion.IncMajor()
-			} else if len(commits["minor"]) > 0 {
-				return lastVersion.IncMinor()
-			} else if len(commits["patch"]) > 0 {
-				return lastVersion.IncPatch()
+			version, done := c.inc(commits, lastVersion)
+			if done {
+				return version
 			}
 		}
 	}
 
 	return *lastVersion
 }
+
+func (c *Calculator) inc(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version) (semver.Version, bool) {
+	if len(commits["major"]) > 0 {
+		return lastVersion.IncMajor(), true
+	} else if len(commits["minor"]) > 0 {
+		return lastVersion.IncMinor(), true
+	} else if len(commits["patch"]) > 0 {
+		return lastVersion.IncPatch(), true
+	}
+	return semver.Version{}, false
+}

internal/calculator/calculator_test.go

@@ -58,9 +58,11 @@ func TestCalculator_IncPrerelease(t *testing.T) {
 	c := calculator.New()
 
 	for _, test := range testConfigs {
-		next, err := c.IncPrerelease(test.preReleaseType, test.lastVersion)
-		assert.Equalf(t, test.hasError, err != nil, "Testcase %s should have error: %t -> %s", test.testCase, test.hasError, err)
-		assert.Equal(t, test.nextVersion, next.String())
+		t.Run(test.testCase, func(t *testing.T) {
+			next, err := c.IncPrerelease(test.preReleaseType, *test.lastVersion)
+			assert.Equalf(t, test.hasError, err != nil, "Testcase %s should have error: %t -> %s", test.testCase, test.hasError, err)
+			assert.Equal(t, test.nextVersion, next.String())
+		})
 	}
 
 }
@@ -79,7 +81,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
 			testCase:    "version with preRelease alpha",
 			releaseType: "alpha",
 			lastVersion: createVersion("1.0.0"),
-			nextVersion: "1.0.0-alpha.0",
+			nextVersion: "1.1.0-alpha.0",
 			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
 				"major": []shared.AnalyzedCommit{},
 				"minor": []shared.AnalyzedCommit{
@@ -94,7 +96,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
 			testCase:    "version with preRelease beta",
 			releaseType: "beta",
 			lastVersion: createVersion("1.0.0"),
-			nextVersion: "1.0.0-beta.0",
+			nextVersion: "1.1.0-beta.0",
 			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
 				"major": []shared.AnalyzedCommit{},
 				"minor": []shared.AnalyzedCommit{
@@ -135,7 +137,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
 			testCase:    "version with commits and rc release",
 			releaseType: "rc",
 			lastVersion: createVersion("1.0.0"),
-			nextVersion: "1.0.0-rc.0",
+			nextVersion: "2.0.0-rc.0",
 			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
 				"major": []shared.AnalyzedCommit{shared.AnalyzedCommit{}},
 				"minor": []shared.AnalyzedCommit{shared.AnalyzedCommit{}},
@@ -201,8 +203,10 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
 	c := calculator.New()
 
 	for _, test := range testConfigs {
-		next := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst)
-		assert.Equalf(t, test.nextVersion, next.String(), "Should have version %s for testcase %s", test.nextVersion, test.testCase)
+		t.Run(test.testCase, func(t *testing.T) {
+			next := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst)
+			assert.Equalf(t, test.nextVersion, next.String(), "Should have version %s for testcase %s", test.nextVersion, test.testCase)
+		})
 	}
 
 }