Fix get current branch

Author: Tobias Meinhardt

branch.go

@@ -25,7 +25,13 @@ type branch struct {
 	name string
 }
 
-const BRANCH_NAME_PREFIX = "refs/heads/"
+const (
+	BRANCH_NAME_PREFIX     = "refs/heads/"
+	FEATURE_BRANCH_PATTERN = `feature/[^/]+/.*`
+	FIX_BRANCH_PATTERN     = `fix/[^/]+/.*`
+	HOTFIX_BRANCH_PATTERN  = `hotfix/v.*`
+	RELEASE_BRANCH_PATTERN = `release/v.*`
+)
 
 // NewBranch creates a new branch definition
 func NewBranch(name string) Branch {
@@ -43,19 +49,19 @@ func BranchFromBranchName(name string) (b Branch, err error) {
 			Debug(l.Fields{"branch": b}).
 			Error(err)
 	}()
-	matched, err := regexp.Match(`feature/[^/]+/.*`, []byte(name))
+	matched, err := regexp.Match(FEATURE_BRANCH_PATTERN, []byte(name))
 	if matched && err == nil {
 		return FeatureFromBranch(name)
 	}
-	matched, err = regexp.Match(`fix/[^/]+/.*`, []byte(name))
+	matched, err = regexp.Match(FIX_BRANCH_PATTERN, []byte(name))
 	if matched && err == nil {
 		return FixFromBranch(name)
 	}
-	matched, err = regexp.Match(`hotfix/v.*`, []byte(name))
+	matched, err = regexp.Match(HOTFIX_BRANCH_PATTERN, []byte(name))
 	if matched && err == nil {
 		return HotfixFromBranch(name)
 	}
-	matched, err = regexp.Match(`release/v.*`, []byte(name))
+	matched, err = regexp.Match(RELEASE_BRANCH_PATTERN, []byte(name))
 	if matched && err == nil {
 		return ReleaseFromBranch(name)
 	}

feature.go

@@ -33,7 +33,7 @@ func FeatureFromBranch(branchName string) (b AuthoredBranch, err error) {
 			Info(l.Fields{"branch": b}).
 			Error(err)
 	}()
-	matched, err := regexp.Match(`feature/[^/]+/.*`, []byte(branchName))
+	matched, err := regexp.Match(FEATURE_BRANCH_PATTERN, []byte(branchName))
 	if !matched || err != nil {
 		return feature{}, errors.New("no valid feature branch")
 	}

feature_test.go

@@ -14,11 +14,12 @@ var _ = Describe("Feature", func() {
 	var branches []AuthoredBranch
 
 	BeforeEach(func() {
-		f1, _ := NewFeature("luke", "falcon")
-		f2, _ := FeatureFromBranch(BRANCH_NAME_PREFIX + "feature/luke/falcon")
-		f3, _ := BranchFromBranchName(BRANCH_NAME_PREFIX + "feature/luke/falcon")
-		f4, _ := BranchFromBranchName("feature/luke/falcon")
-		branches = []AuthoredBranch{f1, f2, f3, f4}
+		f1, _ := NewFeature("luke", "falcon-shuttle")
+		f2, _ := FeatureFromBranch("feature/luke/falcon-shuttle")
+		f3, _ := FeatureFromBranch(BRANCH_NAME_PREFIX + "feature/luke/falcon-shuttle")
+		f4, _ := BranchFromBranchName(BRANCH_NAME_PREFIX + "feature/luke/falcon-shuttle")
+		f5, _ := BranchFromBranchName("feature/luke/falcon-shuttle")
+		branches = []AuthoredBranch{f1, f2, f3, f4, f5}
 	})
 
 	It("is of type feature branch", func() {

fix.go

@@ -32,7 +32,7 @@ func FixFromBranch(branchName string) (b AuthoredBranch, err error) {
 			Info(l.Fields{"branch": b}).
 			Error(err)
 	}()
-	matched, err := regexp.Match(`fix/[^/]+/.*`, []byte(branchName))
+	matched, err := regexp.Match(FIX_BRANCH_PATTERN, []byte(branchName))
 	if !matched || err != nil {
 		return fix{}, errors.New("no valid fix branch")
 	}

git/native_adapter.go

@@ -37,7 +37,7 @@ func (a nativeGitAdapter) CurrentBranch() (branch glow.Branch, stdout, stderr st
 	}
 	for _, b := range cmdBranchList {
 		if b.IsCurrentBranch {
-			branch := glow.NewBranch(b.Name)
+			branch, err := glow.BranchFromBranchName(b.Name)
 			return branch, stdout, stderr, err
 		}
 	}

hotfix.go

@@ -36,7 +36,7 @@ func HotfixFromBranch(branchName string) (b Branch, err error) {
 			Info(l.Fields{"branch": b}).
 			Error(err)
 	}()
-	matched, err := regexp.Match(`hotfix/v.*`, []byte(branchName))
+	matched, err := regexp.Match(HOTFIX_BRANCH_PATTERN, []byte(branchName))
 	if !matched || err != nil {
 		return hotfix{}, errors.New("no valid hotfix branch")
 	}

release.go

@@ -36,7 +36,7 @@ func ReleaseFromBranch(branchName string) (b Branch, err error) {
 			Info(l.Fields{"branch": b}).
 			Error(err)
 	}()
-	matched, err := regexp.Match(`release/v.*`, []byte(branchName))
+	matched, err := regexp.Match(RELEASE_BRANCH_PATTERN, []byte(branchName))
 	if !matched || err != nil {
 		return release{}, errors.New("no valid release branch")
 	}

suite_test.go

@@ -17,7 +17,7 @@ const (
 	MASTER_BRANCH   = "master"
 	DEVELOP_BRANCH  = "develop"
 	RELEASE_BRANCH  = "release/v1.2.3"
-	FEAUTURE_BRANCH = "feature/luke/falcon"
+	FEAUTURE_BRANCH = "feature/luke/falcon-shuttle"
 	HOTFIX_BRANCH   = "hotfix/v0.0.1"
 	FIX_BRANCH      = "fix/luke/falcon"
 	ANOTHER_BRANCH  = "another-branch"