close #90 wrapup should taken an additional comment

Author: groenborg

cmd/wrapup.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/praqma/git-phlow/cmd/cmdperm"
+	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"
@@ -13,7 +14,8 @@ var wrapupCmd = &cobra.Command{
 	Use:   "wrapup",
 	Short: "Add changes to index and auto commit",
 	Long: fmt.Sprintf(`
-%s commits the currently staged files with a 'close issue' commit message, e.g. "close #42 fetch meaning of life". The commit message will cause the corresponding issue to be closed when the commit is integrated.
+%s commits the currently staged files with a 'close issue' commit message, e.g. "close #42 fetch meaning of life". The commit message will cause the corresponding issue to be closed when the commit is integrated. When force is used on the message, the message will replace, the otherwice automatically generated commit message.
+
 `, ui.Format.Bold("wrapup")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
@@ -25,4 +27,6 @@ var wrapupCmd = &cobra.Command{
 
 func init() {
 	RootCmd.AddCommand(wrapupCmd)
+
+	wrapupCmd.Flags().StringVar(&options.GlobalFlagForceMessage, "force", "", "use a custom commit message in stead")
 }

options/option.go

@@ -29,6 +29,9 @@ var (
 	//GlobalFlagPrefixForReady ...
 	GlobalFlagPrefixForReady string
 
+	//GlobalFlagForce ...
+	GlobalFlagForceMessage string
+
 	//Sha1 git commit hash
 	Sha1 string
 

phlow/wrapup.go

@@ -7,6 +7,7 @@ import (
 	"os"
 
 	"github.com/praqma/git-phlow/githandler"
+	"github.com/praqma/git-phlow/options"
 )
 
 //WrapUp ...
@@ -20,11 +21,17 @@ func WrapUp() {
 
 	//Retrieve branch info - current branch
 	info, _ := githandler.Branch()
-	commitMessage := "close #" + strings.Replace(info.Current, "-", " ", -1)
+	var cmsg string
 
-	if _, err := githandler.Commit(commitMessage); err != nil {
+	if options.GlobalFlagForceMessage != "" {
+		cmsg = "close #" + strings.Split(info.Current, "-")[0] + " " + options.GlobalFlagForceMessage
+	} else {
+		cmsg = "close #" + strings.Replace(info.Current, "-", " ", -1)
+	}
+
+	if _, err := githandler.Commit(cmsg); err != nil {
 		fmt.Println("Nothing to commit!")
 		return
 	}
-	fmt.Fprintln(os.Stdout, commitMessage)
+	fmt.Fprintln(os.Stdout, cmsg)
 }