close #192 move git commands to new configuration

Author: groenborg

README.md

@@ -6,7 +6,7 @@ maintainer: groenborg
 
 | tollgate | build | goreport | coveralls | issues |
 | ------------- | --- | ----------------- | ----- | ----- |
-| ![integration status](https://concourse.bosh.praqma.cloud/api/v1/teams/main/pipelines/git-phlow/jobs/integration-test/badge) | ![build status](https://concourse.bosh.praqma.cloud/api/v1/teams/main/pipelines/git-phlow/jobs/shipit/badge)  |[![Go Report Card](https://goreportcard.com/badge/github.com/Praqma/git-phlow)](https://goreportcard.com/report/github.com/Praqma/git-phlow) | [![Coverage Status](https://coveralls.io/repos/github/Praqma/git-phlow/badge.svg?branch=master)](https://coveralls.io/github/Praqma/git-phlow?branch=master) | [![Stories in Ready](https://badge.waffle.io/Praqma/git-phlow.svg?label=ready&title=Ready)](http://waffle.io/Praqma/git-phlow) |
+| ![integration status](https://concourse.bosh.praqma.cloud/api/v1/teams/main/pipelines/git-phlow/jobs/checkin/badge) | ![build status](https://concourse.bosh.praqma.cloud/api/v1/teams/main/pipelines/git-phlow/jobs/takeoff/badge)  |[![Go Report Card](https://goreportcard.com/badge/github.com/Praqma/git-phlow)](https://goreportcard.com/report/github.com/Praqma/git-phlow) | [![Coverage Status](https://coveralls.io/repos/github/Praqma/git-phlow/badge.svg?branch=master)](https://coveralls.io/github/Praqma/git-phlow?branch=master) | [![Stories in Ready](https://badge.waffle.io/Praqma/git-phlow.svg?label=ready&title=Ready)](http://waffle.io/Praqma/git-phlow) |
 
 
 git-phlow (pronounced _"git flow"_), is a CLI extension for git, which provides an extra set of commands to easily use our pragmatic workflow called **the phlow**. It provides a branching model which makes collaboration easy. It also provides automatic issue tracking using [GitHub](https://github.com) issues with [Waffle](https://waffle.io/). The branching model uses branches prefixed with `ready` (can be configured) to mark delivered tasks to the remote repository from where automation services can pick up and integrate the changes into the stable branch.

cmd/cmdperm/prerunperm.go

@@ -7,6 +7,7 @@ import (
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/praqma/git-phlow/setting"
+	"github.com/praqma/git-phlow/executor"
 )
 
 //RequiredAuthentication ...
@@ -25,7 +26,8 @@ func RequiredAuthentication() {
 //RequiredCurDirRepository ...
 //Validates if the command is runnign in a git repository
 func RequiredCurDirRepository() {
-	if err := githandler.Status(); err != nil {
+	git := githandler.Git{Run: executor.RunGit}
+	if _, err := git.Status(); err != nil {
 		fmt.Fprintln(os.Stdout, err)
 		os.Exit(0)
 	}

executor/executor.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 
 	"github.com/praqma/git-phlow/options"
-	"io"
 )
 
 //verboseOutput ...
@@ -36,14 +35,13 @@ func ExecuteCommander(c Commander) error {
 	return nil
 }
 
-
 //Runner ...
 //Runner type for git executions
 type Runner func(command string, argv ...string) (string, error)
 
 //Run ...
 //implemented runner
-func Run(command string, argv ...string) (string, error) {
+func RunCommand(command string, argv ...string) (string, error) {
 	var stdOutBuffer, stdErrBuffer bytes.Buffer
 	exe := exec.Command(command, argv...)
 
@@ -64,10 +62,15 @@ func Run(command string, argv ...string) (string, error) {
 	return stdOutBuffer.String(), nil
 }
 
+//GitCommandRunner ...
+type GitCommandRunner func(git string, sub string, argv ...string) (string, error)
+
 //ExecuteCommand ...
 //Executes a single command from strings
-func ExecuteCommand(command string, argv ...string) (string, error) {
-	exe := exec.Command(command, argv...)
+func RunGit(git string, sub string, argv ...string) (string, error) {
+
+	argv = append([]string{sub}, argv...)
+	exe := exec.Command(git, argv...)
 
 	if options.GlobalFlagVerbose {
 		verboseOutput(exe.Args...)
@@ -91,63 +94,3 @@ func ExecuteCommand(command string, argv ...string) (string, error) {
 
 	return stdOutBuffer.String(), nil
 }
-
-//ExecPipeCommand ...
-//Executes a series of commands
-func ExecPipeCommand(out *bytes.Buffer, execStack ...*exec.Cmd) (err error) {
-
-	var errBuf bytes.Buffer
-
-	pipes := make([]*io.PipeWriter, len(execStack)-1)
-	execStack[len(execStack)-1].Stdout = out
-
-	for i := 0; i < len(execStack)-1; i++ {
-		r, w := io.Pipe()
-		execStack[i].Stdout = w
-		execStack[i].Stderr = &errBuf
-		execStack[i+1].Stdin = r
-		pipes[i] = w
-
-	}
-
-	for i := 0; i < len(execStack); i++ {
-		if options.GlobalFlagVerbose {
-			verboseOutput(execStack[i].Args...)
-		}
-
-		if err = execStack[i].Start(); err != nil {
-			return
-		}
-	}
-
-	if err = closer(pipes, execStack); err != nil {
-		return
-	}
-
-	return nil
-}
-
-//closer ...
-//helper function to ExecutePipeCommand
-func closer(pipes []*io.PipeWriter, execStack []*exec.Cmd) (err error) {
-	//Return if the command-stack is empty
-	if len(execStack) <= 0 {
-		return nil
-	}
-
-	defer func() {
-		//Close the pipe if more exists
-		if len(pipes) > 0 {
-			if err = pipes[0].Close(); err != nil {
-				return
-			}
-			pipes = pipes[1:]
-		}
-		if err = closer(pipes, execStack[1:]); err != nil {
-			return
-		}
-	}()
-	//Wait for the command to return, defer is the
-	//last function to be executed
-	return execStack[0].Wait()
-}

executor/executor_test.go

@@ -14,15 +14,15 @@ var _ = Describe("Executor", func() {
 
 		Context("called with valid command ls", func() {
 			It("should not return an error", func() {
-				_, err := ExecuteCommand("git", "--version")
+				_, err := RunCommand("git", "--version")
 
 				Ω(err).Should(BeNil())
 			})
 		})
 
 		Context("called with invalid command", func() {
 			It("should fail", func() {
-				output, err := ExecuteCommand("lsk", "-lah")
+				output, err := RunCommand("lsk", "-lah")
 				Ω(output).Should(BeEmpty())
 				Ω(err).ShouldNot(BeNil())
 			})

githandler/branch.go

@@ -13,65 +13,26 @@ type BranchInfo struct {
 	List    []string
 }
 
-func RemoteBranch() (remote string) {
-	remote, err := executor.ExecuteCommand("git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}")
-	if err != nil {
-		return ""
-	}
-	return
-}
-
-//Branch ...
-func Branch() (*BranchInfo, error) {
-	var err error
-	info := BranchInfo{}
+//AsList ...
+func AsList(branchOutput string) *BranchInfo {
+	var info BranchInfo
 
-	current, cErr := executor.ExecuteCommand("git", "rev-parse", "--abbrev-ref", "HEAD")
-	if cErr != nil {
-		return nil, err
-	}
-
-	output, lErr := executor.ExecuteCommand("git", "branch", "-a")
-	if lErr != nil {
-		return nil, err
-	}
-
-	info.Current = strings.TrimSpace(current)
-	for _, branch := range strings.Split(output, "\n") {
+	for _, branch := range strings.Split(branchOutput, "\n") {
 		if branch != "" {
-			branch = strings.TrimPrefix(branch, "*")
+			if strings.HasPrefix(branch, "*") {
+				branch = strings.TrimPrefix(branch, "*")
+				branch = strings.TrimSpace(branch)
+				info.Current = branch
+			}
 			branch = strings.TrimSpace(branch)
 			info.List = append(info.List, branch)
 		}
 	}
-	return &info, err
-}
-
-//BranchRename ...
-func BranchRename(name string) error {
-	_, err := executor.ExecuteCommand("git", "branch", "-m", name, "delivered/"+name)
-	return err
-}
-
-//BranchDelete ...
-func BranchDelete(name, remote string, deleteRemote, force bool) (string, error) {
-	if deleteRemote {
-		return executor.ExecuteCommand("git", "push", remote, "--delete", name)
-	}
-
-	if force {
-		return executor.ExecuteCommand("git", "branch", "-D", name)
-	}
-	return executor.ExecuteCommand("git", "branch", "-d", name)
+	return &info
 }
 
-//BranchDelivered ...
-func BranchDelivered(remote string) (localBranches []string, remoteBranches []string) {
-	info, err := Branch()
-
-	if err != nil {
-		return
-	}
+//Delivered ...
+func Delivered(info *BranchInfo, remote string) (localBranches []string, remoteBranches []string) {
 
 	for _, branch := range info.List {
 		if strings.HasPrefix(branch, "delivered/") {
@@ -85,21 +46,8 @@ func BranchDelivered(remote string) (localBranches []string, remoteBranches []st
 	return
 }
 
-func branchRemote() (string, error) {
-	output, err := executor.ExecuteCommand("git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}")
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(output), nil
-}
-
-//BranchReady ...
-func BranchReady(remote string, prefix string) (remoteBranches []string) {
-	info, err := Branch()
-	if err != nil {
-		return
-	}
-
+//Ready ...
+func Ready(info *BranchInfo, remote string, prefix string) (remoteBranches []string) {
 	for _, branch := range info.List {
 		if strings.HasPrefix(branch, "remotes/"+remote+"/"+prefix) {
 			branch = strings.TrimPrefix(branch, "remotes/")
@@ -109,9 +57,19 @@ func BranchReady(remote string, prefix string) (remoteBranches []string) {
 	return
 }
 
+
+
+
+//DEPRECETED SECTION - USE GIT
+//BranchRename ...
+func BranchRename(name string) error {
+	_, err := executor.RunCommand("git", "branch", "-m", name, "delivered/"+name)
+	return err
+}
+
 //BranchTime ...
 func BranchTime(name string) (int, error) {
-	output, err := executor.ExecuteCommand("git", "log", "-n 1", name, "--format=format:%ct")
+	output, err := executor.RunCommand("git", "log", "-n 1", name, "--format=format:%ct")
 	if err != nil {
 		return -1, err
 	}