Merge branch 'use_spawn'

Author: owenthereal

cmd/cmd.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-	"syscall"
 )
 
 type Cmd struct {
@@ -53,20 +52,6 @@ func (cmd *Cmd) Exec() error {
 	return c.Run()
 }
 
-func (cmd *Cmd) SysExec() error {
-	binary, lookErr := exec.LookPath(cmd.Name)
-	if lookErr != nil {
-		return fmt.Errorf("command not found: %s", cmd.Name)
-	}
-
-	args := []string{cmd.Name}
-	args = append(args, cmd.Args...)
-
-	env := os.Environ()
-
-	return syscall.Exec(binary, args, env)
-}
-
 func New(name string) *Cmd {
 	return &Cmd{Name: name, Args: make([]string, 0)}
 }

commands/browse.go

@@ -64,6 +64,6 @@ func browse(command *Command, args *Args) {
 		utils.Check(err)
 	}
 
-  args.Replace(launcher[0], "", launcher[1:]...)
+	args.Replace(launcher[0], "", launcher[1:]...)
 	args.AppendParams(url)
 }

commands/runner.go

@@ -6,13 +6,38 @@ import (
 	"github.com/jingweno/gh/cmd"
 	"github.com/jingweno/gh/git"
 	shellquote "github.com/kballard/go-shellquote"
+	"os/exec"
+	"syscall"
 )
 
+type ExecError struct {
+	Err      error
+	ExitCode int
+}
+
+func (execError *ExecError) Error() string {
+	return execError.Err.Error()
+}
+
+func newExecError(err error) ExecError {
+	exitCode := 0
+	if err != nil {
+		exitCode = 1
+		if exitError, ok := err.(*exec.ExitError); ok {
+			if status, ok := exitError.Sys().(syscall.WaitStatus); ok {
+				exitCode = status.ExitStatus()
+			}
+		}
+	}
+
+	return ExecError{Err: err, ExitCode: exitCode}
+}
+
 type Runner struct {
 	Args []string
 }
 
-func (r *Runner) Execute() error {
+func (r *Runner) Execute() ExecError {
 	args := NewArgs(r.Args)
 	if args.Command == "" {
 		usage()
@@ -29,9 +54,9 @@ func (r *Runner) Execute() error {
 				}
 				if err := cmd.Flag.Parse(args.Params); err != nil {
 					if err == flag.ErrHelp {
-						return nil
+						return newExecError(nil)
 					} else {
-						return err
+						return newExecError(err)
 					}
 				}
 
@@ -41,25 +66,24 @@ func (r *Runner) Execute() error {
 			cmd.Run(cmd, args)
 
 			cmds := args.Commands()
+			var err error
 			if args.Noop {
 				printCommands(cmds)
 			} else {
-				err := executeCommands(cmds)
-				if err != nil {
-					return err
-				}
+				err = executeCommands(cmds)
 			}
 
-			return nil
+			return newExecError(err)
 		}
 	}
 
-	return git.SysExec(args.Command, args.Params...)
+	err := git.Spawn(args.Command, args.Params...)
+	return newExecError(err)
 }
 
 func slurpGlobalFlags(args *Args) {
 	for i, p := range args.Params {
-		if p == "--no-op" {
+		if p == "--noop" {
 			args.Noop = true
 			args.RemoveParam(i)
 		}
@@ -73,15 +97,8 @@ func printCommands(cmds []*cmd.Cmd) {
 }
 
 func executeCommands(cmds []*cmd.Cmd) error {
-	length := len(cmds)
-	for i, c := range cmds {
-		var err error
-		if i == (length - 1) {
-			err = c.SysExec()
-		} else {
-			err = c.Exec()
-		}
-
+	for _, c := range cmds {
+		err := c.Exec()
 		if err != nil {
 			return err
 		}

git/git.go

@@ -116,29 +116,14 @@ func Config(name string) (string, error) {
 	return output[0], nil
 }
 
-func SysExec(command string, args ...string) error {
-	cmd := cmd.New("git")
-	cmd.WithArg(command)
-	for _, a := range args {
-		cmd.WithArg(a)
-	}
-
-	return cmd.SysExec()
-}
-
 func Spawn(command string, args ...string) error {
 	cmd := cmd.New("git")
 	cmd.WithArg(command)
 	for _, a := range args {
 		cmd.WithArg(a)
 	}
 
-	out, err := cmd.ExecOutput()
-	if err != nil {
-		return errors.New(out)
-	}
-
-	return nil
+	return cmd.Exec()
 }
 
 func execGitCmd(input ...string) (outputs []string, err error) {

github/github.go

@@ -59,7 +59,7 @@ func (gh *GitHub) CreateRepository(project Project, description, homepage string
 
 func (gh *GitHub) CreatePullRequestForIssue(base, head, issue string) (string, error) {
 	client := gh.client()
-  params := octokat.PullRequestForIssueParams{Base: base, Head: head, Issue: issue}
+	params := octokat.PullRequestForIssueParams{Base: base, Head: head, Issue: issue}
 	pullRequest, err := client.CreatePullRequestForIssue(gh.repo(), params)
 	if err != nil {
 		return "", err
@@ -85,14 +85,14 @@ func (gh *GitHub) CiStatus(sha string) (*octokat.Status, error) {
 func (gh *GitHub) ForkRepository(name, owner string, noRemote bool) (repo *octokat.Repository, err error) {
 	client := gh.client()
 	config := gh.Config
-  repo, err = client.Repository(octokat.Repo{Name: name, UserName: config.User})
+	repo, err = client.Repository(octokat.Repo{Name: name, UserName: config.User})
 	if repo != nil && err == nil {
 		msg := fmt.Sprintf("Error creating fork: %s exists on %s", repo.FullName, GitHubHost)
 		err = errors.New(msg)
 		return
 	}
 
-  repo, err = client.Fork(octokat.Repo{Name: name, UserName: owner}, nil)
+	repo, err = client.Fork(octokat.Repo{Name: name, UserName: owner}, nil)
 
 	return
 }
@@ -109,7 +109,7 @@ func (gh *GitHub) ExpandRemoteUrl(owner, name string, isSSH bool) (url string) {
 
 func (gh *GitHub) repo() octokat.Repo {
 	project := gh.Project
-  return octokat.Repo{Name: project.Name, UserName: project.Owner}
+	return octokat.Repo{Name: project.Name, UserName: project.Owner}
 }
 
 func findOrCreateToken(user, password string) (string, error) {

main.go

@@ -2,12 +2,11 @@ package main
 
 import (
 	"github.com/jingweno/gh/commands"
-	"github.com/jingweno/gh/utils"
 	"os"
 )
 
 func main() {
 	runner := commands.Runner{Args: os.Args[1:]}
 	err := runner.Execute()
-	utils.Check(err)
+	os.Exit(err.ExitCode)
 }