fix: gitop checkout function

Author: yeqown

cmd/gitlab-flow/commands_hotfix.go

@@ -18,11 +18,12 @@ func getHotfixSubCommands() cli.Commands {
 // gitlab-flow hotfix start @title @desc
 func getHotfixStartSubCommand() *cli.Command {
 	return &cli.Command{
-		Name:        "start",
-		Usage:       "open a hotfix branch and merge request to master",
-		ArgsUsage:   "@title @desc",
-		Description: "@title title \n\t @desc description",
-		Category:    "hotfix",
+		Name:      "open",
+		Usage:     "open @title @description",
+		ArgsUsage: "@title] [@description",
+		Description: "open a hotfix branch and merge request to master. " +
+			"\n@title title \n@desc description",
+		Category: "hotfix",
 		Action: func(c *cli.Context) error {
 			log.
 				WithFields(log.Fields{"args": c.Args().Slice()}).
@@ -33,11 +34,9 @@ func getHotfixStartSubCommand() *cli.Command {
 			if title == "" {
 				return errors.New("title could not be empty")
 			}
-
 			if desc == "" {
 				return errors.New("desc could not be empty")
 			}
-
 			confPath := c.String("conf_path")
 			debug := c.Bool("debug")
 			return getFlow(confPath, debug).HotfixBegin(title, desc)
@@ -49,11 +48,20 @@ func getHotfixStartSubCommand() *cli.Command {
 // gitlab-flow hotfix release @title @desc
 func getHotfixFinishSubCommand() *cli.Command {
 	return &cli.Command{
-		Name:        "release",
-		Usage:       "finish a hotfix",
-		ArgsUsage:   "@branchName",
-		Description: "@title title",
+		Name:        "close",
+		Usage:       "close [-hb, --hotfix_branch_name `hotfixBranchName`]",
+		ArgsUsage:   "[-hb, --hotfix_branch_name `hotfixBranchName`]",
+		Description: "close a hotfix development, then create a merge request into master",
 		Category:    "hotfix",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:     "hotfix_branch_name",
+				Aliases:  []string{"hb"},
+				Value:    "",                          // default current branch
+				Usage:    "-hb, --hotfix_branch_name", // be be overwritten
+				Required: false,
+			},
+		},
 		Action: func(c *cli.Context) error {
 			log.
 				WithFields(log.Fields{"args": c.Args().Slice()}).

internal/git-operator/git_operator_cmd.go

@@ -29,7 +29,7 @@ func NewBasedCmd(dir string) IGitOperator {
 		Cmd:              "git",
 		Dir:              dir,
 		fetchCmd:         "fetch {arg}",
-		checkoutCmd:      "checkout {createFlag} {branch}",
+		checkoutCmd:      "checkout {createFlag}{branch}",
 		currentBranchCmd: "rev-parse --abbrev-ref HEAD",
 	}
 }
@@ -43,10 +43,6 @@ func (c operatorBasedCmd) run(dir string, cmd string, keyval ...string) error {
 func (c operatorBasedCmd) run1(dir string, cmdline string, keyval []string, verbose bool) ([]byte, error) {
 	m := make(map[string]string)
 	for i := 0; i < len(keyval); i += 2 {
-		// FIXED: ignore empty val
-		if keyval[i] == "" {
-			continue
-		}
 		m[keyval[i]] = keyval[i+1]
 	}
 	args := strings.Fields(cmdline)

internal/git-operator/git_operator_test.go

@@ -4,21 +4,38 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+var (
+	home, _  = os.UserHomeDir()
+	repoPath = filepath.Join(home, "Projects", "opensource", "test")
 )
 
-func Test_gitOp(t *testing.T) {
-	home, _ := os.UserHomeDir()
-	repoPath := filepath.Join(home, "Projects", "medlinker", "micro-server-template")
+func Test_gitOp_FetchOrigin(t *testing.T) {
+	op := NewBasedCmd(repoPath)
+	err := op.FetchOrigin()
+	assert.Nil(t, err)
+}
+
+func Test_gitOp_Checkout(t *testing.T) {
+	op := NewBasedCmd(repoPath)
+	err := op.Checkout("hotfix/hotfix-1", false)
+	assert.Nil(t, err)
+}
 
+func Test_gitOp_Checkout_create(t *testing.T) {
 	op := NewBasedCmd(repoPath)
+	err := op.Checkout("checkout-ddd", true)
+	assert.Nil(t, err)
+}
 
-	if err := op.FetchOrigin(); err != nil {
-		t.Error(err)
-		t.FailNow()
-	}
+func Test_gitOp_CurrentBranch(t *testing.T) {
+	op := NewBasedCmd(repoPath)
 
-	if err := op.Checkout("test", false); err != nil {
-		t.Error(err)
-		t.FailNow()
-	}
+	b := "hotfix/hotfix-1"
+	cb, err := op.CurrentBranch()
+	assert.Nil(t, err)
+	assert.Equal(t, b, cb)
 }