feat(rename): rename package

mritd · mritd · commit a16e9383a5ef · 2019-02-10T17:46:36.000+08:00
rename package

Signed-off-by: mritd &lt;mritd1234@gmail.com&gt;
diff --git a/cmd/chore.go b/cmd/chore.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of chore.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.CHORE, args[0])
+				git.Checkout(consts.CHORE, args[0])
 			}
 
 		},
diff --git a/cmd/ci.go b/cmd/ci.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/mritd/gitflow-toolkit/commit"
+	"github.com/mritd/gitflow-toolkit/git"
+
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
 	"github.com/spf13/cobra"
 )
 
@@ -29,27 +29,27 @@ func NewCi() *cobra.Command {
 		Aliases: []string{"git-ci"},
 		Run: func(cmd *cobra.Command, args []string) {
 
-			util.CheckGitProject()
+			git.CheckGitProject()
 
-			if !util.CheckStagedFiles() {
+			if !git.CheckStagedFiles() {
 				fmt.Println("No staged any files")
 				os.Exit(1)
 			}
 
-			cm := &commit.Message{Sob: commit.GenSOB()}
+			cm := &git.Message{Sob: git.GenSOB()}
 
 			if fastCommit {
 				cm.Type = consts.FEAT
 				cm.Scope = "Undefined"
-				cm.Subject = commit.InputSubject()
-				commit.Commit(cm)
+				cm.Subject = git.InputSubject()
+				git.Commit(cm)
 			} else {
-				cm.Type = commit.SelectCommitType()
-				cm.Scope = commit.InputScope()
-				cm.Subject = commit.InputSubject()
-				cm.Body = commit.InputBody()
-				cm.Footer = commit.InputFooter()
-				commit.Commit(cm)
+				cm.Type = git.SelectCommitType()
+				cm.Scope = git.InputScope()
+				cm.Subject = git.InputSubject()
+				cm.Body = git.InputBody()
+				cm.Footer = git.InputFooter()
+				git.Commit(cm)
 			}
 		},
 	}
diff --git a/cmd/cm.go b/cmd/cm.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/mritd/gitflow-toolkit/commit"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -16,7 +16,7 @@ Check if the file content meets the Angular Community Specification.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				commit.CheckCommitMessage(args)
+				git.CheckCommitMessage(args[0])
 			}
 		},
 	}
diff --git a/cmd/docs.go b/cmd/docs.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of docs.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.DOCS, args[0])
+				git.Checkout(consts.DOCS, args[0])
 			}
 		},
 	}
diff --git a/cmd/feat.go b/cmd/feat.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of feat.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.FEAT, args[0])
+				git.Checkout(consts.FEAT, args[0])
 			}
 		},
 	}
diff --git a/cmd/fix.go b/cmd/fix.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of fix.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.FIX, args[0])
+				git.Checkout(consts.FIX, args[0])
 			}
 		},
 	}
diff --git a/cmd/hotfix.go b/cmd/hotfix.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of hotfix.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.HOTFIX, args[0])
+				git.Checkout(consts.HOTFIX, args[0])
 			}
 		},
 	}
diff --git a/cmd/install.go b/cmd/install.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -13,7 +13,7 @@ func NewInstall() *cobra.Command {
 Install gitflow-toolkit(only support *Unix).`,
 		Aliases: []string{"install"},
 		Run: func(cmd *cobra.Command, args []string) {
-			util.Install()
+			utils.Install()
 		},
 	}
 }
diff --git a/cmd/perf.go b/cmd/perf.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of perf.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.PERF, args[0])
+				git.Checkout(consts.PERF, args[0])
 			}
 		},
 	}
diff --git a/cmd/ps.go b/cmd/ps.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -13,7 +13,7 @@ func NewPs() *cobra.Command {
 Push local branch to remote.`,
 		Aliases: []string{"git-ps"},
 		Run: func(cmd *cobra.Command, args []string) {
-			util.Push()
+			git.Push()
 		},
 	}
 }
diff --git a/cmd/refactor.go b/cmd/refactor.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of refactor.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.REFACTOR, args[0])
+				git.Checkout(consts.REFACTOR, args[0])
 			}
 		},
 	}
diff --git a/cmd/root.go b/cmd/root.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mitchellh/go-homedir"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -49,7 +49,7 @@ func initConfig() {
 		viper.SetConfigFile(cfgFile)
 	} else {
 		home, err := homedir.Dir()
-		util.CheckAndExit(err)
+		utils.CheckAndExit(err)
 		viper.AddConfigPath(home)
 		viper.SetConfigName(".gitflow-toolkit")
 	}
diff --git a/cmd/style.go b/cmd/style.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of style.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.STYLE, args[0])
+				git.Checkout(consts.STYLE, args[0])
 			}
 		},
 	}
diff --git a/cmd/test.go b/cmd/test.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/git"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ Create a branch with a prefix of test.`,
 			if len(args) != 1 {
 				_ = cmd.Help()
 			} else {
-				util.Checkout(consts.TEST, args[0])
+				git.Checkout(consts.TEST, args[0])
 			}
 		},
 	}
diff --git a/cmd/uninstall.go b/cmd/uninstall.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -13,7 +13,7 @@ func NewUninstall() *cobra.Command {
 Uninstall gitflow-toolkit`,
 		Aliases: []string{"uninstall"},
 		Run: func(cmd *cobra.Command, args []string) {
-			util.Uninstall()
+			utils.Uninstall()
 		},
 	}
 }
diff --git a/git/ci.go b/git/ci.go
@@ -1,4 +1,4 @@
-package commit
+package git
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 	"text/template"
 
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/utils"
 	"github.com/mritd/promptx"
 	"github.com/pkg/errors"
 )
@@ -109,7 +109,7 @@ func InputBody() string {
 
 	body := strings.TrimSpace(p.Run())
 	if body == "big" {
-		return util.OSEditInput()
+		return utils.OSEditInput()
 	}
 
 	return body
@@ -131,7 +131,7 @@ func GenSOB() string {
 	author := "Undefined"
 	email := "Undefined"
 
-	output := util.MustExecRtOut("git", "var", "GIT_AUTHOR_IDENT")
+	output := utils.MustExecRtOut("git", "var", "GIT_AUTHOR_IDENT")
 	authorInfo := strings.Fields(output)
 
 	if len(authorInfo) > 1 && authorInfo[0] != "" {
@@ -152,13 +152,17 @@ func Commit(cm *Message) {
 	}
 
 	t, err := template.New("commitMessage").Parse(consts.CommitTpl)
-	util.CheckAndExit(err)
+	utils.CheckAndExit(err)
+
 	f, err := ioutil.TempFile("", "git-commit")
-	defer f.Close()
-	defer os.Remove(f.Name())
-	util.CheckAndExit(err)
-	t.Execute(f, cm)
-	util.MustExec("git", "commit", "-F", f.Name())
+	utils.CheckAndExit(err)
+	defer func() {
+		_ = f.Close()
+		_ = os.Remove(f.Name())
+	}()
+
+	_ = t.Execute(f, cm)
+	utils.MustExec("git", "commit", "-F", f.Name())
 
 	fmt.Println("\n✔ Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live.")
 }
diff --git a/git/cm.go b/git/cm.go
@@ -1,4 +1,4 @@
-package commit
+package git
 
 import (
 	"fmt"
@@ -8,22 +8,15 @@ import (
 	"strings"
 
 	"github.com/mritd/gitflow-toolkit/consts"
-	"github.com/mritd/gitflow-toolkit/util"
+	"github.com/mritd/gitflow-toolkit/utils"
 )
 
-func CheckCommitMessage(args []string) {
-	if len(args) != 1 {
-		checkFailed()
-	}
+func CheckCommitMessage(file string) {
 
 	reg := regexp.MustCompile(consts.CommitMessagePattern)
 
-	f, err := os.Open(args[0])
-	defer f.Close()
-	util.CheckAndExit(err)
-
-	b, err := ioutil.ReadAll(f)
-	util.CheckAndExit(err)
+	b, err := ioutil.ReadFile(file)
+	utils.CheckAndExit(err)
 
 	commitTypes := reg.FindAllStringSubmatch(string(b), -1)
 	if len(commitTypes) != 1 {
diff --git a/git/git.go b/git/git.go
diff --git a/main.go b/main.go
diff --git a/util/git.go b/util/git.go
diff --git a/utils/common.go b/utils/common.go
diff --git a/utils/install.go b/utils/install.go
diff --git a/utils/uninstall.go b/utils/uninstall.go

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package cmd`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/mritd/gitflow-toolkit/consts"`
`5`		`- "github.com/mritd/gitflow-toolkit/util"`
	`5`	`+ "github.com/mritd/gitflow-toolkit/git"`
`6`	`6`	`"github.com/spf13/cobra"`
`7`	`7`	`)`
`8`	`8`
@@ -17,7 +17,7 @@ Create a branch with a prefix of chore.`,
`17`	`17`	`if len(args) != 1 {`
`18`	`18`	`_ = cmd.Help()`
`19`	`19`	`} else {`
`20`		`- util.Checkout(consts.CHORE, args[0])`
	`20`	`+ git.Checkout(consts.CHORE, args[0])`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package cmd`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/mritd/gitflow-toolkit/commit"`
	`4`	`+ "github.com/mritd/gitflow-toolkit/git"`
`5`	`5`	`"github.com/spf13/cobra"`
`6`	`6`	`)`
`7`	`7`
@@ -16,7 +16,7 @@ Check if the file content meets the Angular Community Specification.`,
`16`	`16`	`if len(args) != 1 {`
`17`	`17`	`_ = cmd.Help()`
`18`	`18`	`} else {`
`19`		`- commit.CheckCommitMessage(args)`
	`19`	`+ git.CheckCommitMessage(args[0])`
`20`	`20`	`}`
`21`	`21`	`},`
`22`	`22`	`}`