close #257 jira bitbucket smart commit expect hashtag in front of magic word

Author: groenborg

cmd/wrapup.go

@@ -20,12 +20,14 @@ var wrapupCmd = &cobra.Command{
 		cmdperm.RequiredCurDirRepository()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		phlow.WrapUp()
+		phlow.WrapUpCaller()
 	},
 }
 
 func init() {
 	RootCmd.AddCommand(wrapupCmd)
 
 	wrapupCmd.Flags().StringVar(&options.GlobalFlagForceMessage, "force", "", "use a custom commit message instead")
+
+	wrapupCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in your .gitconfig files")
 }

phlow/wrapup.go

@@ -4,17 +4,59 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/praqma/git-phlow/plugins"
+
 	"os"
 
+	"errors"
+	"strconv"
+
+	"github.com/praqma/git-phlow/executor"
 	"github.com/praqma/git-phlow/githandler"
+	"github.com/praqma/git-phlow/setting"
 	"github.com/praqma/git-phlow/options"
-	"github.com/praqma/git-phlow/executor"
-	"strconv"
-	"errors"
 )
 
+//WrapUpCaller ...
+func WrapUpCaller() {
+	conf := setting.NewProjectStg(options.GlobalFlagTarget)
+
+	if conf.Service == "jira" {
+		WrapUp("#close ", options.GlobalFlagForceMessage, plugins.KeyFromBranchName)
+		return
+	}
+
+	if conf.Service == "github" {
+		WrapUp("close #", options.GlobalFlagForceMessage, plugins.IssueFromBranchName)
+		return
+	}
+
+}
+
+//GenerateMessage ...
+//generates a message from a branch with a given issue extractor
+func GenerateMessage(branch string, smartCommitPrefix string, extractor plugins.IssueExtractor, forceMessage string) (string, error) {
+	iss, err := extractor(branch)
+	if err != nil {
+		return "", err
+	}
+
+	//remove the issue from the branch name
+	branch = strings.TrimPrefix(branch, iss)
+
+	if forceMessage != "" {
+		return smartCommitPrefix + iss + " " + forceMessage, nil
+	}
+
+	//Replace - with white space
+	msg := strings.Replace(branch, "-", " ", -1)
+
+	//prepend smart commit prefix
+	return smartCommitPrefix + iss + msg, nil
+}
+
 //WrapUp ...
-func WrapUp() {
+func WrapUp(smartCommitPrefix, force string, extractor plugins.IssueExtractor) {
 	git := githandler.Git{Run: executor.RunGit}
 
 	//Add all files to index
@@ -32,34 +74,20 @@ func WrapUp() {
 
 	//Retrieve branch info - current branch
 	info := githandler.AsList(out)
-	var commitMessage string
 
-	issue, err := GetJIRAIssue(info.Current)
+	msg, err := GenerateMessage(info.Current, smartCommitPrefix, extractor, force)
 	if err != nil {
-		
-		if options.GlobalFlagForceMessage != "" {
-			commitMessage = "close #" + strings.Split(info.Current, "-")[0] + " " + options.GlobalFlagForceMessage
-		} else {
-			commitMessage = "close #" + strings.Replace(info.Current, "-", " ", -1)
-		}
-	} else {
-		msg := strings.TrimPrefix(info.Current, issue)
-
-		if options.GlobalFlagForceMessage != "" {
-			commitMessage = "close #" + issue + " " + options.GlobalFlagForceMessage
-		} else {
-			commitMessage = "close #" + issue + strings.Replace(msg, "-", " ", -1)
-		}
-
+		fmt.Println(err)
+		os.Exit(1)
 	}
 
-	_, err = git.Commit("-m", commitMessage)
+	_, err = git.Commit("-m", msg)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 
-	fmt.Fprintln(os.Stdout, commitMessage)
+	fmt.Println(msg)
 }
 
 func GetJIRAIssue(branch string) (string, error) {