releaser: Replace the magic version handling

Take the new version as a string value.

2 files changed, 11 insertions, 98 deletions

diff --git a/releaser/releaser.go b/releaser/releaser.go
index 52a74dc7e..52589e8b7 100644
--- a/releaser/releaser.go
+++ b/releaser/releaser.go
@@ -31,7 +31,7 @@ import (
 const commitPrefix = "releaser:"
 
 type ReleaseHandler struct {
-	patch int
+	cliVersion string
 
 	// If set, we do the releases in 3 steps:
 	// 1: Create and write a draft release notes
@@ -62,24 +62,16 @@ func (r ReleaseHandler) shouldPrepareVersions() bool {
 	return r.step < 1 || r.step == 2
 }
 
-func (r ReleaseHandler) calculateVersions(current helpers.HugoVersion) (helpers.HugoVersion, helpers.HugoVersion) {
-	var (
-		newVersion   = current
-		finalVersion = current
-	)
+func (r ReleaseHandler) calculateVersions() (helpers.HugoVersion, helpers.HugoVersion) {
+
+	newVersion := helpers.MustParseHugoVersion(r.cliVersion)
+	finalVersion := newVersion
+	finalVersion.PatchLevel = 0
 
 	newVersion.Suffix = ""
 
-	if r.shouldContinue() {
-		// The version in the current code base is in the state we want for
-		// the release.
-		if r.patch == 0 {
-			finalVersion = newVersion.Next()
-		}
-	} else if r.patch > 0 {
-		newVersion = helpers.CurrentHugoVersion.NextPatchLevel(r.patch)
-	} else {
-		finalVersion = newVersion.Next()
+	if newVersion.PatchLevel == 0 {
+		finalVersion = finalVersion.Next()
 	}
 
 	finalVersion.Suffix = "-DEV"
@@ -87,8 +79,8 @@ func (r ReleaseHandler) calculateVersions(current helpers.HugoVersion) (helpers.
 	return newVersion, finalVersion
 }
 
-func New(patch, step int, skipPublish, try bool) *ReleaseHandler {
-	rh := &ReleaseHandler{patch: patch, step: step, skipPublish: skipPublish, try: try}
+func New(version string, step int, skipPublish, try bool) *ReleaseHandler {
+	rh := &ReleaseHandler{cliVersion: version, step: step, skipPublish: skipPublish, try: try}
 
 	if try {
 		rh.git = func(args ...string) (string, error) {
@@ -107,7 +99,7 @@ func (r *ReleaseHandler) Run() error {
 		return errors.New("GITHUB_TOKEN not set, create one here with the repo scope selected: https://github.com/settings/tokens/new")
 	}
 
-	newVersion, finalVersion := r.calculateVersions(helpers.CurrentHugoVersion)
+	newVersion, finalVersion := r.calculateVersions()
 
 	version := newVersion.String()
 	tag := "v" + version
diff --git a/releaser/releaser_test.go b/releaser/releaser_test.go
deleted file mode 100644
index 2e5a545a4..000000000
--- a/releaser/releaser_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2017-present The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package commands defines and implements command-line commands and flags
-// used by Hugo. Commands and flags are implemented using Cobra.
-
-package releaser
-
-import (
-	"testing"
-
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/stretchr/testify/require"
-)
-
-// TODO(bep) fixme
-func _TestCalculateVersions(t *testing.T) {
-	startVersion := helpers.HugoVersion{Number: 0.20, Suffix: "-DEV"}
-
-	tests := []struct {
-		handler *ReleaseHandler
-		version helpers.HugoVersion
-		v1      string
-		v2      string
-	}{
-		{
-			New(0, 0, true, true),
-			startVersion,
-			"0.20",
-			"0.21-DEV",
-		},
-		{
-			New(2, 0, true, true),
-			startVersion,
-			"0.20.2",
-			"0.20-DEV",
-		},
-		{
-			New(0, 1, true, true),
-			startVersion,
-			"0.20",
-			"0.21-DEV",
-		},
-		{
-			New(0, 3, true, true),
-			startVersion,
-			"0.20",
-			"0.21-DEV",
-		},
-		{
-			New(3, 1, true, true),
-			startVersion,
-			"0.20.3",
-			"0.20-DEV",
-		},
-		{
-			New(3, 3, true, true),
-			startVersion.Next(),
-			"0.21",
-			"0.21-DEV",
-		},
-	}
-
-	for _, test := range tests {
-		v1, v2 := test.handler.calculateVersions(test.version)
-		require.Equal(t, test.v1, v1.String(), "Release version")
-		require.Equal(t, test.v2, v2.String(), "Final version")
-	}
-}