From d0b1341af01c2dd4cb7608fb2327e84b8120de69 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 8 Oct 2024 17:10:48 -0400 Subject: [PATCH] fix(cmd/joj): show valid scopes on wrong message --- cmd/joj3/conf/conf.go | 9 ++------- cmd/joj3/main.go | 5 +++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cmd/joj3/conf/conf.go b/cmd/joj3/conf/conf.go index e2a2c8f..193a118 100644 --- a/cmd/joj3/conf/conf.go +++ b/cmd/joj3/conf/conf.go @@ -164,15 +164,10 @@ func ParseMsg(confRoot, confName, msg string) (conf Conf, group string, err erro return } -func ListValidScopes(confRoot, confName, msg string) ([]string, error) { - conventionalCommit, err := parseConventionalCommit(msg) - if err != nil { - return []string{}, err - } - slog.Info("conventional commit", "commit", conventionalCommit) +func ListValidScopes(confRoot, confName string) ([]string, error) { confRoot = filepath.Clean(confRoot) validScopes := []string{} - err = filepath.Walk(confRoot, func(path string, info os.FileInfo, err error) error { + err := filepath.Walk(confRoot, func(path string, info os.FileInfo, err error) error { if err != nil { slog.Error("list valid scopes", "error", err) return err diff --git a/cmd/joj3/main.go b/cmd/joj3/main.go index e255890..ed18f0d 100644 --- a/cmd/joj3/main.go +++ b/cmd/joj3/main.go @@ -49,12 +49,13 @@ func mainImpl() error { if err != nil { slog.Error("parse msg", "error", err) validScopes, scopeErr := conf.ListValidScopes( - confRoot, confName, msg) + confRoot, confName) if scopeErr != nil { slog.Error("list valid scopes", "error", scopeErr) return err } - slog.Info("hint: valid scopes in commit message", "scopes", validScopes) + slog.Info("HINT: use valid scopes in commit message", + "valid scopes", validScopes) return err } if err := setupSlog(confObj.LogPath); err != nil { // after conf is loaded