go-task-bin 3.37.0__tar.gz → 3.37.2__tar.gz

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: go-task-bin
-Version: 3.37.0
+Version: 3.37.2
 Summary: task - A task runner / simpler Make alternative written in Go
 Keywords: build,build-tool,devops,go,make,makefile,runner,task,task-runner,taskfile,tool
 Author-Email: dowon <ks2515@naver.com>

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/pdm_build.py

@@ -13,7 +13,7 @@ if TYPE_CHECKING:
     from pdm.backend.hooks import Context
 
 NAME = "task"
-VERSION = "3.37.0"
+VERSION = "3.37.2"
 
 
 def is_windows():

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "go-task-bin"
 description = "task - A task runner / simpler Make alternative written in Go"
-version = "3.37.0"
+version = "3.37.2"
 authors = [
     { name = "dowon", email = "ks2515@naver.com" },
 ]

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/.goreleaser.yml

@@ -71,7 +71,7 @@ brews:
     description: Task runner / simpler Make alternative written in Go
     license: MIT
     homepage: https://taskfile.dev
-    folder: Formula
+    directory: Formula
     repository:
       owner: go-task
       name: homebrew-tap

go_task_bin-3.37.0/task/website/versioned_docs/version-latest/changelog.mdx → go_task_bin-3.37.2/task/CHANGELOG.md

@@ -1,10 +1,16 @@
----
-slug: /changelog/
-sidebar_position: 14
----
-
 # Changelog
 
+## v3.37.2 - 2024-05-12
+
+- Fixed a bug where an empty Taskfile would cause a panic (#1648 by @pd93).
+- Fixed a bug where includes Taskfile variable were not being merged correctly
+  (#1643, #1649 by @pd93).
+
+## v3.37.1 - 2024-05-09
+
+- Fix bug where non-string values (numbers, bools) added to `env:` weren't been
+  correctly exported (#1640, #1641 by @vmaerten and @andreynering).
+
 ## v3.37.0 - 2024-05-08
 
 - Released the

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/internal/env/env.go

@@ -13,19 +13,25 @@ func Get(t *ast.Task) []string {
 	}
 
 	environ := os.Environ()
-
 	for k, v := range t.Env.ToCacheMap() {
-		str, isString := v.(string)
-		if !isString {
+		if !isTypeAllowed(v) {
 			continue
 		}
 
 		if _, alreadySet := os.LookupEnv(k); alreadySet {
 			continue
 		}
-
-		environ = append(environ, fmt.Sprintf("%s=%s", k, str))
+		environ = append(environ, fmt.Sprintf("%s=%v", k, v))
 	}
 
 	return environ
 }
+
+func isTypeAllowed(v any) bool {
+	switch v.(type) {
+	case string, bool, int, float32, float64:
+		return true
+	default:
+		return false
+	}
+}

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-task/cli",
-  "version": "3.37.0",
+  "version": "3.37.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-task/cli",
-  "version": "3.37.0",
+  "version": "3.37.2",
   "description": "A task runner / simpler Make alternative written in Go",
   "scripts": {
     "postinstall": "go-npm install",

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/task_test.go

@@ -95,14 +95,24 @@ func TestEmptyTask(t *testing.T) {
 	require.NoError(t, e.Run(context.Background(), &ast.Call{Task: "default"}))
 }
 
+func TestEmptyTaskfile(t *testing.T) {
+	e := &task.Executor{
+		Dir:    "testdata/empty_taskfile",
+		Stdout: io.Discard,
+		Stderr: io.Discard,
+	}
+	require.Error(t, e.Setup(), "e.Setup()")
+}
+
 func TestEnv(t *testing.T) {
 	tt := fileContentTest{
 		Dir:       "testdata/env",
 		Target:    "default",
 		TrimSpace: false,
 		Files: map[string]string{
-			"local.txt":  "GOOS='linux' GOARCH='amd64' CGO_ENABLED='0'\n",
-			"global.txt": "FOO='foo' BAR='overriden' BAZ='baz'\n",
+			"local.txt":         "GOOS='linux' GOARCH='amd64' CGO_ENABLED='0'\n",
+			"global.txt":        "FOO='foo' BAR='overriden' BAZ='baz'\n",
+			"multiple_type.txt": "FOO='1' BAR='true' BAZ='1.1'\n",
 		},
 	}
 	tt.Run(t)
@@ -1227,6 +1237,34 @@ func TestIncludesInterpolation(t *testing.T) {
 	}
 }
 
+func TestIncludedTaskfileVarMerging(t *testing.T) {
+	const dir = "testdata/included_taskfile_var_merging"
+	tests := []struct {
+		name           string
+		task           string
+		expectedOutput string
+	}{
+		{"foo", "foo:pwd", "included_taskfile_var_merging/foo\n"},
+		{"bar", "bar:pwd", "included_taskfile_var_merging/bar\n"},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			var buff bytes.Buffer
+			e := task.Executor{
+				Dir:    dir,
+				Stdout: &buff,
+				Stderr: &buff,
+				Silent: true,
+			}
+			require.NoError(t, e.Setup())
+
+			err := e.Run(context.Background(), &ast.Call{Task: test.task})
+			require.NoError(t, err)
+			assert.Contains(t, buff.String(), test.expectedOutput)
+		})
+	}
+}
+
 func TestInternalTask(t *testing.T) {
 	const dir = "testdata/internal_task"
 	tests := []struct {

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/taskfile/ast/tasks.go

@@ -90,7 +90,7 @@ func (t1 *Tasks) Merge(t2 Tasks, include *Include, includedTaskfileVars *Vars) {
 				task.IncludeVars = &Vars{}
 			}
 			task.IncludeVars.Merge(include.Vars, nil)
-			task.IncludedTaskfileVars = includedTaskfileVars
+			task.IncludedTaskfileVars = includedTaskfileVars.DeepCopy()
 		}
 
 		// Add the task to the merged taskfile

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/taskfile/reader.go

@@ -263,23 +263,28 @@ func (r *Reader) readNode(node Node) (*ast.Taskfile, error) {
 		}
 	}
 
-	var t ast.Taskfile
-	if err := yaml.Unmarshal(b, &t); err != nil {
+	var tf ast.Taskfile
+	if err := yaml.Unmarshal(b, &tf); err != nil {
 		return nil, &errors.TaskfileInvalidError{URI: filepathext.TryAbsToRel(node.Location()), Err: err}
 	}
 
+	// Check that the Taskfile is set and has a schema version
+	if tf.Version == nil {
+		return nil, &errors.TaskfileVersionCheckError{URI: node.Location()}
+	}
+
 	// Set the taskfile/task's locations
-	t.Location = node.Location()
-	for _, task := range t.Tasks.Values() {
+	tf.Location = node.Location()
+	for _, task := range tf.Tasks.Values() {
 		// If the task is not defined, create a new one
 		if task == nil {
 			task = &ast.Task{}
 		}
 		// Set the location of the taskfile for each task
 		if task.Location.Taskfile == "" {
-			task.Location.Taskfile = t.Location
+			task.Location.Taskfile = tf.Location
 		}
 	}
 
-	return &t, nil
+	return &tf, nil
 }

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/testdata/env/Taskfile.yml

@@ -14,6 +14,7 @@ tasks:
     cmds:
       - task: local
       - task: global
+      - task: multiple_type
 
   local:
     vars:
@@ -31,3 +32,11 @@ tasks:
       BAR: overriden
     cmds:
       - echo "FOO='$FOO' BAR='$BAR' BAZ='$BAZ'" > global.txt
+
+  multiple_type:
+    env:
+      FOO: 1
+      BAR: true
+      BAZ: 1.1
+    cmds:
+      - echo "FOO='$FOO' BAR='$BAR' BAZ='$BAZ'" > multiple_type.txt

go_task_bin-3.37.2/task/testdata/included_taskfile_var_merging/Taskfile.yaml

@@ -0,0 +1,12 @@
+version: "3"
+
+includes:
+  foo:
+    taskfile: ./foo/Taskfile.yaml
+  bar:
+    taskfile: ./bar/Taskfile.yaml
+
+tasks:
+  stub:
+    cmds:
+      - echo 0

go_task_bin-3.37.2/task/testdata/included_taskfile_var_merging/bar/Taskfile.yaml

@@ -0,0 +1,11 @@
+version: "3"
+
+vars:
+  DIR: bar
+
+tasks:
+  pwd:
+    dir: ./{{ .DIR }}
+    cmds:
+      - echo "{{ .DIR }}"
+      - pwd

go_task_bin-3.37.2/task/testdata/included_taskfile_var_merging/foo/Taskfile.yaml

@@ -0,0 +1,11 @@
+version: "3"
+
+vars:
+  DIR: foo
+
+tasks:
+  pwd:
+    dir: ./{{ .DIR }}
+    cmds:
+      - echo "{{ .DIR }}"
+      - pwd

go_task_bin-3.37.0/task/website/blog/2024-04-09-variables.mdx → go_task_bin-3.37.2/task/website/blog/2024-05-09-any-variables.mdx

@@ -6,7 +6,6 @@ authors: [pd93]
 tags: [experiments, variables]
 image: https://i.imgur.com/mErPwqL.png
 hide_table_of_contents: false
-draft: true
 ---
 
 import Tabs from '@theme/Tabs';
@@ -15,7 +14,7 @@ import TabItem from '@theme/TabItem';
 Task has always had variables, but even though you were able to define them
 using different YAML types, they would always be converted to strings by Task.
 This limited users to string manipulation and encouraged messy workarounds for
-simple problems. Starting from [v3.36.0][v3.36.0], this is no longer the case!
+simple problems. Starting from [v3.37.0][v3.37.0], this is no longer the case!
 Task now supports most variable types, including **booleans**, **integers**,
 **floats** and **arrays**!
 
@@ -175,7 +174,7 @@ We're looking for feedback on a couple of different proposals, so please give
 them a go and let us know what you think. :pray:
 
 {/* prettier-ignore-start */}
-[v3.36.0]: https://github.com/go-task/task/releases/tag/v3.36.0
+[v3.37.0]: https://github.com/go-task/task/releases/tag/v3.37.0
 [slim-sprig-math]: https://go-task.github.io/slim-sprig/math.html
 [slim-sprig-list]: https://go-task.github.io/slim-sprig/lists.html
 [map-variables]: /experiments/map-variables

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/website/docs/changelog.mdx

@@ -5,6 +5,17 @@ sidebar_position: 14
 
 # Changelog
 
+## v3.37.2 - 2024-05-12
+
+- Fixed a bug where an empty Taskfile would cause a panic (#1648 by @pd93).
+- Fixed a bug where includes Taskfile variable were not being merged correctly
+  (#1643, #1649 by @pd93).
+
+## v3.37.1 - 2024-05-09
+
+- Fix bug where non-string values (numbers, bools) added to `env:` weren't been
+  correctly exported (#1640, #1641 by @vmaerten and @andreynering).
+
 ## v3.37.0 - 2024-05-08
 
 - Released the

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/website/docs/contributing.mdx

@@ -148,6 +148,8 @@ If you have questions, feel free to ask them in the `#help` forum channel on our
 ---
 
 {/* prettier-ignore-start */}
+[experiments]: /experiments
+[experiments-workflow]: /experiments#workflow
 [task]: https://github.com/go-task/task
 [vscode-task]: https://github.com/go-task/vscode-task
 [go]: https://go.dev

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/website/static/schema.json

@@ -285,9 +285,9 @@
         "yaml": {
           "type": "string",
           "description": "The value will parsed as a YAML string and stored in the variable"
-        },
-        "additionalProperties": false
-      }
+        }
+      },
+      "additionalProperties": false
     },
     "task_call": {
       "type": "object",
@@ -512,7 +512,7 @@
       "type": "object",
       "properties": {
         "exclude": {
-          "description": "File or glob patter to exclude from the list",
+          "description": "File or glob pattern to exclude from the list",
           "type": "string"
         }
       }
@@ -648,7 +648,7 @@
           "$ref": "#/definitions/tasks"
         },
         "silent": {
-          "description": "Default 'silent' options for this Taskfile. If `false`, can be overidden with `true` in a task by task basis.",
+          "description": "Default 'silent' options for this Taskfile. If `false`, can be overridden with `true` in a task by task basis.",
           "type": "boolean"
         },
         "set": {

go_task_bin-3.37.0/task/CHANGELOG.md → go_task_bin-3.37.2/task/website/versioned_docs/version-latest/changelog.mdx

@@ -1,5 +1,21 @@
+---
+slug: /changelog/
+sidebar_position: 14
+---
+
 # Changelog
 
+## v3.37.2 - 2024-05-12
+
+- Fixed a bug where an empty Taskfile would cause a panic (#1648 by @pd93).
+- Fixed a bug where includes Taskfile variable were not being merged correctly
+  (#1643, #1649 by @pd93).
+
+## v3.37.1 - 2024-05-09
+
+- Fix bug where non-string values (numbers, bools) added to `env:` weren't been
+  correctly exported (#1640, #1641 by @vmaerten and @andreynering).
+
 ## v3.37.0 - 2024-05-08
 
 - Released the

{go_task_bin-3.37.0 → go_task_bin-3.37.2}/task/website/versioned_docs/version-latest/contributing.mdx

@@ -148,6 +148,8 @@ If you have questions, feel free to ask them in the `#help` forum channel on our
 ---
 
 {/* prettier-ignore-start */}
+[experiments]: /experiments
+[experiments-workflow]: /experiments#workflow
 [task]: https://github.com/go-task/task
 [vscode-task]: https://github.com/go-task/vscode-task
 [go]: https://go.dev