Added support for alternate git remotes to support git forks of go pr…

…ojects.

commands/release.go

@@ -19,6 +19,10 @@ var ReleaseCommand = cli.Command{
 			Name:  "branch,b",
 			Usage: "Branch name to release. Default 'master'.",
 		},
+		cli.StringFlag{
+			Name:  "remote,r",
+			Usage: "Remote name to verify repository state against. Default 'origin'.",
+		},
 	},
 }
 
@@ -29,11 +33,12 @@ func release(c *cli.Context) error {
 	}
 
 	branch := c.String("branch")
+	remote := c.String("remote")
 
 	//TODO: Make this configurable
 	var vcsTool vcstool.VCSTool = &vcstool.GitVCSTool{}
 	if os.Getenv("TESTRELEASE") == "" {
-		if err := vcsTool.VerifyRepoState(project, branch); err != nil {
+		if err := vcsTool.VerifyRepoState(project, remote, branch); err != nil {
 			return err
 		}
 	}
@@ -42,7 +47,7 @@ func release(c *cli.Context) error {
 	}
 	if os.Getenv("TESTRELEASE") == "" {
 		tagName := fmt.Sprintf("v%s", project.Version)
-		if err := vcsTool.Tag(project, tagName); err != nil {
+		if err := vcsTool.Tag(project, remote, tagName); err != nil {
 			return err
 		}
 	}

project.yaml

@@ -1,5 +1,5 @@
 name: graven
-version: 1.0.0
+version: 1.0.1
 go_version: ">=1.9.1"
 artifacts:
 - classifier: darwin

vcstool/git_vcstool.go

@@ -12,28 +12,38 @@ type GitVCSTool struct{}
 
 type Validator func(stdout, stderr string) error
 
-func (g *GitVCSTool) Tag(project *domain.Project, tagName string) error {
+func (g *GitVCSTool) Tag(project *domain.Project, remote, tagName string) error {
+	remoteName := "origin"
+
+	if remote != "" {
+		remoteName = remote
+	}
+
 	if sout, serr, err := util.RunCommand(project.ProjectPath(), nil, "git", "tag", tagName); err != nil {
 		fmt.Printf("Tagging  %v\n%v\n", sout, serr)
 		return err
 	}
 
-	if sout, serr, err := util.RunCommand(project.ProjectPath(), nil, "git", "push", "--tags"); err != nil {
+	if sout, serr, err := util.RunCommand(project.ProjectPath(), nil, "git", "push", "--tags", remoteName); err != nil {
 		fmt.Printf("PushTags %v\n%v\n", sout, serr)
 		return err
 	}
 	return nil
 }
 
-func (g *GitVCSTool) VerifyRepoState(project *domain.Project, branch string) error {
+func (g *GitVCSTool) VerifyRepoState(project *domain.Project, remote, branch string) error {
 	remoteName := "origin"
 	branchName := "master"
 
+	if remote != "" {
+		remoteName = remote
+	}
+
 	if branch != "" {
 		branchName = branch
 	}
 
-	// Check if on expected branch (e.g. master)
+	fmt.Println("Check if on expected branch (e.g. master)")
 	if err := verifyGitState(func(stdout, stderr string) error {
 		actualBranch := strings.TrimSpace(stdout)
 		if actualBranch != branchName {
@@ -44,7 +54,7 @@ func (g *GitVCSTool) VerifyRepoState(project *domain.Project, branch string) err
 		return err
 	}
 
-	// Ensure no uncommitted changes
+	fmt.Println("Check for uncommitted changes")
 	if err := verifyGitState(func(stdout, stderr string) error {
 		if strings.TrimSpace(stdout) != "" || strings.TrimSpace(stderr) != "" {
 			return fmt.Errorf("Cannot release with uncommitted changes.")
@@ -54,7 +64,7 @@ func (g *GitVCSTool) VerifyRepoState(project *domain.Project, branch string) err
 		return err
 	}
 
-	// Check if changes exist on server
+	fmt.Println("Check if changes exist on server")
 	if err := verifyGitState(func(stdout, stderr string) error {
 		lineCount := len(strings.Split(strings.TrimSpace(stderr), "\n"))
 		if lineCount > 2 {
@@ -65,7 +75,7 @@ func (g *GitVCSTool) VerifyRepoState(project *domain.Project, branch string) err
 		return err
 	}
 
-	// Check if local changes are pushed
+	fmt.Println("Check if local changes are pushed")
 	if err := verifyGitState(func(stdout, stderr string) error {
 		parts := strings.Split(strings.TrimSpace(stdout), "\n")
 		if strings.TrimSpace(parts[0]) != strings.TrimSpace(parts[1]) {
@@ -82,7 +92,7 @@ func (g *GitVCSTool) VerifyRepoState(project *domain.Project, branch string) err
 func verifyGitState(validator Validator, project *domain.Project, args ...string) error {
 	sout, serr, err := util.RunCommand(project.ProjectPath(), nil, "git", args...)
 	if err != nil {
-		return fmt.Errorf("ERROR running Git command: %v\n", err)
+		return fmt.Errorf("ERROR running Git command:\n%v\n%v\n", serr, err)
 	}
 	return validator(sout, serr)
 }

vcstool/vsctool.go

@@ -5,6 +5,6 @@ import (
 )
 
 type VCSTool interface {
-	VerifyRepoState(project *domain.Project, branch string) error
-	Tag(project *domain.Project, tagname string) error
+	VerifyRepoState(project *domain.Project, remote, branch string) error
+	Tag(project *domain.Project, remote, tagname string) error
 }

version/version.go

@@ -1,4 +1,4 @@
 // graven - This file was generated. It will be overwritten. Do not modify.
 package version
 
-var Version = "1.0.0"
+var Version = "1.0.1"