feat(合并提交): 合并提交，log改fmt减少依赖

feat(all): body breakingChange

.drone.yml

@@ -10,11 +10,11 @@ steps:
       - build -f build.sh -i gitcz.go -o release/gitcz
   - name: build
     pull: if-not-exists
-    image: xiaoqidun/goenv
+    image: hkccr.ccs.tencentyun.com/xiaoqidun/goenv
     commands:
       - ./build.sh
   - name: upload
-    image: xiaoqidun/gocos
+    image: hkccr.ccs.tencentyun.com/xiaoqidun/gocos
     settings:
       secret_id:
         from_secret: cos_secret_id

gitcz.go

@@ -6,7 +6,6 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"os/exec"
 	"strconv"
@@ -19,19 +18,23 @@ type CzType struct {
 }
 
 type CzCommit struct {
-	Type    *CzType
+	Type           *CzType
-	Scope   *string
+	Scope          *string
-	Subject *string
+	Subject        *string
-	Body    *string
+	Body           *string
-	Footer  *string
+	BreakingChange *string
+	Closes         *string
 }
 
 var StdinInput = bufio.NewReader(os.Stdin)
 
 var (
-	InputTypePrompt    = "选择或输入一个提交类型(必填): "
+	InputTypePrompt           = "选择或输入一个提交类型(必填): "
-	InputScopePrompt   = "说明本次提交的影响范围(必填): "
+	InputScopePrompt          = "说明本次提交的影响范围(必填): "
-	InputSubjectPrompt = "对本次提交进行简短描述(必填): "
+	InputSubjectPrompt        = "对本次提交进行简短描述(必填): "
+	InputBodyPrompt           = "对本次提交进行完整描述(选填): "
+	InputBreakingChangePrompt = "如果当前代码版本与上一版本不兼容,对变动、变动的理由及迁移的方法进行描述(选填): "
+	InputClosesPrompt         = "如果本次提交针对某个issue,列出关闭的issues(选填): "
 )
 
 var CzTypeList = []CzType{
@@ -89,9 +92,12 @@ func main() {
 	czCommit.Type = InputType()
 	czCommit.Scope = InputScope()
 	czCommit.Subject = InputSubject()
+	czCommit.Body = InputBody()
+	czCommit.BreakingChange = InputBreakingChange()
+	czCommit.Closes = InputCloses()
 	commit := GenerateCommit(czCommit)
 	if err := GitCommit(commit, *amend); err != nil {
-		log.Println(err)
+		fmt.Println(err)
 	}
 }
 
@@ -154,6 +160,7 @@ func InputType() *CzType {
 			return &CzTypeList[i]
 		}
 	}
+	NewLine()
 	return InputType()
 }
 
@@ -165,6 +172,7 @@ func InputScope() *string {
 		NewLine()
 		return &text
 	}
+	NewLine()
 	return InputScope()
 }
 
@@ -176,22 +184,63 @@ func InputSubject() *string {
 		NewLine()
 		return &text
 	}
-	return InputScope()
+	NewLine()
+	return InputSubject()
+}
+
+func InputBody() *string {
+	fmt.Print(InputBodyPrompt)
+	text, _ := StdinInput.ReadString('\n')
+	text = strings.TrimSpace(text)
+	if text != "" {
+		NewLine()
+		return &text
+	}
+	NewLine()
+	return nil
+}
+
+func InputBreakingChange() *string {
+	fmt.Print(InputBreakingChangePrompt)
+	text, _ := StdinInput.ReadString('\n')
+	text = strings.TrimSpace(text)
+	if text != "" {
+		NewLine()
+		return &text
+	}
+	NewLine()
+	return nil
+}
+
+func InputCloses() *string {
+	fmt.Print(InputClosesPrompt)
+	text, _ := StdinInput.ReadString('\n')
+	text = strings.TrimSpace(text)
+	if text != "" {
+		NewLine()
+		return &text
+	}
+	NewLine()
+	return nil
 }
 
 func GenerateCommit(czCommit *CzCommit) string {
 	commit := fmt.Sprintf(
-		"%s(%s): %s\n",
+		"%s(%s): %s\n\n",
 		czCommit.Type.Type,
 		*czCommit.Scope,
 		*czCommit.Subject,
 	)
 	if czCommit.Body != nil {
 		commit += *czCommit.Body
+		commit += "\n\n"
 	}
-	commit += "\n"
+	if czCommit.BreakingChange != nil {
-	if czCommit.Footer != nil {
+		commit += ("BREAKING CHANGE: " + *czCommit.BreakingChange)
-		commit += *czCommit.Footer
+		commit += "\n\n"
+	}
+	if czCommit.Closes != nil {
+		commit += ("Closes fix " + *czCommit.Closes)
 	}
 	return commit
 }

go.mod

@@ -1,3 +1,3 @@
 module github.com/xiaoqidun/gitcz
 
-go 1.17
+go 1.18