Merge pull request [#30](#30)

Rethink/watch mode

Author: nxtcoder17

.gitignore

@@ -2,3 +2,4 @@
 bin/
 .secrets/
 Taskfile.yml
+go.work*

Runfile.yml

@@ -6,6 +6,13 @@ tasks:
         go build -o bin/run -ldflags="-s -w" -tags urfave_cli_no_docs ./cmd/run
         echo "DONE"
 
+  build:dev:
+    cmd: 
+      - |+
+        echo "building ..."
+        go build -o bin/run-dev -ldflags="-s -w" -tags urfave_cli_no_docs ./cmd/run
+        echo "DONE"
+
   example:
     dir: ./examples
     cmd: 

cmd/run/main.go

@@ -16,9 +16,6 @@ import (
 	"github.com/nxtcoder17/runfile/logging"
 	"github.com/nxtcoder17/runfile/runner"
 
-	// "github.com/nxtcoder17/runfile/pkg/runfile"
-
-	// "github.com/nxtcoder17/runfile/pkg/runfile"
 	"github.com/nxtcoder17/runfile/parser"
 	"github.com/urfave/cli/v3"
 )
@@ -195,7 +192,7 @@ func main() {
 			}
 
 			logger := logging.New(logging.Options{
-				ShowCaller:         true,
+				ShowCaller:         false,
 				SlogKeyAsPrefix:    "task",
 				ShowDebugLogs:      debug,
 				SetAsDefaultLogger: true,
@@ -240,7 +237,6 @@ func main() {
 		} else {
 			slog.Error("got", "err", err)
 		}
-		os.Exit(1)
 	}
 }
 

examples/Runfile.yml

@@ -44,8 +44,8 @@ tasks:
   clean:
     name: clean
     shell: ["python", "-c"]
-    dotenv:
-      - ../.secrets/env
+    # dotenv:
+    #   - ../.secrets/env
     cmd:
       - run: laundry
         # vars:

examples/run1/Runfile

@@ -14,5 +14,8 @@ tasks:
       - node
 
   printenv:
+    dotenv:
+      - ../../.secrets/env
     cmd:
       - printenv file1_env1
+      - printenv key_id

examples/run2/Runfile

@@ -1,6 +1,10 @@
 version: 0.0.1
 
+dotenv:
+  - ../../.secrets/env
+
 tasks:
   echo:
     cmd:
       - echo "hello from run2"
+      - printenv key_id

go.mod

@@ -3,11 +3,10 @@ module github.com/nxtcoder17/runfile
 go 1.22.7
 
 require (
-	github.com/alecthomas/chroma/v2 v2.14.1-0.20241203085416-67f0e3b31d46
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/joho/godotenv v1.5.1
 	github.com/muesli/termenv v0.15.2
-	github.com/nxtcoder17/fwatcher v1.0.4-0.20241218102704-76d04c526fb0
+	github.com/nxtcoder17/fwatcher v1.1.0
 	github.com/phuslu/log v1.0.112
 	github.com/urfave/cli/v3 v3.0.0-beta1
 	golang.org/x/sync v0.10.0
@@ -17,7 +16,6 @@ require (
 require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/charmbracelet/x/ansi v0.6.0 // indirect
-	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect

go.sum

@@ -1,9 +1,3 @@
-github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
-github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/chroma/v2 v2.14.1-0.20241203085416-67f0e3b31d46 h1:s18LOL63NvaZHsxUMGBIxcEVJK4un5SzXuGvCGPz0lg=
-github.com/alecthomas/chroma/v2 v2.14.1-0.20241203085416-67f0e3b31d46/go.mod h1:gUhVLrPDXPtp/f+L1jo9xepo9gL4eLwRuGAunSZMkio=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
-github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
@@ -12,15 +6,11 @@ github.com/charmbracelet/x/ansi v0.6.0 h1:qOznutrb93gx9oMiGf7caF7bqqubh6YIM0SWKy
 github.com/charmbracelet/x/ansi v0.6.0/go.mod h1:KBUFw1la39nl0dLl10l5ORDAqGXaeurTQmwyyVKse/Q=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
-github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
-github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -31,8 +21,10 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
-github.com/nxtcoder17/fwatcher v1.0.4-0.20241218102704-76d04c526fb0 h1:k09TYswdqCsFz0fBnO3AjGT5MHfvjPRyBtHbBWuiJLM=
-github.com/nxtcoder17/fwatcher v1.0.4-0.20241218102704-76d04c526fb0/go.mod h1:MNmSwXYOrqp7U1pUxh0GWB5skpjFTWTQXhAA0+sPJcU=
+github.com/nxtcoder17/fwatcher v1.0.5-0.20250117101009-2217d37d1bbd h1:c7QZjT/zcdMqHUaB85oCpXs6cdjJD2N1qFcHjYwoNL8=
+github.com/nxtcoder17/fwatcher v1.0.5-0.20250117101009-2217d37d1bbd/go.mod h1:50dOLE7lHu6bwGtBM7lZ5m6b8wKKMUZDPgBKM2pgdEA=
+github.com/nxtcoder17/fwatcher v1.1.0 h1:boRQ1zyN7SDnRYqrEUMJTKpf/j3sQ3YMY0FQKkUIQ0o=
+github.com/nxtcoder17/fwatcher v1.1.0/go.mod h1:50dOLE7lHu6bwGtBM7lZ5m6b8wKKMUZDPgBKM2pgdEA=
 github.com/phuslu/log v1.0.112 h1:vQ0ZFd5O+in/0IQAcjuEl6wRkHiQPw7T0sqwmOjpL0U=
 github.com/phuslu/log v1.0.112/go.mod h1:F8osGJADo5qLK/0F88djWwdyoZZ9xDJQL1HYRHFEkS0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

parser/parse-command.go

@@ -16,7 +16,7 @@ func parseCommand(prf *types.ParsedRunfile, command any) (*types.ParsedCommandJs
 	switch c := command.(type) {
 	case string:
 		{
-			return &types.ParsedCommandJson{Command: c}, nil
+			return &types.ParsedCommandJson{Commands: []string{c}}, nil
 		}
 	case map[string]any:
 		{
@@ -30,13 +30,30 @@ func parseCommand(prf *types.ParsedRunfile, command any) (*types.ParsedCommandJs
 				return nil, ferr(err)
 			}
 
-			if cj.Run == "" && cj.Command == "" {
-				return nil, ferr(fmt.Errorf("key: 'run' or 'cmd', must be specified when setting command in json format"))
+			pcj := types.ParsedCommandJson{
+				Env: cj.Env,
 			}
 
-			var pcj types.ParsedCommandJson
-			pcj.Run = cj.Run
-			pcj.Command = cj.Command
+			switch {
+			case cj.Run != "" || cj.Runs != nil:
+				{
+					pcj.Runs = cj.Runs
+					if cj.Run != "" {
+						pcj.Runs = append(pcj.Runs, cj.Run)
+					}
+				}
+			case cj.Command != "" || cj.Commands != nil:
+				{
+					pcj.Commands = cj.Commands
+					if cj.Command != "" {
+						pcj.Commands = append(pcj.Commands, cj.Command)
+					}
+				}
+			default:
+				{
+					return nil, fmt.Errorf("either 'run' or 'cmd' key, must be specified when setting command in json format")
+				}
+			}
 
 			if _, ok := prf.Tasks[cj.Run]; !ok {
 				return nil, errors.ErrTaskNotFound.Wrap(fmt.Errorf("run target, not found")).KV("command", command, "run-target", cj.Run)

parser/parse-command_test.go

@@ -0,0 +1,35 @@
+package parser
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/nxtcoder17/runfile/types"
+)
+
+func Test_parseCommand(t *testing.T) {
+	type args struct {
+		prf     *types.ParsedRunfile
+		command any
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    *types.ParsedCommandJson
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := parseCommand(tt.args.prf, tt.args.command)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("parseCommand() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("parseCommand() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

parser/parse-task.go

@@ -12,6 +12,14 @@ import (
 	"github.com/nxtcoder17/runfile/types"
 )
 
+func isAbsPath(p string) bool {
+	j, err := filepath.Abs(p)
+	if err != nil {
+		panic(err)
+	}
+	return j == p
+}
+
 func ParseTask(ctx context.Context, prf *types.ParsedRunfile, task types.Task) (*types.ParsedTask, error) {
 	workingDir := filepath.Dir(prf.Metadata.RunfilePath)
 	if task.Metadata.RunfilePath != nil {
@@ -24,7 +32,19 @@ func ParseTask(ctx context.Context, prf *types.ParsedRunfile, task types.Task) (
 		taskEnv = make(map[string]string)
 	}
 
-	tdotenv, err := parseDotEnvFiles(task.DotEnv...)
+	dotEnvs := make([]string, 0, len(task.DotEnv))
+	for i := range task.DotEnv {
+		de := task.DotEnv[i]
+		if !filepath.IsAbs(de) {
+			result := filepath.Join(filepath.Dir(*task.Metadata.RunfilePath), de)
+			// fmt.Println("HERE", "runfilepath", prf.Metadata.RunfilePath, "dotenv", de, "result", result)
+			de = result
+		}
+
+		dotEnvs = append(dotEnvs, de)
+	}
+
+	tdotenv, err := parseDotEnvFiles(dotEnvs...)
 	if err != nil {
 		return nil, err
 	}
@@ -88,12 +108,26 @@ func ParseTask(ctx context.Context, prf *types.ParsedRunfile, task types.Task) (
 		commands = append(commands, *c2)
 	}
 
+	watch := task.Watch
+	if watch != nil {
+		for i := range watch.Dirs {
+			if !isAbsPath(watch.Dirs[i]) {
+				watch.Dirs[i] = filepath.Join(*task.Dir, watch.Dirs[i])
+			}
+		}
+		// for i := range watch.ExcludeDirs {
+		// 	if !isAbsPath(watch.ExcludeDirs[i]) {
+		// 		watch.ExcludeDirs[i] = filepath.Join(*task.Dir, watch.ExcludeDirs[i])
+		// 	}
+		// }
+	}
+
 	return &types.ParsedTask{
 		Shell:       task.Shell,
 		WorkingDir:  *task.Dir,
 		Interactive: task.Interactive,
 		Env:         taskEnv,
 		Commands:    commands,
-		Watch:       task.Watch,
+		Watch:       watch,
 	}, nil
 }