Merge remote-tracking branch 'upstream/master' into upstream-changes

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+- Allow calling a task of the root Taskfile from an included Taskfile
+  by prefixing it with `:`
+  ([#161](https://github.com/go-task/task/issues/161), [#172](https://github.com/go-task/task/issues/172)).
+
 ## v2.3.0 - 2019-01-02
 
 - On Windows, Task can now be installed using [Scoop](https://scoop.sh/)

docs/usage.md

@@ -298,6 +298,10 @@ tasks:
 
 The above syntax is also supported in `deps`.
 
+> NOTE: If you want to call a task declared in the root Taskfile from within an
+> [included Taskfile](#including-other-taskfiles), add a leading `:` like this:
+> `task: :task-name`.
+
 ## Prevent unnecessary work
 
 If a task generates something, you can inform Task the source and generated

internal/taskfile/task.go

@@ -49,14 +49,21 @@ func (t *Task) ApplyNamespace(taskName string, ns ...string) []*Task {
 	}
 	for _, cmd := range t.Cmds {
 		if cmd.Task != "" {
-			cmd.Task = strings.Join(append(ns, cmd.Task), NamespaceSeparator)
+			cmd.Task = taskWithNamespace(ns, cmd.Task)
 		}
 	}
 	for _, dep := range t.Deps {
 		if dep.Task != "" {
-			dep.Task = strings.Join(append(ns, dep.Task), NamespaceSeparator)
+			dep.Task = taskWithNamespace(ns, dep.Task)
 		}
 	}
-	t.Task = strings.Join(append(ns, taskName), NamespaceSeparator)
+	t.Task = taskWithNamespace(ns, taskName)
 	return append(tasks, t)
 }
+
+func taskWithNamespace(ns []string, taskName string) string {
+	if strings.HasPrefix(taskName, ":") {
+		return strings.TrimPrefix(taskName, ":")
+	}
+	return strings.Join(append(ns, taskName), NamespaceSeparator)
+}

task_test.go

@@ -511,3 +511,15 @@ func TestIncludesDependencies(t *testing.T) {
 	}
 	tt.Run(t)
 }
+
+func TestIncludesCallingRoot(t *testing.T) {
+	tt := fileContentTest{
+		Dir:       "testdata/includes_call_root_task",
+		Target:    "included:call-root",
+		TrimSpace: true,
+		Files: map[string]string{
+			"root_task.txt": "root task",
+		},
+	}
+	tt.Run(t)
+}

testdata/includes_call_root_task/.gitignore

@@ -0,0 +1 @@
+*.txt

testdata/includes_call_root_task/Taskfile.yml

@@ -0,0 +1,9 @@
+version: '2'
+
+includes:
+  included: Taskfile2.yml
+
+tasks:
+  root-task:
+    cmds:
+      - echo "root task" > root_task.txt

testdata/includes_call_root_task/Taskfile2.yml

@@ -0,0 +1,6 @@
+version: '2'
+
+tasks:
+  call-root:
+    cmds:
+      - task: :root-task