Merge branch 'develop' of github.com:mritd/gitflow-toolkit into develop

Author: mritd

.gitignore

@@ -13,3 +13,5 @@
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
 .idea
+
+dist

README.md

@@ -1,2 +1,26 @@
-# gitflow-toolkit
-gitflow-toolkit
+# GitFlow ToolKit
+
+> 这是一个使用 go 编写的简单的 GitFlow 提交工具，用于规范 git commit 提交格式，目前仅支持 [Angular 社区规范](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#heading=h.greljkmo14y0)；同时该工具集成了一些扩展动作，比如快速创建指定名称前缀分支、命令行发起 GitLab MR 等
+
+![example](imgs/example.gif)
+
+## 支持命令
+
+| 命令 | 描述 |
+| --- | --- |
+| ci | 交互式输入 `commit message`  |
+| cm | 接受一个 `commit message` 字符串，并校验其格式(用作 commit hook) |
+| xmr | 交互式创建 GitLab MR，如果当前项目未配置，则首先配置项目信息 |
+| feat | 接受一个字符串，并创建一个 feat 分支，分支名称格式为 `feat/xxx` |
+| fix | 创建 fix 分支 |
+| hotfix | 创建 hotfix 分支(通常用于对 master 紧急修复) |
+| docs | 创建 docs 分支 |
+| style | 创建 style 分支 |
+| refactor | 创建 refactor 分支 |
+| chore | 创建 chore 分支 |
+| perf | 创建 perf 分支 |
+| style | 创建 style 分支 |
+
+## 安装与卸载
+
+下载对应二进制文件，执行 `sudo gitflow-toolkit install/uninstall` 即可

glide.lock

@@ -3,7 +3,7 @@ import:
 - package: github.com/mritd/readline
   version: ae245b60ddeb65cbbbe2b42da961f46d0b812f43
 - package: github.com/mritd/promptx
-  version: cd327e50600f1fc3e5ff14d047b127ad6a0c1fbd
+  version: 986febf1a1c03a68067e2edc59123f9478c40345
 - package: github.com/cpuguy83/go-md2man
   version: 48d8747a2ca13185e7cc8efe6e9fc196a83f71a5
   subpackages:

glide.yaml

@@ -46,7 +46,7 @@ func SelectCommitType() consts.CommitType {
 		ActiveTpl:    "»  {{ .Type | cyan }} ({{ .ENDescription | cyan }})",
 		InactiveTpl:  "  {{ .Type | white }} ({{ .ENDescription | white }})",
 		SelectPrompt: "Commit Type",
-		SelectedTpl:  "{{ \"» Type:\" | green }} {{ .Type }}",
+		SelectedTpl:  "{{ \"» \" | green }}{{\"Type:\" | cyan }} {{ .Type }}",
 		DisPlaySize:  9,
 		DetailsTpl: `
 --------- Commit Type ----------

imgs/example.gif

@@ -14,6 +14,8 @@ import (
 	"github.com/mitchellh/go-homedir"
 )
 
+const InstallBaseDir = "/usr/local/bin"
+
 var GitFlowToolKitHome string
 var InstallPath string
 var HooksPath string
@@ -29,10 +31,10 @@ func init() {
 	home, err := homedir.Dir()
 	CheckAndExit(err)
 
-	GitFlowToolKitHome = home + string(filepath.Separator) + ".gitflow-toolkit"
-	InstallPath = GitFlowToolKitHome + string(filepath.Separator) + "gitflow-toolkit"
-	HooksPath = GitFlowToolKitHome + string(filepath.Separator) + "hooks"
-	GitCMHookPath = HooksPath + string(filepath.Separator) + "commit-msg"
+	GitFlowToolKitHome = home + "/.gitflow-toolkit"
+	InstallPath = GitFlowToolKitHome + "/gitflow-toolkit"
+	HooksPath = GitFlowToolKitHome + "/hooks"
+	GitCMHookPath = HooksPath + "/commit-msg"
 
 	CurrentPath, err = exec.LookPath(os.Args[0])
 	CheckAndExit(err)
@@ -45,18 +47,18 @@ func init() {
 func BinPaths() *[]string {
 	return &[]string{
 		GitCMHookPath,
-		"/usr/local/bin/git-ci",
-		"/usr/local/bin/git-feat",
-		"/usr/local/bin/git-fix",
-		"/usr/local/bin/git-docs",
-		"/usr/local/bin/git-style",
-		"/usr/local/bin/git-refactor",
-		"/usr/local/bin/git-test",
-		"/usr/local/bin/git-chore",
-		"/usr/local/bin/git-perf",
-		"/usr/local/bin/git-hotfix",
-		"/usr/local/bin/git-xmr",
-		"/usr/local/bin/git-xpr",
+		InstallBaseDir + "/git-ci",
+		InstallBaseDir + "/git-feat",
+		InstallBaseDir + "/git-fix",
+		InstallBaseDir + "/git-docs",
+		InstallBaseDir + "/git-style",
+		InstallBaseDir + "/git-refactor",
+		InstallBaseDir + "/git-test",
+		InstallBaseDir + "/git-chore",
+		InstallBaseDir + "/git-perf",
+		InstallBaseDir + "/git-hotfix",
+		InstallBaseDir + "/git-xmr",
+		InstallBaseDir + "/git-xpr",
 	}
 }
 
@@ -120,7 +122,10 @@ func OSEditInput() string {
 
 	f, err := ioutil.TempFile("", "gitflow-toolkit")
 	CheckAndExit(err)
-	defer os.Remove(f.Name())
+	defer func() {
+		f.Close()
+		os.Remove(f.Name())
+	}()
 
 	// write utf8 bom
 	bom := []byte{0xef, 0xbb, 0xbf}

pkg/commit/ci.go

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ ! -n "$1" ]; then
+    echo "Error:release version is blank!"
+	exit 1
+fi
+
+gox -osarch="darwin/amd64 linux/386 linux/amd64" -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}"
+ghr -u mritd -t $GITHUB_RELEASE_TOKEN -replace -recreate --debug $1 dist/