fix by codereview

evilmartians · Mar 5, 2024 · c96d362 · c96d362
1 parent f4d8b25
commit c96d362
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/internal/config/command.go b/internal/config/command.go
@@ -41,7 +41,7 @@ func (c Command) Validate() error {
 
 func (c Command) DoSkip(gitState git.State) bool {
 	skipChecker := NewSkipChecker(nil)
-	return skipChecker.DoSkip(gitState, c.Skip, c.Only)
+	return skipChecker.Check(gitState, c.Skip, c.Only)
 }
 
 type commandRunReplace struct {

diff --git a/internal/config/hook.go b/internal/config/hook.go
@@ -44,7 +44,7 @@ func (h *Hook) Validate() error {
 
 func (h *Hook) DoSkip(gitState git.State) bool {
 	skipChecker := NewSkipChecker(nil)
-	return skipChecker.DoSkip(gitState, h.Skip, h.Only)
+	return skipChecker.Check(gitState, h.Skip, h.Only)
 }
 
 func unmarshalHooks(base, extra *viper.Viper) (*Hook, error) {

diff --git a/internal/config/script.go b/internal/config/script.go
@@ -24,8 +24,8 @@ type Script struct {
 }
 
 func (s Script) DoSkip(gitState git.State) bool {
-	skipChecker := NewSkipChecker(nil)
-	return skipChecker.DoSkip(gitState, s.Skip, s.Only)
+	skipChecker := NewSkipChecker(NewOsExec())
+	return skipChecker.Check(gitState, s.Skip, s.Only)
 }
 
 type scriptRunnerReplace struct {

diff --git a/internal/config/skip.go → internal/config/skip_checker.go b/internal/config/skip.go → internal/config/skip_checker.go
@@ -19,7 +19,7 @@ func NewSkipChecker(executor Exec) *SkipChecker {
 	return &SkipChecker{Executor: executor}
 }
 
-func (sc *SkipChecker) DoSkip(gitState git.State, skip interface{}, only interface{}) bool {
+func (sc *SkipChecker) Check(gitState git.State, skip interface{}, only interface{}) bool {
 	if skip != nil {
 		if sc.matches(gitState, skip) {
 			return true
@@ -87,7 +87,9 @@ func (sc *SkipChecker) matchesCommands(typedState map[string]interface{}) bool {
 		return false
 	}
 
-	log.Debug("[lefthook] skip/only cmd: ", commandLine)
+	result := sc.Executor.Cmd(commandLine)
 
-	return sc.Executor.Cmd(commandLine)
+	log.Debugf("[lefthook] skip/only cmd: %s, result: %t", commandLine, result)
+
+	return result
 }
diff --git a/internal/config/skip_test.go → internal/config/skip_checker_test.go b/internal/config/skip_test.go → internal/config/skip_checker_test.go
@@ -139,7 +139,7 @@ func TestDoSkip(t *testing.T) {
 		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
-			if skipChecker.DoSkip(tt.state, tt.skip, tt.only) != tt.skipped {
+			if skipChecker.Check(tt.state, tt.skip, tt.only) != tt.skipped {
 				t.Errorf("Expected: %v, Was %v", tt.skipped, !tt.skipped)
 			}
 		})