Merge branch 'master' into master

internal/osext/osext.go

@@ -1,22 +0,0 @@
-package osext
-
-import (
-	"os"
-
-	"github.com/mitchellh/go-homedir"
-)
-
-// Expand is an improved version of os.ExpandEnv,
-// that not only expand enrionment variable ($GOPATH/src/github.com/...)
-// but also expands "~" as the home directory.
-func Expand(s string) (string, error) {
-	s = os.ExpandEnv(s)
-
-	var err error
-	s, err = homedir.Expand(s)
-	if err != nil {
-		return "", err
-	}
-
-	return s, nil
-}

internal/status/glob.go

@@ -4,9 +4,8 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/go-task/task/internal/osext"
-
 	"github.com/mattn/go-zglob"
+	"mvdan.cc/sh/shell"
 )
 
 func glob(dir string, globs []string) (files []string, err error) {
@@ -14,7 +13,7 @@ func glob(dir string, globs []string) (files []string, err error) {
 		if !filepath.IsAbs(g) {
 			g = filepath.Join(dir, g)
 		}
-		g, err = osext.Expand(g)
+		g, err = shell.Expand(g, nil)
 		if err != nil {
 			return nil, err
 		}

internal/taskfile/merge.go

@@ -0,0 +1,27 @@
+package taskfile
+
+import (
+	"fmt"
+)
+
+// Merge merges the second Taskfile into the first
+func Merge(t1, t2 *Taskfile) error {
+	if t1.Version != t2.Version {
+		return fmt.Errorf(`Taskfiles versions should match. First is "%s" but second is "%s"`, t1.Version, t2.Version)
+	}
+
+	if t2.Expansions != 0 && t2.Expansions != 2 {
+		t1.Expansions = t2.Expansions
+	}
+	if t2.Output != "" {
+		t1.Output = t2.Output
+	}
+	for k, v := range t2.Vars {
+		t1.Vars[k] = v
+	}
+	for k, v := range t2.Tasks {
+		t1.Tasks[k] = v
+	}
+
+	return nil
+}

internal/taskfile/read/taskfile.go

@@ -0,0 +1,47 @@
+package read
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+
+	"github.com/go-task/task/internal/taskfile"
+
+	"gopkg.in/yaml.v2"
+)
+
+// Taskfile reads a Taskfile for a given directory
+func Taskfile(dir string) (*taskfile.Taskfile, error) {
+	path := filepath.Join(dir, "Taskfile.yml")
+	t, err := readTaskfile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	path = filepath.Join(dir, fmt.Sprintf("Taskfile_%s.yml", runtime.GOOS))
+	if _, err = os.Stat(path); err == nil {
+		osTaskfile, err := readTaskfile(path)
+		if err != nil {
+			return nil, err
+		}
+		if err = taskfile.Merge(t, osTaskfile); err != nil {
+			return nil, err
+		}
+	}
+
+	for name, task := range t.Tasks {
+		task.Task = name
+	}
+
+	return t, nil
+}
+
+func readTaskfile(file string) (*taskfile.Taskfile, error) {
+	f, err := os.Open(file)
+	if err != nil {
+		return nil, err
+	}
+	var t taskfile.Taskfile
+	return &t, yaml.NewDecoder(f).Decode(&t)
+}

internal/taskfile/read/taskvars.go

@@ -0,0 +1,52 @@
+package read
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+
+	"github.com/go-task/task/internal/taskfile"
+
+	"gopkg.in/yaml.v2"
+)
+
+// Taskvars reads a Taskvars for a given directory
+func Taskvars(dir string) (taskfile.Vars, error) {
+	vars := make(taskfile.Vars)
+
+	path := filepath.Join(dir, "Taskvars.yml")
+	if _, err := os.Stat(path); err == nil {
+		vars, err = readTaskvars(path)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	path = filepath.Join(dir, fmt.Sprintf("Taskvars_%s.yml", runtime.GOOS))
+	if _, err := os.Stat(path); err == nil {
+		osVars, err := readTaskvars(path)
+		if err != nil {
+			return nil, err
+		}
+
+		if vars == nil {
+			vars = osVars
+		} else {
+			for k, v := range osVars {
+				vars[k] = v
+			}
+		}
+	}
+
+	return vars, nil
+}
+
+func readTaskvars(file string) (taskfile.Vars, error) {
+	f, err := os.Open(file)
+	if err != nil {
+		return nil, err
+	}
+	var vars taskfile.Vars
+	return vars, yaml.NewDecoder(f).Decode(&vars)
+}