Handle hotfixes like releases

Author: Tobias Meinhardt

pkg/cli/cmd/close.hotfix.go

@@ -0,0 +1,49 @@
+package cmd
+
+import (
+	"github.com/meinto/glow"
+	"github.com/meinto/glow/pkg/cli/cmd/util"
+	"github.com/meinto/glow/semver"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	closeCmd.AddCommand(closeHotfixCmd)
+	util.AddFlagsForMergeRequests(closeHotfixCmd)
+}
+
+var closeHotfixCmd = &cobra.Command{
+	Use:   "hofix",
+	Short: "close a release branch",
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		version := args[0]
+
+		if version == "current" {
+			g, err := util.GetGitClient()
+			util.CheckForError(err, "GetGitClient")
+
+			pathToRepo, err := g.GitRepoPath()
+			util.CheckForError(err, "semver GitRepoPath")
+
+			s := semver.NewSemverService(
+				pathToRepo,
+				"/bin/bash",
+				releaseCmdOptions.VersionFile,
+				releaseCmdOptions.VersionFileType,
+			)
+			v, err := s.GetCurrentVersion()
+			util.CheckForError(err, "semver GetCurrentVersion")
+			version = v
+		}
+
+		gp, err := util.GetGitProvider()
+		util.CheckForError(err, "GetGitProvider")
+
+		currentBranch, err := glow.NewHotfix(version)
+		util.CheckForError(err, "NewHotfix")
+
+		gp.Close(currentBranch)
+		util.CheckForError(err, "Close")
+	},
+}

pkg/cli/cmd/hotfix.go

@@ -4,30 +4,65 @@ import (
 	"github.com/meinto/glow"
 	"github.com/meinto/glow/pkg/cli/cmd/util"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
+var hotfixCmdOptions struct {
+	Push              bool
+	PostHotfixScript  string
+	PostHotfixCommand []string
+	VersionFile       string
+	VersionFileType   string
+}
+
 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().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")
+	hotfixCmd.Flags().StringVar(&hotfixCmdOptions.VersionFileType, "versionFileType", "raw", "git-semver version file type")
 }
 
 var hotfixCmd = &cobra.Command{
 	Use:   "hotfix",
 	Short: "create a hotfix branch",
 	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		hotixName := args[0]
-
-		hotfix, err := glow.NewHotfix(viper.GetString("author"), hotixName)
-		util.CheckForError(err, "NewHotfix")
-
 		g, err := util.GetGitClient()
 		util.CheckForError(err, "GetGitClient")
 
+		version, s := util.ProcessVersion(
+			args[0],
+			hotfixCmdOptions.VersionFile,
+			hotfixCmdOptions.VersionFileType,
+		)
+
+		hotfix, err := glow.NewHotfix(version)
+		util.CheckForError(err, "NewHotfix")
+
 		err = g.Create(hotfix)
 		util.CheckForError(err, "Create")
 
 		g.Checkout(hotfix)
 		util.CheckForError(err, "Checkout")
+
+		if util.IsSemanticVersion(args[0]) {
+			err = s.SetNextVersion(args[0])
+			util.CheckForError(err, "semver SetNextVersion")
+		}
+	},
+	PostRun: func(cmd *cobra.Command, args []string) {
+		version := args[0]
+
+		util.PostRunWithVersion(
+			version,
+			hotfixCmdOptions.VersionFile,
+			hotfixCmdOptions.VersionFileType,
+			hotfixCmdOptions.PostHotfixScript,
+			hotfixCmdOptions.PostHotfixCommand,
+			hotfixCmdOptions.Push,
+		)
 	},
 }