fix: dot-env insconsistency [issue: 29](#29)

Author: nxtcoder17

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

parser/parse-command.go

@@ -31,8 +31,7 @@ func parseCommand(prf *types.ParsedRunfile, command any) (*types.ParsedCommandJs
 			}
 
 			pcj := types.ParsedCommandJson{
-				Env:      cj.Env,
-				Parallel: cj.Parallel,
+				Env: cj.Env,
 			}
 
 			switch {

parser/parse-task.go

@@ -32,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
 	}

parser/parser-runfile.go

@@ -38,7 +38,13 @@ func parseRunfile(runfile *types.Runfile) (*types.ParsedRunfile, error) {
 
 	dotEnvFiles := make([]string, 0, len(runfile.DotEnv))
 	for i := range runfile.DotEnv {
-		dotEnvFiles = append(dotEnvFiles, fn.Must(filepath.Abs(runfile.DotEnv[i])))
+		de := runfile.DotEnv[i]
+		if !filepath.IsAbs(de) {
+			result := filepath.Join(filepath.Dir(runfile.Filepath), de)
+			// fmt.Println("HERE", "runfilepath", prf.Metadata.RunfilePath, "dotenv", de, "result", result)
+			de = result
+		}
+		dotEnvFiles = append(dotEnvFiles, de)
 	}
 
 	// dotenvVars, err := parseDotEnvFiles(runfile.DotEnv...)
@@ -69,12 +75,15 @@ func parseRunfileFromFile(file string) (*types.ParsedRunfile, error) {
 		return nil, errors.ErrParseRunfile.Wrap(err)
 	}
 
+	runfile.Filepath = fn.Must(filepath.Abs(file))
+
 	prf, err := parseRunfile(&runfile)
 	if err != nil {
 		return nil, err
 	}
 
-	prf.Metadata.RunfilePath = file
+	// prf.Metadata.RunfilePath = file
+	prf.Metadata.RunfilePath = fn.Must(filepath.Abs(file))
 	return prf, nil
 }
 

types/parsed-types.go

@@ -10,12 +10,16 @@ type ParsedRunfile struct {
 }
 
 type ParsedTask struct {
-	Shell       []string            `json:"shell"`
-	WorkingDir  string              `json:"workingDir"`
-	Watch       *TaskWatch          `json:"watch,omitempty"`
-	Env         map[string]string   `json:"environ"`
-	Interactive bool                `json:"interactive,omitempty"`
-	Commands    []ParsedCommandJson `json:"commands"`
+	Shell       []string          `json:"shell"`
+	WorkingDir  string            `json:"workingDir"`
+	Watch       *TaskWatch        `json:"watch,omitempty"`
+	Env         map[string]string `json:"environ"`
+	Interactive bool              `json:"interactive,omitempty"`
+
+	// Parallel allows you to run commands or run targets in parallel
+	Parallel bool `json:"parallel"`
+
+	Commands []ParsedCommandJson `json:"commands"`
 }
 
 type ParsedCommandJson struct {
@@ -25,9 +29,6 @@ type ParsedCommandJson struct {
 
 	// If is a go template expression, which must evaluate to true, for task to run
 	If *bool `json:"if"`
-
-	// Parallel allows you to run commands or run targets in parallel
-	Parallel bool `json:"parallel"`
 }
 
 type ParsedIncludeSpec struct {

types/types.go

@@ -1,6 +1,7 @@
 package types
 
 type Runfile struct {
+	Filepath string
 	Version  string                 `json:"version,omitempty"`
 	Includes map[string]IncludeSpec `json:"includes"`
 	Env      EnvVar                 `json:"env,omitempty"`
@@ -74,6 +75,9 @@ type Task struct {
 
 	Interactive bool `json:"interactive,omitempty"`
 
+	// Parallel allows you to run commands
+	Parallel bool `json:"parallel"`
+
 	// List of commands to be executed in given shell (default: sh)
 	// can take multiple forms
 	//   - simple string
@@ -95,6 +99,5 @@ type CommandJson struct {
 	// If is a go template expression, which must evaluate to true, for task to run
 	If *string `json:"if,omitempty"`
 
-	// Parallel allows you to run commands or run targets in parallel
 	Parallel bool `json:"parallel"`
 }