fix: apply exclusions in hook mode

Author: csdev

cmd/conch/main.go

@@ -207,12 +207,7 @@ func main() {
 			log.Fatalf("%v", parseErr)
 		}
 		origMsg = commit.StripComments(origMsg)
-
-		var c *commit.Commit
-		c, parseErr = commit.ParseMessage(origMsg, cfg)
-		if parseErr == nil {
-			commits = []*commit.Commit{c}
-		}
+		commits, parseErr = commit.ParseMessage(origMsg, cfg)
 	} else {
 		commits, parseErr = commit.ParseRange(repoPath, flag.Arg(0), cfg)
 	}

internal/commit/commit.go

@@ -269,10 +269,22 @@ func ParseRange(repoPath string, rangeSpec string, cfg *config.Config) ([]*Commi
 	return commits, nil
 }
 
-func ParseMessage(msg string, cfg *config.Config) (*Commit, error) {
+// ParseMessage parses a single commit message and returns a slice of the
+// resulting Commit objects. (It may return an empty slice if the commit
+// message was excluded.)
+func ParseMessage(msg string, cfg *config.Config) ([]*Commit, error) {
+	commits := make([]*Commit, 0, 1)
+	if isExcluded(msg, cfg) {
+		return commits, nil
+	}
+
 	c := NewCommit("0")
 	err := c.setMessage(msg)
-	return c, err
+	if err != nil {
+		return commits, err
+	}
+	commits = append(commits, c)
+	return commits, nil
 }
 
 // ApplyPolicy checks if the commit is semantically valid

internal/commit/commit_test.go

@@ -537,6 +537,57 @@ func TestParseRange(t *testing.T) {
 	}
 }
 
+func TestParseMessage(t *testing.T) {
+	tests := []struct {
+		description     string
+		msg             string
+		cfg             *config.Config
+		expectedCommits []*Commit
+		expectedErr     error
+	}{
+		{
+			description: "it returns a valid commit",
+			msg:         "feat: a new thing",
+			cfg:         config.Default(),
+			expectedCommits: []*Commit{
+				{
+					Id:          "0",
+					ShortId:     "0",
+					Type:        "feat",
+					Description: "a new thing",
+				},
+			},
+			expectedErr: nil,
+		},
+		{
+			description: "it excludes a commit based on the config",
+			msg:         "revert the thing",
+			cfg: &config.Config{
+				Exclude: config.Exclude{
+					Prefixes: util.NewCaseInsensitiveSet([]string{"revert"}),
+				},
+			},
+			expectedCommits: []*Commit{},
+			expectedErr:     nil,
+		},
+		{
+			description:     "it returns an error for an invalid commit message",
+			msg:             "revert the thing",
+			cfg:             config.Default(),
+			expectedCommits: []*Commit{},
+			expectedErr:     ErrSummary("0"),
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.description, func(t *testing.T) {
+			commits, err := ParseMessage(test.msg, test.cfg)
+			assert.Equal(t, test.expectedCommits, commits)
+			assert.Equal(t, test.expectedErr, err)
+		})
+	}
+}
+
 func TestApplyPolicy(t *testing.T) {
 	commit := &Commit{
 		Id:          "0",