v3.2.1

Closes #426

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v3.2.1
+
+- Fixed some bugs and regressions regarding dynamic variables and directories
+  ([#426](https://github.com/go-task/task/issues/426)).
+- The [slim-sprig](https://github.com/go-task/slim-sprig) package was updated
+  with the upstream [sprig](https://github.com/Masterminds/sprig).
+
 ## v3.2.0
 
 - Fix the `.task` directory being created in the task directory instead of the

go.mod

@@ -2,7 +2,7 @@ module github.com/go-task/task/v3
 
 require (
 	github.com/fatih/color v1.7.0
-	github.com/go-task/slim-sprig v0.0.0-20200516131648-f9bac4e523eb
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0
 	github.com/joho/godotenv v1.3.0
 	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mattn/go-zglob v0.0.1

go.sum

@@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-task/slim-sprig v0.0.0-20200516131648-f9bac4e523eb h1:/qbv1F67s6ehqX9mG23cJOeca3FWpOVKgtPfPUMAi0k=
-github.com/go-task/slim-sprig v0.0.0-20200516131648-f9bac4e523eb/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=

internal/compiler/v2/compiler_v2.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"path/filepath"
 	"strings"
 	"sync"
 
@@ -38,16 +37,8 @@ type CompilerV2 struct {
 // 4. Taskvars file variables
 // 5. Environment variables
 func (c *CompilerV2) GetVariables(t *taskfile.Task, call taskfile.Call) (*taskfile.Vars, error) {
-	// NOTE(@andreynering): We're manually joining these paths here because
-	// this is the raw task, not the compiled one.
-	dir := t.Dir
-	if !filepath.IsAbs(dir) {
-		dir = filepath.Join(c.Dir, dir)
-	}
-
 	vr := varResolver{
 		c:    c,
-		dir:  dir,
 		vars: compiler.GetEnviron(),
 	}
 	vr.vars.Set("TASK", taskfile.Var{Static: t.Task})
@@ -62,7 +53,6 @@ func (c *CompilerV2) GetVariables(t *taskfile.Task, call taskfile.Call) (*taskfi
 
 type varResolver struct {
 	c    *CompilerV2
-	dir  string
 	vars *taskfile.Vars
 	err  error
 }
@@ -77,7 +67,7 @@ func (vr *varResolver) merge(vars *taskfile.Vars) {
 			Static: tr.Replace(v.Static),
 			Sh:     tr.Replace(v.Sh),
 		}
-		static, err := vr.c.HandleDynamicVar(v, vr.dir)
+		static, err := vr.c.HandleDynamicVar(v, "")
 		if err != nil {
 			vr.err = err
 			return err
@@ -88,7 +78,7 @@ func (vr *varResolver) merge(vars *taskfile.Vars) {
 	vr.err = tr.Err()
 }
 
-func (c *CompilerV2) HandleDynamicVar(v taskfile.Var, dir string) (string, error) {
+func (c *CompilerV2) HandleDynamicVar(v taskfile.Var, _ string) (string, error) {
 	if v.Static != "" || v.Sh == "" {
 		return v.Static, nil
 	}
@@ -106,7 +96,6 @@ func (c *CompilerV2) HandleDynamicVar(v taskfile.Var, dir string) (string, error
 	var stdout bytes.Buffer
 	opts := &execext.RunCommandOptions{
 		Command: v.Sh,
-		Dir:     dir,
 		Stdout:  &stdout,
 		Stderr:  c.Logger.Stderr,
 	}

internal/compiler/v3/compiler_v3.go

@@ -32,29 +32,27 @@ func (c *CompilerV3) GetVariables(t *taskfile.Task, call taskfile.Call) (*taskfi
 	result := compiler.GetEnviron()
 	result.Set("TASK", taskfile.Var{Static: t.Task})
 
-	// NOTE(@andreynering): We're manually joining these paths here because
-	// this is the raw task, not the compiled one.
-	dir := t.Dir
-	if !filepath.IsAbs(dir) {
-		dir = filepath.Join(c.Dir, dir)
-	}
+	getRangeFunc := func(dir string) func(k string, v taskfile.Var) error {
+		return func(k string, v taskfile.Var) error {
+			tr := templater.Templater{Vars: result, RemoveNoValue: true}
 
-	rangeFunc := func(k string, v taskfile.Var) error {
-		tr := templater.Templater{Vars: result, RemoveNoValue: true}
-		v = taskfile.Var{
-			Static: tr.Replace(v.Static),
-			Sh:     tr.Replace(v.Sh),
+			v = taskfile.Var{
+				Static: tr.Replace(v.Static),
+				Sh:     tr.Replace(v.Sh),
+				Dir:    v.Dir,
+			}
+			if err := tr.Err(); err != nil {
+				return err
+			}
+			static, err := c.HandleDynamicVar(v, dir)
+			if err != nil {
+				return err
+			}
+			result.Set(k, taskfile.Var{Static: static})
+			return nil
 		}
-		if err := tr.Err(); err != nil {
-			return err
-		}
-		static, err := c.HandleDynamicVar(v, dir)
-		if err != nil {
-			return err
-		}
-		result.Set(k, taskfile.Var{Static: static})
-		return nil
 	}
+	rangeFunc := getRangeFunc(c.Dir)
 
 	if err := c.TaskfileVars.Range(rangeFunc); err != nil {
 		return nil, err
@@ -62,7 +60,20 @@ func (c *CompilerV3) GetVariables(t *taskfile.Task, call taskfile.Call) (*taskfi
 	if err := call.Vars.Range(rangeFunc); err != nil {
 		return nil, err
 	}
-	if err := t.Vars.Range(rangeFunc); err != nil {
+
+	// NOTE(@andreynering): We're manually joining these paths here because
+	// this is the raw task, not the compiled one.
+	tr := templater.Templater{Vars: result, RemoveNoValue: true}
+	dir := tr.Replace(t.Dir)
+	if err := tr.Err(); err != nil {
+		return nil, err
+	}
+	if !filepath.IsAbs(dir) {
+		dir = filepath.Join(c.Dir, dir)
+	}
+	taskRangeFunc := getRangeFunc(dir)
+
+	if err := t.Vars.Range(taskRangeFunc); err != nil {
 		return nil, err
 	}
 
@@ -84,6 +95,11 @@ func (c *CompilerV3) HandleDynamicVar(v taskfile.Var, dir string) (string, error
 		return result, nil
 	}
 
+	// NOTE(@andreynering): If a var have a specific dir, use this instead
+	if v.Dir != "" {
+		dir = v.Dir
+	}
+
 	var stdout bytes.Buffer
 	opts := &execext.RunCommandOptions{
 		Command: v.Sh,

task_test.go

@@ -308,7 +308,7 @@ func TestGenerates(t *testing.T) {
 	const (
 		srcTask        = "sub/src.txt"
 		relTask        = "rel.txt"
-		absTask        = "sub/abs.txt"
+		absTask        = "abs.txt"
 		fileWithSpaces = "my text file.txt"
 	)
 
@@ -805,7 +805,10 @@ func TestDynamicVariablesShouldRunOnTheTaskDir(t *testing.T) {
 		Target:    "default",
 		TrimSpace: false,
 		Files: map[string]string{
-			"subdirectory/dir.txt": "subdirectory\n",
+			"subdirectory/from_root_taskfile.txt":          "subdirectory\n",
+			"subdirectory/from_included_taskfile.txt":      "subdirectory\n",
+			"subdirectory/from_included_taskfile_task.txt": "subdirectory\n",
+			"subdirectory/from_interpolated_dir.txt":       "subdirectory\n",
 		},
 	}
 	tt.Run(t)

taskfile/read/taskfile.go

@@ -97,6 +97,17 @@ func Taskfile(dir string, entrypoint string) (*taskfile.Taskfile, error) {
 		}
 
 		if includedTask.AdvancedImport {
+			for k, v := range includedTaskfile.Vars.Mapping {
+				o := v
+				o.Dir = filepath.Join(dir, includedTask.Dir)
+				includedTaskfile.Vars.Mapping[k] = o
+			}
+			for k, v := range includedTaskfile.Env.Mapping {
+				o := v
+				o.Dir = filepath.Join(dir, includedTask.Dir)
+				includedTaskfile.Env.Mapping[k] = o
+			}
+
 			for _, task := range includedTaskfile.Tasks {
 				if !filepath.IsAbs(task.Dir) {
 					task.Dir = filepath.Join(includedTask.Dir, task.Dir)

taskfile/var.go

@@ -98,6 +98,7 @@ type Var struct {
 	Static string
 	Live   interface{}
 	Sh     string
+	Dir    string
 }
 
 // UnmarshalYAML implements yaml.Unmarshaler interface.

testdata/dir/dynamic_var/.gitignore

@@ -1 +1 @@
-subdirectory/dir.txt
+*.txt

testdata/dir/dynamic_var/Taskfile.yml

@@ -1,11 +1,33 @@
 version: '3'
 
+includes:
+  sub:
+    taskfile: subdirectory
+    dir: subdirectory
+
+vars:
+  DIRECTORY: subdirectory
+
 tasks:
   default:
+    - task: from-root-taskfile
+    - task: sub:from-included-taskfile
+    - task: sub:from-included-taskfile-task
+    - task: from-interpolated-dir
+
+  from-root-taskfile:
     cmds:
-      - echo '{{.FOLDER}}' > dir.txt
+      - echo '{{.TASK_DIR}}' > from_root_taskfile.txt
     dir: subdirectory
     vars:
-      FOLDER:
+      TASK_DIR:
         sh: basename $(pwd)
     silent: true
+
+  from-interpolated-dir:
+    cmds:
+      - echo '{{.INTERPOLATED_DIR}}' > from_interpolated_dir.txt
+    dir: '{{.DIRECTORY}}'
+    vars:
+      INTERPOLATED_DIR:
+        sh: basename $(pwd)

testdata/dir/dynamic_var/subdirectory/Taskfile.yml

@@ -0,0 +1,19 @@
+version: '3'
+
+vars:
+  TASKFILE_DIR:
+    sh: basename $(pwd)
+
+tasks:
+  from-included-taskfile:
+    cmds:
+      - echo '{{.TASKFILE_DIR}}' > from_included_taskfile.txt
+    silent: true
+
+  from-included-taskfile-task:
+    cmds:
+      - echo '{{.TASKFILE_TASK_DIR}}' > from_included_taskfile_task.txt
+    silent: true
+    vars:
+      TASKFILE_TASK_DIR:
+        sh: basename $(pwd)

testdata/dir/dynamic_var/subdirectory/dir.txt

@@ -1 +0,0 @@
-subdirectory

testdata/generates/Taskfile.yml

@@ -1,10 +1,11 @@
 version: '3'
 
 vars:
-  BUILD_DIR: $pwd
+  BUILD_DIR:
+    sh: pwd
 
 tasks:
-  sub/abs.txt:
+  abs.txt:
     desc: generates dest file based on absolute paths
     deps:
       - sub/src.txt