Merge pull request #36 from nxtcoder17/feat/more-shell-supportgg

Feat/more shell supports, and shell aliases

#36

Author: nxtcoder17

docs/includes.md

@@ -174,3 +174,5 @@ var (
 
 	ErrTaskInvalidCommand = Err("task invalid command")
 )
+
+var ErrInvalidShellAlias error = Err("invalid shell alias")

docs/requirements-for-a-run-target.md

@@ -43,7 +43,8 @@ tasks:
 
   clean:
     name: clean
-    shell: ["python", "-c"]
+    # shell: ["python", "-c"]
+    shell: python
     # dotenv:
     #   - ../.secrets/env
     cmd:

errors/errors.go

@@ -144,7 +144,12 @@ func createCommandGroups(ctx types.Context, args CreateCommandGroupArgs) ([]exec
 				cg.PreExecCommand = func(cmd *exec.Cmd) {
 					str := strings.TrimSpace(cmd.String())
 					sp := strings.SplitN(str, " ", len(args.Task.Shell)+1)
-					printCommand(args.Stderr, args.Task.Name, "bash", sp[2])
+
+					lang := "bash"
+					if len(args.Task.Shell) > 0 {
+						lang = args.Task.Shell[0]
+					}
+					printCommand(args.Stderr, args.Task.Name, lang, sp[2])
 				}
 
 				cg.Commands = append(

examples/Runfile.yml

@@ -13,7 +13,7 @@ type ParsedTask struct {
 	// Name should be resolved from key itself
 	Name string `json:"-"`
 
-	Shell       []string          `json:"shell"`
+	Shell       Shell             `json:"shell"`
 	WorkingDir  string            `json:"workingDir"`
 	Watch       *TaskWatch        `json:"watch,omitempty"`
 	Env         map[string]string `json:"environ"`

runner/run-task.go

@@ -0,0 +1,78 @@
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+var shellAliasMap = map[string][]string{
+	"bash":       {"bash", "-c"},
+	"python":     {"python", "-c"},
+	"go":         {"go", "run", "-e"},
+	"node":       {"node", "-e"},
+	"ruby":       {"ruby", "-e"},
+	"perl":       {"perl", "-e"},
+	"php":        {"php", "-r"},
+	"rust":       {"cargo", "script", "-e"},
+	"clojure":    {"closure", "-e"},
+	"lua":        {"lua", "-e"},
+	"exlixir":    {"exlixir", "-e"},
+	"powershell": {"powershell", "-Command"},
+	"haskell":    {"runghc", "-e"},
+}
+
+type Shell []string
+
+// UnmarshalJSON implements custom unmarshaling for Shell
+func (s *Shell) UnmarshalJSON(data []byte) error {
+	var v any
+	if err := json.Unmarshal(data, &v); err != nil {
+		return fmt.Errorf("invalid shell format: %w", err)
+	}
+
+	switch val := v.(type) {
+	case string:
+		shell, ok := shellAliasMap[val]
+		if !ok {
+			return fmt.Errorf("invalid shell alias")
+		}
+		*s = Shell(shell)
+	case []any:
+		// INFO: json unmarshals array as []any
+		var shells []string
+		for _, item := range val {
+			str, ok := item.(string)
+			if !ok {
+				return fmt.Errorf("invalid shell values, must be an []string")
+			}
+			shells = append(shells, str)
+		}
+		*s = Shell(shells)
+	default:
+		return fmt.Errorf("unexpected JSON type for shell")
+	}
+
+	return nil
+}
+
+// func (s *Shell) UnmarshalJSON(data []byte) error {
+// 	var single string
+// 	if err := json.Unmarshal(data, &single); err == nil {
+// 		// INFO: It means shell provided is a single string i.e. shell alias
+// 		shell, ok := shellAliasMap[single]
+// 		if !ok {
+// 			return fmt.Errorf("invalid shell alias")
+// 		}
+// 		*s = Shell(shell)
+// 		return nil
+// 	}
+//
+// 	var multiple []string
+// 	if err := json.Unmarshal(data, &multiple); err == nil {
+// 		// If it's a slice, assign it directly
+// 		*s = Shell(multiple)
+// 		return nil
+// 	}
+//
+// 	return fmt.Errorf("invalid shell format")
+// }

types/parsed-types.go

@@ -61,7 +61,7 @@ type Task struct {
 	   - ["python", "-c"]
 	   - ["node", "-e"]
 	*/
-	Shell []string `json:"shell"`
+	Shell Shell `json:"shell"`
 
 	// load env vars from [.env](https://www.google.com/search?q=sample+dotenv+files&udm=2) files
 	DotEnv []string `json:"dotenv"`