close #224 deliver for jira

Author: groenborg

cmd/deliver.go

@@ -2,12 +2,9 @@ package cmd
 
 import (
 	"fmt"
-	"os"
-
 	"github.com/praqma/git-phlow/cmd/cmdperm"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
-	"github.com/praqma/git-phlow/plugins"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"
 )
@@ -28,24 +25,8 @@ If you deliver with the 'local' option, the issue branch will be merged with you
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 
-		defaultBranch, _ := plugins.GitHub.Default()
-		//Run tests before deliver
-		if len(args) > 0 {
-			if err := phlow.TestDeliver(args); err != nil {
-				fmt.Println(ui.Format.Error("!! Tests did not exit with code 0 !!"))
-				fmt.Println(err)
-				os.Exit(1)
-			}
-			fmt.Println(ui.Format.Success("Tests exited with code 0 - starting deliver process"))
-		}
-
-		//If Run if local deliver
-		if options.GlobalFlagLocal {
-			phlow.LocalDeliver(defaultBranch)
-			return
-		}
-		//Deliver with ready branch
-		phlow.Deliver(defaultBranch)
+		phlow.DeliverCaller()
+
 	},
 }
 
@@ -54,5 +35,8 @@ func init() {
 
 	//Flag for local deliver
 	deliverCmd.Flags().BoolVarP(&options.GlobalFlagLocal, "local", "l", false, "local delivery")
+
 	deliverCmd.Flags().BoolVarP(&options.GlobalFlagShowTestOutput, "showtest", "s", false, "show test output")
+
+	deliverCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in your .phlow files")
 }

cmd/integrate.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/praqma/git-phlow/cmd/cmdperm"
 	"github.com/praqma/git-phlow/phlow"
-	"github.com/praqma/git-phlow/plugins"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"
+	"github.com/praqma/git-phlow/setting"
 )
 
 // integrateCmd represents the integrate command
@@ -23,11 +23,8 @@ The current branch will be merged into the default branch and pushed to the remo
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 
-		defaultBranch, err := plugins.GitHub.Default()
-		if err != nil {
-			fmt.Println(err)
-		}
-		phlow.LocalDeliver(defaultBranch)
+		conf := setting.NewProjectStg("default")
+		phlow.LocalDeliver(conf)
 	},
 }
 

githandler/git.go

@@ -4,8 +4,6 @@ import (
 	"strings"
 
 	"github.com/praqma/git-phlow/executor"
-	"bytes"
-	"fmt"
 )
 
 //Git ...
@@ -83,34 +81,3 @@ func (os *Git) Config(argv ...string) (string, error) {
 	}
 	return strings.Replace(stdOut, "\n", "", -1), nil
 }
-
-//Deprecated
-//FormatPatch ...
-//dry runs patch to see if we can auto merge
-func FormatPatch(buf *bytes.Buffer, remoteBranch string) (err error) {
-	//err = executor.ExecPipeCommand(buf,
-	//	exec.Command("git", "format-patch", remoteBranch, "--stdout"),
-	//	exec.Command("git", "apply", "check"),
-	//)
-	return
-}
-
-//Deprecated
-//StatusPorcelain ...
-//generates behind and ahead status
-func StatusPorcelain() (string, error) {
-	out, err := executor.RunCommand("git", "status", "short", "--branch", "--porcelain")
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(out), nil
-}
-
-//Deprecated
-//PushRename ...
-func PushRename(branch, defaultBranch string) (string, error) {
-	remote := ConfigBranchRemote(defaultBranch)
-	str := fmt.Sprintf("%s:ready/%s", branch, branch)
-
-	return executor.RunCommand("git", "push", remote, str)
-}

phlow/deliver.go

@@ -13,11 +13,25 @@ import (
 	"os"
 )
 
-//Deliver ...
-func Deliver(defaultBranch string) {
+//DeliverCaller ...
+//Top level deliver call, called from cmd
+func DeliverCaller() {
+	INIBlock := options.GlobalFlagTarget
+	conf := setting.NewProjectStg(INIBlock)
+
+	//If Run if local deliver
+	if options.GlobalFlagLocal {
+		LocalDeliver(conf)
+		return
+	}
+	//Deliver with ready branch
+	Deliver(conf)
+}
 
+//Deliver ...
+//Push a ready branch to the remote repository
+func Deliver(conf *setting.ProjectSetting) {
 	git := githandler.Git{Run: executor.RunGit}
-	conf := setting.NewProjectStg("default")
 
 	ui.PhlowSpinner.Start("delivering")
 	defer ui.PhlowSpinner.Stop()
@@ -35,8 +49,8 @@ func Deliver(defaultBranch string) {
 		fmt.Printf("Could not deliver: %s", branchInfo.Current)
 		return
 	}
-
-	_, err = githandler.PushRename(branchInfo.Current, conf.IntegrationBranch)
+	//git push origin name:ready/name
+	_, err = git.Push(conf.Remote, fmt.Sprintf("%s:ready/%s", branchInfo.Current, branchInfo.Current))
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -45,9 +59,9 @@ func Deliver(defaultBranch string) {
 	_, err = git.Branch("-m", branchInfo.Current, "delivered/"+branchInfo.Current)
 	if err != nil {
 		ui.PhlowSpinner.Stop()
-		fmt.Fprintln(os.Stdout, "The branch have been pushed successfully to your remote, but there is a local name conflict")
-		fmt.Fprintf(os.Stderr, "CONFLICT: your already have a branch named %s in your workspace \n", "delivered/"+branchInfo.Current)
-		fmt.Fprintf(os.Stderr, "to mark it delivered run: git branch -m %s %s \n", branchInfo.Current, "delivered/"+branchInfo.Current)
+		fmt.Println("The branch have been pushed successfully to your remote, but there is a local name conflict")
+		fmt.Printf("CONFLICT: your already have a branch named %s in your workspace \n", "delivered/"+branchInfo.Current)
+		fmt.Printf("to mark it delivered run: git branch -m %s %s \n", branchInfo.Current, "delivered/"+branchInfo.Current)
 		os.Exit(1)
 		return
 	}
@@ -64,9 +78,9 @@ func Deliver(defaultBranch string) {
 }
 
 //LocalDeliver ...
-func LocalDeliver(defaultBranch string) {
+//Delivers locally and pushes the changes to the remote
+func LocalDeliver(conf *setting.ProjectSetting) {
 	git := githandler.Git{Run: executor.RunGit}
-	conf := setting.NewProjectStg("default")
 
 	out, err := git.Branch("-a")
 	branchInfo := githandler.AsList(out)
@@ -115,34 +129,5 @@ func LocalDeliver(defaultBranch string) {
 		return
 	}
 	ui.PhlowSpinner.Stop()
-	fmt.Printf("Delivered changes from %s to %s \n", ui.Format.Branch(branchInfo.Current), ui.Format.Branch(defaultBranch))
-}
-
-//TestDeliver ...
-//Run tests and returns
-func TestDeliver(args []string) error {
-
-	cmd, argv := convertCommand(args)
-	output, err := executor.RunCommand(cmd, argv...)
-
-	if err != nil {
-		return err
-	}
-
-	if options.GlobalFlagShowTestOutput {
-		fmt.Println(output)
-	}
-
-	return nil
-}
-
-//ConvertCommand ...
-//Formats the command to ExecutorCommand
-func convertCommand(args []string) (string, []string) {
-
-	//Command with extra arguments
-	if len(args) > 1 {
-		return args[0], args[1:]
-	}
-	return args[0], []string{}
+	fmt.Printf("Delivered changes from %s to %s \n", ui.Format.Branch(branchInfo.Current), ui.Format.Branch(conf.IntegrationBranch))
 }