removed pcre since cannot compile for windows, for now.

Therefore had to simplify some regex expressions.

Author: Oppodelldog

Gopkg.lock

@@ -1,33 +1,7 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
-
 [[constraint]]
   name = "github.com/Oppodelldog/filediscovery"
   version = "0.1.0"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/glenn-brown/golang-pkg-pcre"
-
 [[constraint]]
   name = "github.com/pkg/errors"
   version = "0.8.0"

Gopkg.toml

@@ -56,6 +56,8 @@ func restoreOriginals() {
 
 func TestMain_HappyPath(t *testing.T) {
 	defer restoreOriginals()
+	defer testhelper.CleanupTestEnvironment(t)
+	testhelper.CleanupTestEnvironment(t)
 
 	initGitRepositoryWithBranchAndConfig(t, featureBranch)
 	setCommitMessage(t, "initial commit")

cmd/main_test.go

@@ -17,7 +17,7 @@ func TestParse(t *testing.T) {
 			Path: "/home/nils/projects/xyz/.git",
 			BranchTypes: map[string]BranchTypePattern{
 				"master":  `^(origin\/)*master`,
-				"feature": `^((?!master|release|develop).)*$`,
+				"feature": `^(origin\/)*feature/.*$`,
 				"develop": `^(origin\/)*develop$`,
 				"release": `^(origin\/)*release\/v([0-9]*\.*)*$`,
 				"hotfix":  `^(origin\/)*hotfix\/v([0-9]*\.*)*$`,
@@ -27,7 +27,7 @@ func TestParse(t *testing.T) {
 			},
 			Validation: map[string]BranchValidationConfiguration{
 				"*": {
-					`(?m)(?:\s|^|/)(([A-Z](_)*)+-[0-9]+)([\s,;:!.-]|$)`: "valid ticket ID",
+					`(?m)(?:\s|^|/)(([A-Z](_)*)+-[0-9]+)([\s,;:!.-]|$)`: "valid ticket ID (fallback validator)",
 				},
 				"develop": {
 					`(?m)(?:\s|^|/)(([A-Z](_)*)+-[0-9]+)([\s,;:!.-]|$)`: "valid ticket ID",

config/parsing_test.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/glenn-brown/golang-pkg-pcre/src/pkg/pcre"
+	"github.com/Oppodelldog/git-commit-hook/regexadapter"
 )
 
 type (
@@ -23,7 +23,7 @@ type (
 func (projConf *Project) GetBranchType(branchName string) string {
 
 	for branchType, branchTypePattern := range projConf.BranchTypes {
-		if regexMatchesString(string(branchTypePattern), branchName) {
+		if regexadapter.RegexMatchesString(string(branchTypePattern), branchName) {
 			return branchType
 		}
 	}
@@ -43,7 +43,3 @@ func (projConf *Project) GetValidator(branchType string) map[string]string {
 
 	return foundValidators
 }
-
-func regexMatchesString(pattern string, branchName string) bool {
-	return pcre.MustCompile(pattern, 0).MatcherString(branchName, 0).Matches()
-}

config/project.go

@@ -9,8 +9,7 @@ import (
 func TestGetBranchType(t *testing.T) {
 
 	testDataSet := []struct{ BranchName, ExpectedBranchType string }{
-		{BranchName: "FEATURE-123", ExpectedBranchType: "feature"},
-		{BranchName: "noissue_fix_something", ExpectedBranchType: "feature"},
+		{BranchName: "feature/FEATURE-123", ExpectedBranchType: "feature"},
 		{BranchName: "release/v1.0.0", ExpectedBranchType: "release"},
 		{BranchName: "release/v1.0.0-fix", ExpectedBranchType: "release"},
 		{BranchName: "master", ExpectedBranchType: ""},
@@ -22,8 +21,8 @@ func TestGetBranchType(t *testing.T) {
 
 			cfg := &Project{
 				BranchTypes: map[string]BranchTypePattern{
-					"feature": `(?m)^()((?!master|release|develop).)*$`,
-					"release": `(?m)^(origin\/)*release\/v([0-9]*\.*)*(-fix)*$`,
+					"feature": `^(origin\/)*feature/.*$`,
+					"release": `^(origin\/)*release\/v([0-9]*\.*)*(-fix)*$`,
 				},
 			}
 

config/project_test.go

@@ -6,7 +6,7 @@
   # define types of branch and a pattern to identify the type for the current branch you are working on
   branch:
      master: "^(origin\\/)*master"
-     feature: "^((?!master|release|develop).)*$"
+     feature: "^(origin\\/)*feature/.*$"
      develop: "^(origin\\/)*develop$"
      release: "^(origin\\/)*release\\/v([0-9]*\\.*)*$"
      hotfix: "^(origin\\/)*hotfix\\/v([0-9]*\\.*)*$"

config/test-data.yaml

@@ -60,7 +60,7 @@ func TestModifyGitCommitMessage(t *testing.T) {
 
 	prjCfg := config.Project{
 		BranchTypes: map[string]config.BranchTypePattern{
-			"feature": `(?m)^((?!master|release|develop).)*$`,
+			"feature": `(?m)^((origin\/)*feature\/.*)|(?:\s|^|/)(([A-Z](_)*)+-[0-9]+)([\s,;:!.-]|$)`,
 			"release": `(?m)^(origin\/)*release\/v([0-9]*\.*)*(-fix)*$`,
 		},
 		Templates: map[string]config.BranchTypeTemplate{

hook/modifier_test.go

@@ -14,7 +14,7 @@ func TestRenderCommitMessage(t *testing.T) {
 	}
 	cfg := &config.Project{
 		BranchTypes: map[string]config.BranchTypePattern{
-			"feature": `(?m)^()((?!master|release|develop).)*$`,
+			"feature": `^(origin\/)*feature/.*$`,
 		},
 		Templates: map[string]config.BranchTypeTemplate{
 			"feature": "{{.BranchName}}: {{.CommitMessage}}",
@@ -34,7 +34,7 @@ func TestRenderCommitMessage_InvalidTemplate_ReturnsError(t *testing.T) {
 	viewModel := ViewModel{}
 	cfg := &config.Project{
 		BranchTypes: map[string]config.BranchTypePattern{
-			"feature": `(?m)^()((?!master|release|develop).)*$`,
+			"feature": `.*`,
 		},
 		Templates: map[string]config.BranchTypeTemplate{
 			"feature": config.BranchTypeTemplate(invalidTemplate),
@@ -53,7 +53,7 @@ func TestRenderCommitMessage_NoTemplateFound_PassesBackTheGivenCommitMessage(t *
 	}
 	cfg := &config.Project{
 		BranchTypes: map[string]config.BranchTypePattern{
-			"feature": `(?m)^()((?!master|release|develop).)*$`,
+			"feature": `.*`,
 		},
 		Templates: map[string]config.BranchTypeTemplate{}}
 

hook/renderer_test.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/Oppodelldog/git-commit-hook/config"
-	"github.com/glenn-brown/golang-pkg-pcre/src/pkg/pcre"
+	"github.com/Oppodelldog/git-commit-hook/regexadapter"
 )
 
 type (
@@ -38,7 +38,7 @@ func (v *commitMessageValidator) Validate(branchName, commitMessage string) erro
 	}
 
 	for validationPattern := range validators {
-		if regexMatchesString(validationPattern, commitMessage) {
+		if regexadapter.RegexMatchesString(validationPattern, commitMessage) {
 			return nil
 		}
 	}
@@ -60,6 +60,3 @@ func prepareError(branchName string, validators map[string]string) error {
 	return errors.New(buffer.String())
 }
 
-func regexMatchesString(pattern string, branchName string) bool {
-	return pcre.MustCompile(pattern, 0).MatcherString(branchName, 0).Matches()
-}