Merge pull request #17 from Connehito/16-allow-main-branch

#16 Allow main branch

cli.go

@@ -171,8 +171,8 @@ func printError(w io.Writer, message string, args ...interface{}) {
 
 func validate(cli *CLI, subCommand string, tag string) bool {
 	if subCommand == CommandDeploy {
-		if !cli.gdp.IsMasterBranch() {
-			printError(cli.errStream, fmt.Sprintf("Branch is not master."))
+		if !cli.gdp.IsMasterOrMainBranch() {
+			printError(cli.errStream, fmt.Sprintf("Branch is not master or main."))
 			return false
 		}
 		if cli.gdp.IsExistTagInLocal(tag) {

cli_test.go

@@ -155,7 +155,7 @@ type FakeGdpDeploy struct {
 	Gdp
 }
 
-func (f *FakeGdpDeploy) IsMasterBranch() bool {
+func (f *FakeGdpDeploy) IsMasterOrMainBranch() bool {
 	return true
 }
 
@@ -279,7 +279,7 @@ type FakeGdpDeployNotMasterBranch struct {
 	Gdp
 }
 
-func (f *FakeGdpDeployNotMasterBranch) IsMasterBranch() bool {
+func (f *FakeGdpDeployNotMasterBranch) IsMasterOrMainBranch() bool {
 	return false
 }
 
@@ -297,7 +297,7 @@ func TestRun_DeployNotMasterBranch(t *testing.T) {
 		t.Errorf("ExitCode=%d, Expected=%d", code, ExitError)
 	}
 
-	expected := "Branch is not master."
+	expected := "Branch is not master or main."
 	if !strings.Contains(err.String(), expected) {
 		t.Errorf("Output=%q, Expected=%q", err.String(), expected)
 	}
@@ -307,7 +307,7 @@ type FakeGdpDeployExistTagInLocal struct {
 	Gdp
 }
 
-func (f *FakeGdpDeployExistTagInLocal) IsMasterBranch() bool {
+func (f *FakeGdpDeployExistTagInLocal) IsMasterOrMainBranch() bool {
 	return true
 }
 
@@ -339,7 +339,7 @@ type FakeGdpDeployErrorInGetNextTag struct {
 	Gdp
 }
 
-func (f *FakeGdpDeployErrorInGetNextTag) IsMasterBranch() bool {
+func (f *FakeGdpDeployErrorInGetNextTag) IsMasterOrMainBranch() bool {
 	return true
 }
 
@@ -375,7 +375,7 @@ type FakeGdpDeployErrorInGetMergeCommitList struct {
 	Gdp
 }
 
-func (f *FakeGdpDeployErrorInGetMergeCommitList) IsMasterBranch() bool {
+func (f *FakeGdpDeployErrorInGetMergeCommitList) IsMasterOrMainBranch() bool {
 	return true
 }
 
@@ -411,7 +411,7 @@ type FakeGdpDeployErrorInDeploy struct {
 	Gdp
 }
 
-func (f *FakeGdpDeployErrorInDeploy) IsMasterBranch() bool {
+func (f *FakeGdpDeployErrorInDeploy) IsMasterOrMainBranch() bool {
 	return true
 }
 

command.go

@@ -10,7 +10,7 @@ import (
 
 // Gdp is the interface which has methods deploying and publising.
 type Gdp interface {
-	IsMasterBranch() bool
+	IsMasterOrMainBranch() bool
 	IsExistTagInLocal(tag string) bool
 	IsExistTagInRemote(tag string) bool
 	GetMergeCommitList(toTag string) (string, error)
@@ -39,15 +39,15 @@ func NewCommand() (Gdp, error) {
 	return &Command{}, nil
 }
 
-// IsMasterBranch checks current branch is master or not.
-func (c *Command) IsMasterBranch() bool {
+// IsMasterOrMainBranch checks current branch is master|main or not.
+func (c *Command) IsMasterOrMainBranch() bool {
 	out, err := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD").CombinedOutput()
 	if err != nil {
 		return false
 	}
 
 	branch := strings.TrimRight(string(out), "\n")
-	if branch != "master" {
+	if branch != "master" && branch != "main" {
 		return false
 	}
 

main.go

@@ -6,7 +6,7 @@ import (
 )
 
 // Version is GDP's version.
-const Version string = "v0.2.3"
+const Version string = "v0.2.4"
 
 // Usage is GDP's usage.
 const Usage string = "usage: gdp deploy|publish [options]"