fix: wrong increments detected (#36)

Author: jcrqr

internal/git/mod.go

@@ -137,11 +137,11 @@ func PushToOrigin(repo *Repository, auth AuthMethod) error {
 	pushOpts := &git.PushOptions{
 		RemoteName: "origin",
 		Progress:   os.Stdout,
-		RefSpecs:   []config.RefSpec{
+		RefSpecs: []config.RefSpec{
 			config.RefSpec("refs/heads/*:refs/heads/*"),
 			config.RefSpec("refs/tags/*:refs/tags/*"),
 		},
-		Auth:       auth,
+		Auth: auth,
 	}
 
 	if err := repo.Push(pushOpts); err != nil {

pkg/gitsemver/project.go

@@ -23,10 +23,10 @@ const (
 )
 
 var (
-	breaking     = regexp.MustCompile("(?im).*breaking change:.*")
-	breakingBang = regexp.MustCompile(`(?im).*(\w+)(\(.*\))?!:.*`)
-	feature      = regexp.MustCompile(`(?im).*feat(\(.*\))?:.*`)
-	patch        = regexp.MustCompile(`(?im).*fix(\(.*\))?:.*`)
+	breaking     = regexp.MustCompile("(?im)^breaking change:.*")
+	breakingBang = regexp.MustCompile(`(?i)^(\w+)(\(.*\))?!:.*`)
+	feature      = regexp.MustCompile(`(?i)^feat(\(.*\))?:.*`)
+	patch        = regexp.MustCompile(`(?i)^fix(\(.*\))?:.*`)
 )
 
 type Project struct {
@@ -190,26 +190,9 @@ func (p *Project) NextVersionIncrement() (Increment, error) {
 		}
 	}
 
-	var increment = None
-
-	for _, commit := range commits {
-		commitIncrement := None
-
-		if breaking.MatchString(commit.Message) || breakingBang.MatchString(commit.Message) {
-			commitIncrement = Major
-		}
-
-		if feature.MatchString(commit.Message) {
-			commitIncrement = Minor
-		}
-
-		if patch.MatchString(commit.Message) {
-			commitIncrement = Patch
-		}
-
-		if commitIncrement > increment {
-			increment = commitIncrement
-		}
+	increment, err := resolveIncrement(commits)
+	if err != nil {
+		return None, err
 	}
 
 	return increment, nil
@@ -265,3 +248,29 @@ func TagNameFromProjectAndVersion(p *Project, v *semver.Version) string {
 
 	return v.Original()
 }
+
+func resolveIncrement(commits []*git.Commit) (Increment, error) {
+	var increment = None
+
+	for _, commit := range commits {
+		commitIncrement := None
+
+		if breaking.MatchString(commit.Message) || breakingBang.MatchString(commit.Message) {
+			commitIncrement = Major
+		}
+
+		if feature.MatchString(commit.Message) {
+			commitIncrement = Minor
+		}
+
+		if patch.MatchString(commit.Message) {
+			commitIncrement = Patch
+		}
+
+		if commitIncrement > increment {
+			increment = commitIncrement
+		}
+	}
+
+	return increment, nil
+}

pkg/gitsemver/project_test.go

@@ -0,0 +1,51 @@
+package gitsemver
+
+import (
+	"testing"
+
+	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIncrementMajor(t *testing.T) {
+	testCommitIncrement(t, "feat!: test", Major)
+	testCommitIncrement(t, "fix!: test", Major)
+	testCommitIncrement(t, "any!: test", Major)
+	testCommitIncrement(t, "breaking change: test", Major)
+	testCommitIncrement(t, "BREAKING CHANGE: test", Major)
+	testCommitIncrement(t, `some comment
+breaking change: test
+  `, Major)
+}
+
+func TestIncremenMinor(t *testing.T) {
+	testCommitIncrement(t, "feat: test", Minor)
+}
+
+func TestIncremenPatch(t *testing.T) {
+	testCommitIncrement(t, "fix: test", Patch)
+}
+
+func TestIncremenNone(t *testing.T) {
+	testCommitIncrement(t, "docs: test", None)
+	testCommitIncrement(t, "rand: test", None)
+	testCommitIncrement(t, "rand: with feat: inside", None)
+}
+
+func TestIncremeWithScope(t *testing.T) {
+	testCommitIncrement(t, "docs(README): test", None)
+	testCommitIncrement(t, "feat(login)!: test", Major)
+	testCommitIncrement(t, "feat(users): test", Minor)
+	testCommitIncrement(t, "fix(orders): test", Patch)
+}
+
+func testCommitIncrement(t *testing.T, msg string, expected Increment) {
+	commits := []*object.Commit{{Message: msg}}
+
+	increment, err := resolveIncrement(commits)
+	if err != nil {
+		t.Error(err)
+	}
+
+	assert.Equal(t, expected, increment)
+}