Merge pull request #20 from NeowayLabs/fix-commit-lint-to-allow-merge-from-master

fix(commit-lint): Fix IsValidMessage method to skip commit lint when …

Author: esequielvirtuoso

CHANGELOG.md

@@ -1,3 +1,10 @@
+v2.0.1:
+ - Fix IsValidMessage method to skip commit lint when the message is a merge from master to a developer branch. (@esequiel.virtuoso)
+ - Add chore option. (@esequiel.virtuoso)
+
+v2.0.0:
+ - Change semantic-release message pattern to 'type(scope?): message here'. (@esequiel.virtuoso)
+
 v1.0.5
  - Fix isSetNewVersion function logic (@esequiel.virtuoso)
 

cmd/semantic-release/semantic-release.go

@@ -183,6 +183,7 @@ func printCommitTypes() {
 	fmt.Println(colorYellow + "\t*         [refactor]" + colorReset + ": A code change that neither fixes a bug nor adds a feature")
 	fmt.Println(colorYellow + "\t*            [style]" + colorReset + ": Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)")
 	fmt.Println(colorYellow + "\t*             [test]" + colorReset + ": Adding missing tests or correcting existing tests")
+	fmt.Println(colorYellow + "\t*            [chore]" + colorReset + ": No production code change. It won't release a new version.")
 	fmt.Println(colorYellow + "\t*             [skip]" + colorReset + ": Skip versioning")
 	fmt.Println(colorYellow + "\t*               [bc]" + colorReset + ": Changes that will require other changes in dependant applications")
 	fmt.Println(colorYellow + "\t*         [breaking]" + colorReset + ": ||")

src/commit-message/commit_message_manager.go

@@ -75,7 +75,22 @@ func (f *CommitMessage) PrettifyCommitMessage(commitMessage string) (string, err
 	return f.upperFirstLetterOfSentence(message), nil
 }
 
+func isMergeMasterToBranch(message string) bool {
+	splitedMessage := strings.Split(strings.ToLower(message), "\n")
+
+	for _, row := range splitedMessage {
+		if strings.Contains(row, "'origin/master' into") {
+			return true
+		}
+	}
+	return false
+}
+
 func (f *CommitMessage) IsValidMessage(message string) bool {
+	if isMergeMasterToBranch(message) {
+		return true
+	}
+
 	index := strings.Index(message, ":")
 
 	if f.commitType.IndexNotFound(index) {

src/commit-message/commit_message_manager_test.go

@@ -94,3 +94,10 @@ func TestIsValidMessageFalse(t *testing.T) {
 	actual = f.commitMessageManager.IsValidMessage(message)
 	tests.AssertFalse(t, actual)
 }
+
+func TestIsValidMessageMergeMasterBranchSuccess(t *testing.T) {
+	f := setup(t)
+	message := "first message row \n Merge remote-tracking branch 'origin/master' into something \n last message row"
+	actual := f.commitMessageManager.IsValidMessage(message)
+	tests.AssertTrue(t, actual)
+}

src/commit-type/commit_type.go

@@ -15,7 +15,7 @@ type CommitType struct {
 }
 
 func (c *CommitType) GetAll() []string {
-	return []string{"build", "ci", "docs", "fix", "feat", "feature", "feature", "perf", "performance", "refactor", "style", "test", "bc", "breaking", "breaking change", "skip"}
+	return []string{"build", "ci", "docs", "fix", "feat", "feature", "feature", "perf", "performance", "refactor", "style", "test", "bc", "breaking", "breaking change", "chore", "skip"}
 }
 
 func (c *CommitType) GetMajorUpgrade() []string {
@@ -31,7 +31,7 @@ func (c *CommitType) GetPatchUpgrade() []string {
 }
 
 func (c *CommitType) GetSkipVersioning() []string {
-	return []string{"skip"}
+	return []string{"skip", "chore"}
 }
 
 func (c *CommitType) isValidCommitType(commitTypeScope string) bool {

src/commit-type/commit_type_test.go

@@ -27,7 +27,7 @@ func setup(t *testing.T) *fixture {
 
 func TestGetAll(t *testing.T) {
 	f := setup(t)
-	expected := []string{"build", "ci", "docs", "fix", "feat", "feature", "feature", "perf", "performance", "refactor", "style", "test", "bc", "breaking", "breaking change", "skip"}
+	expected := []string{"build", "ci", "docs", "fix", "feat", "feature", "feature", "perf", "performance", "refactor", "style", "test", "bc", "breaking", "breaking change", "chore", "skip"}
 	actual := f.commitType.GetAll()
 
 	tests.AssertDeepEqualValues(t, expected, actual)
@@ -59,7 +59,7 @@ func TestGetPatchUpgrade(t *testing.T) {
 
 func TestGetSkipVersioning(t *testing.T) {
 	f := setup(t)
-	expected := []string{"skip"}
+	expected := []string{"skip", "chore"}
 	actual := f.commitType.GetSkipVersioning()
 
 	tests.AssertDeepEqualValues(t, expected, actual)