Merge pull request #6 from ipanardian/development

Development
ipanardian · May 12, 2019 · fa7dc60 · fa7dc60
2 parents adf2c03 + 524f3d6
commit fa7dc60
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/core/app.go b/core/app.go
@@ -33,7 +33,7 @@ func InitializeApp(app *cli.App) {
 	app.Name = "GoBranch"
 	app.Usage = "A command line app to help you quickly creating git branch without hassle step."
 	app.UsageText = "Just type gobranch"
-	app.Version = "0.0.0.2"
+	app.Version = "0.1.0.0"
 	app.Author = "Ipan Ardian <https://github.com/ipanardian>"
 }
 
@@ -42,12 +42,12 @@ func SetFlags(app *cli.App) {
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
 			Name:  "tc",
-			Value: "_",
+			Value: "",
 			Usage: "Set type convention ('/', '-', '_'). e.g feature/{branch}, feature-{branch} or feature_{branch}",
 		},
 		cli.StringFlag{
 			Name:  "nc",
-			Value: "snake",
+			Value: "",
 			Usage: "Set naming convention ('snake', 'kebab'). e.g branch_name or branch-name",
 		},
 	}

diff --git a/core/ask.go b/core/ask.go
@@ -50,8 +50,8 @@ func getBranchTypeQuestion(branchType BranchType) []*survey.Question {
 					branchType.Enhance,
 					branchType.Bugfix,
 					branchType.Hotfix,
-					branchType.Hotfeature,
 					branchType.Test,
+					branchType.Release,
 					branchType.Custom,
 				},
 				Default: "Feature",

diff --git a/core/branch.go b/core/branch.go
@@ -34,13 +34,13 @@ import (
 
 //BranchType List predefined of BranchType
 type BranchType struct {
-	Feature    string
-	Enhance    string
-	Bugfix     string
-	Hotfix     string
-	Hotfeature string
-	Test       string
-	Custom     string
+	Feature string
+	Enhance string
+	Bugfix  string
+	Hotfix  string
+	Test    string
+	Release string
+	Custom  string
 }
 
 //BranchTypeMap Collection of base branch
@@ -67,7 +67,7 @@ var typeConvention = TypeConvention{
 }
 
 //Default TC
-var typeConventionSelected = typeConvention.Underscore
+var typeConventionSelected = typeConvention.ForwardSlash
 
 //namingConvention values
 var namingConvention = NamingConvention{
@@ -84,20 +84,20 @@ var branchType = BranchType{
 	"enhance",
 	"bugfix",
 	"hotfix",
-	"hotfeature",
 	"test",
+	"release",
 	"custom",
 }
 
 //branchTypeMap Init branchTypeMap
 var branchTypeMap = BranchTypeMap{
-	branchType.Feature:    "development",
-	branchType.Enhance:    "development",
-	branchType.Bugfix:     "development",
-	branchType.Hotfix:     "hotfix",
-	branchType.Hotfeature: "hotfix",
-	branchType.Test:       "development",
-	branchType.Custom:     "",
+	branchType.Feature: "development",
+	branchType.Enhance: "development",
+	branchType.Bugfix:  "development",
+	branchType.Hotfix:  "hotfix",
+	branchType.Test:    "development",
+	branchType.Release: "master",
+	branchType.Custom:  "",
 }
 
 //createBranchName Transform branch name