Allow both :: and . for internal exec placeholders

Author: sebastianfeldmann

README.md

@@ -59,7 +59,7 @@ Here's an example *captainhook.json* configuration file.
     "commit-msg": {
       "actions": [
         {
-          "run": "CaptainHook::Message.MustFollowBeamsRules"
+          "run": "CaptainHook.Message.MustFollowBeamsRules"
         }
       ]
     },
@@ -73,7 +73,7 @@ Here's an example *captainhook.json* configuration file.
     "pre-push": {
       "actions": [
         {
-          "run": "CaptainHook::Branch.PreventPushOfFixupAndSquashCommits",
+          "run": "CaptainHook.Branch.PreventPushOfFixupAndSquashCommits",
           "options": {
             "branches-to-protect": ["main", "integration"]
           }

exec/condition.go

@@ -54,7 +54,7 @@ func (c *ConditionRunner) createInternalCondition(condition *configuration.Condi
 	path := splitInternalPath(condition.Run())
 	conditionGenerator, err := conditions.ConditionCreationFunc(path)
 	if err != nil {
-		c.cIO.Write("ConditionRunner: "+condition.Run()+"\n"+err.Error(), true, io.NORMAL)
+		c.cIO.Write("ConditionRunner: "+condition.Run()+"\n"+err.Error(), true, io.QUIET)
 		return nil, err
 	}
 	return conditionGenerator(c.cIO, c.conf, c.repo), nil

exec/helper.go

@@ -6,24 +6,32 @@ import (
 )
 
 // isILogicCondition checks if the condition is an "AND" or an "OR" condition
-func isLogicCondition(action string) bool {
-	return strings.HasPrefix(strings.ToLower(action), "captainhook::logic")
+func isLogicCondition(exec string) bool {
+	return strings.HasPrefix(strings.ToLower(exec), "captainhook::logic") ||
+		strings.HasPrefix(strings.ToLower(exec), "captainhook.logic")
 }
 
 // isInternalFunctionality answers if an action should trigger internal CaptainHook functionality
-func isInternalFunctionality(action string) bool {
-	return strings.HasPrefix(strings.ToLower(action), "captainhook::")
+func isInternalFunctionality(exec string) bool {
+	return strings.HasPrefix(strings.ToLower(exec), "captainhook::") ||
+		strings.HasPrefix(strings.ToLower(exec), "captainhook.")
 }
 
 // splitInternalPath is determining the internal functionality to call
 // Internal paths consist of two blocks separated by .
 //
 // Examples:
 // - CaptainHook::SOME.FUNCTIONALITY
-// - CaptainHook::Branch.EnsureNaming
-func splitInternalPath(action string) []string {
-	actionPath := strings.Split(action, "::")[1]
-	return strings.Split(actionPath, ".")
+// - CaptainHook.Branch.EnsureNaming
+func splitInternalPath(exec string) []string {
+	var prefix string
+	if strings.HasPrefix(strings.ToLower(exec), "captainhook::") {
+		prefix = "captainhook::"
+	} else {
+		prefix = "captainhook."
+	}
+	pathInfo := strings.Replace(strings.ToLower(exec), prefix, "", 1)
+	return strings.Split(pathInfo, ".")
 }
 
 // isSymlink checks if a file is a symlink

hooks/actions/actions.go

@@ -47,7 +47,7 @@ var (
 // ActionCreationFunc is returning a function to create the configured action
 func ActionCreationFunc(path []string) (func(appIO io.IO, conf *configuration.Configuration, repo git.Repo) hooks.Action, error) {
 	if len(path) != 2 {
-		return nil, errors.New("invalid actions functionality")
+		return nil, errors.New("invalid action functionality")
 	}
 
 	for index, value := range path {