Fix post command function

Author: Tobias Meinhardt

pkg/cli/cmd/hotfix.go

@@ -18,7 +18,7 @@ func init() {
 	rootCmd.AddCommand(hotfixCmd)
 
 	hotfixCmd.Flags().BoolVar(&hotfixCmdOptions.Push, "push", false, "push created hotfix branch")
-	hotfixCmd.Flags().StringVar(&hotfixCmdOptions.PostHotfixScript, "postHofix", "", "script that executes after switching to hotfix branch")
+	hotfixCmd.Flags().StringVar(&hotfixCmdOptions.PostHotfixScript, "postHotfix", "", "script that executes after switching to hotfix branch")
 	hotfixCmd.Flags().StringArrayVar(&hotfixCmdOptions.PostHotfixCommand, "postHotfixCommand", []string{}, "commands which should be executed after switching to hotfix branch")
 
 	hotfixCmd.Flags().StringVar(&hotfixCmdOptions.VersionFile, "versionFile", "VERSION", "name of git-semver version file")
@@ -48,10 +48,8 @@ var hotfixCmd = &cobra.Command{
 		g.Checkout(hotfix)
 		util.CheckForError(err, "Checkout")
 
-		if util.IsSemanticVersion(args[0]) {
-			err = s.SetNextVersion(args[0])
-			util.CheckForError(err, "semver SetNextVersion")
-		}
+		err = s.SetVersion(version)
+		util.CheckForError(err, "semver SetVersion")
 	},
 	PostRun: func(cmd *cobra.Command, args []string) {
 		version := args[0]

pkg/cli/cmd/release.go

@@ -47,10 +47,8 @@ var releaseCmd = &cobra.Command{
 		g.Checkout(release)
 		util.CheckForError(err, "Checkout")
 
-		if util.IsSemanticVersion(args[0]) {
-			err = s.SetNextVersion(args[0])
-			util.CheckForError(err, "semver SetNextVersion")
-		}
+		s.SetVersion(version)
+		util.CheckForError(err, "semver SetVersion")
 	},
 	PostRun: func(cmd *cobra.Command, args []string) {
 		version := args[0]

pkg/cli/cmd/util/semver.go

@@ -14,16 +14,17 @@ func ProcessVersion(versionArg, versionFile, versionFileType string) (string, se
 	g, err := GetGitClient()
 	CheckForError(err, "GetGitClient")
 
-	var s semver.Service
+	pathToRepo, err := g.GitRepoPath()
+	CheckForError(err, "semver GitRepoPath")
+
+	s := semver.NewSemverService(
+		pathToRepo,
+		"/bin/bash",
+		versionFile,
+		versionFileType,
+	)
+
 	if IsSemanticVersion(version) {
-		pathToRepo, err := g.GitRepoPath()
-		CheckForError(err, "semver GitRepoPath")
-		s = semver.NewSemverService(
-			pathToRepo,
-			"/bin/bash",
-			versionFile,
-			versionFileType,
-		)
 		v, err := s.GetCurrentVersion()
 		CheckForError(err, "semver GetNextVersion")
 		version = v

semver/service.go

@@ -14,6 +14,7 @@ type Service interface {
 	GetCurrentVersion() (string, error)
 	GetNextVersion(versionType string) (string, error)
 	SetNextVersion(versionType string) error
+	SetVersion(version string) error
 	TagCurrentVersion() error
 }
 
@@ -57,9 +58,6 @@ func (s *service) GetNextVersion(versionType string) (string, error) {
 }
 
 func (s *service) SetNextVersion(versionType string) error {
-	versionFilepath := s.pathToRepo + "/" + s.versionFile
-	fs := file.NewVersionFileService(versionFilepath)
-
 	currentVersion, err := s.GetCurrentVersion()
 	if err != nil {
 		return err
@@ -77,7 +75,14 @@ func (s *service) SetNextVersion(versionType string) error {
 
 	log.Println("new version will be: ", nextVersion)
 
-	err = fs.WriteVersionFile(s.versionFileType, nextVersion)
+	return s.SetVersion(nextVersion)
+}
+
+func (s *service) SetVersion(version string) error {
+	versionFilepath := s.pathToRepo + "/" + s.versionFile
+	fs := file.NewVersionFileService(versionFilepath)
+
+	err := fs.WriteVersionFile(s.versionFileType, version)
 	return err
 }