Move args and taskfile packages to root directory

Damian Szulc · Damian Szulc · commit 47dd9b5a030a · 2020-08-19T10:59:58.000+02:00
diff --git a/args/args.go b/args/args.go
@@ -3,7 +3,7 @@ package args
 import (
 	"strings"
 
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 // ParseV3 parses command line argument: tasks and global variables
diff --git a/args/args_test.go b/args/args_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/go-task/task/v3/internal/args"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/args"
+	"github.com/go-task/task/v3/taskfile"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/cmd/task/task.go b/cmd/task/task.go
@@ -10,9 +10,9 @@ import (
 	"syscall"
 
 	"github.com/go-task/task/v3"
-	"github.com/go-task/task/v3/internal/args"
+	"github.com/go-task/task/v3/args"
 	"github.com/go-task/task/v3/internal/logger"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 
 	"github.com/spf13/pflag"
 )
diff --git a/help.go b/help.go
@@ -6,7 +6,7 @@ import (
 	"text/tabwriter"
 
 	"github.com/go-task/task/v3/internal/logger"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 // PrintTasksHelp prints help os tasks that have a description
diff --git a/internal/compiler/compiler.go b/internal/compiler/compiler.go
@@ -1,7 +1,7 @@
 package compiler
 
 import (
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 // Compiler handles compilation of a task before its execution.
diff --git a/internal/compiler/env.go b/internal/compiler/env.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 // GetEnviron the all return all environment variables encapsulated on a
diff --git a/internal/compiler/v2/compiler_v2.go b/internal/compiler/v2/compiler_v2.go
@@ -10,8 +10,8 @@ import (
 	"github.com/go-task/task/v3/internal/compiler"
 	"github.com/go-task/task/v3/internal/execext"
 	"github.com/go-task/task/v3/internal/logger"
-	"github.com/go-task/task/v3/internal/taskfile"
 	"github.com/go-task/task/v3/internal/templater"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 var _ compiler.Compiler = &CompilerV2{}
diff --git a/internal/compiler/v3/compiler_v3.go b/internal/compiler/v3/compiler_v3.go
@@ -10,8 +10,8 @@ import (
 	"github.com/go-task/task/v3/internal/compiler"
 	"github.com/go-task/task/v3/internal/execext"
 	"github.com/go-task/task/v3/internal/logger"
-	"github.com/go-task/task/v3/internal/taskfile"
 	"github.com/go-task/task/v3/internal/templater"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 var _ compiler.Compiler = &CompilerV3{}
diff --git a/internal/summary/summary.go b/internal/summary/summary.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/go-task/task/v3/internal/logger"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 func PrintTasks(l *logger.Logger, t *taskfile.Taskfile, c []taskfile.Call) {
diff --git a/internal/summary/summary_test.go b/internal/summary/summary_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-task/task/v3/internal/logger"
 	"github.com/go-task/task/v3/internal/summary"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/internal/templater/templater.go b/internal/templater/templater.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 // Templater is a help struct that allow us to call "replaceX" funcs multiple
diff --git a/precondition.go b/precondition.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-task/task/v3/internal/execext"
 	"github.com/go-task/task/v3/internal/logger"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 var (
diff --git a/status.go b/status.go
@@ -7,7 +7,7 @@ import (
 	"github.com/go-task/task/v3/internal/execext"
 	"github.com/go-task/task/v3/internal/logger"
 	"github.com/go-task/task/v3/internal/status"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 // Status returns an error if any the of given tasks is not up-to-date
diff --git a/task.go b/task.go
@@ -16,8 +16,8 @@ import (
 	"github.com/go-task/task/v3/internal/logger"
 	"github.com/go-task/task/v3/internal/output"
 	"github.com/go-task/task/v3/internal/summary"
-	"github.com/go-task/task/v3/internal/taskfile"
-	"github.com/go-task/task/v3/internal/taskfile/read"
+	"github.com/go-task/task/v3/taskfile"
+	"github.com/go-task/task/v3/taskfile/read"
 
 	"golang.org/x/sync/errgroup"
 )
diff --git a/task_test.go b/task_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"github.com/go-task/task/v3"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/taskfile/call.go b/taskfile/call.go
diff --git a/taskfile/cmd.go b/taskfile/cmd.go
diff --git a/taskfile/included_taskfile.go b/taskfile/included_taskfile.go
diff --git a/taskfile/merge.go b/taskfile/merge.go
diff --git a/taskfile/precondition.go b/taskfile/precondition.go
diff --git a/taskfile/precondition_test.go b/taskfile/precondition_test.go
@@ -3,7 +3,7 @@ package taskfile_test
 import (
 	"testing"
 
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
diff --git a/taskfile/read/taskfile.go b/taskfile/read/taskfile.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/go-task/task/v3/internal/taskfile"
 	"github.com/go-task/task/v3/internal/templater"
+	"github.com/go-task/task/v3/taskfile"
 
 	"github.com/joho/godotenv"
 	"gopkg.in/yaml.v3"
diff --git a/taskfile/read/taskvars.go b/taskfile/read/taskvars.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 
 	"gopkg.in/yaml.v3"
 )
diff --git a/taskfile/task.go b/taskfile/task.go
diff --git a/taskfile/taskfile.go b/taskfile/taskfile.go
@@ -31,7 +31,7 @@ func (tf *Taskfile) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		Env        *Vars
 		Tasks      Tasks
 		Silent     bool
-		Dotenv 	   []string
+		Dotenv     []string
 	}
 	if err := unmarshal(&taskfile); err != nil {
 		return err
diff --git a/taskfile/taskfile_test.go b/taskfile/taskfile_test.go
@@ -3,7 +3,7 @@ package taskfile_test
 import (
 	"testing"
 
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
diff --git a/taskfile/var.go b/taskfile/var.go
diff --git a/variables.go b/variables.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/go-task/task/v3/internal/execext"
 	"github.com/go-task/task/v3/internal/status"
-	"github.com/go-task/task/v3/internal/taskfile"
 	"github.com/go-task/task/v3/internal/templater"
+	"github.com/go-task/task/v3/taskfile"
 )
 
 // CompiledTask returns a copy of a task, but replacing variables in almost all
diff --git a/watch.go b/watch.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/go-task/task/v3/internal/logger"
-	"github.com/go-task/task/v3/internal/taskfile"
+	"github.com/go-task/task/v3/taskfile"
 	"github.com/mattn/go-zglob"
 	"github.com/radovskyb/watcher"
 )

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package args`
`3`	`3`	`import (`
`4`	`4`	`"strings"`
`5`	`5`
`6`		`- "github.com/go-task/task/v3/internal/taskfile"`
	`6`	`+ "github.com/go-task/task/v3/taskfile"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// ParseV3 parses command line argument: tasks and global variables`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/go-task/task/v3/internal/args"`
`8`		`- "github.com/go-task/task/v3/internal/taskfile"`
	`7`	`+ "github.com/go-task/task/v3/args"`
	`8`	`+ "github.com/go-task/task/v3/taskfile"`
`9`	`9`
`10`	`10`	`"github.com/stretchr/testify/assert"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"text/tabwriter"`
`7`	`7`
`8`	`8`	`"github.com/go-task/task/v3/internal/logger"`
`9`		`- "github.com/go-task/task/v3/internal/taskfile"`
	`9`	`+ "github.com/go-task/task/v3/taskfile"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// PrintTasksHelp prints help os tasks that have a description`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package compiler`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/go-task/task/v3/internal/taskfile"`
	`4`	`+ "github.com/go-task/task/v3/taskfile"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// Compiler handles compilation of a task before its execution.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"os"`
`5`	`5`	`"strings"`
`6`	`6`
`7`		`- "github.com/go-task/task/v3/internal/taskfile"`
	`7`	`+ "github.com/go-task/task/v3/taskfile"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// GetEnviron the all return all environment variables encapsulated on a`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"github.com/go-task/task/v3/internal/compiler"`
`11`	`11`	`"github.com/go-task/task/v3/internal/execext"`
`12`	`12`	`"github.com/go-task/task/v3/internal/logger"`
`13`		`- "github.com/go-task/task/v3/internal/taskfile"`
`14`	`13`	`"github.com/go-task/task/v3/internal/templater"`
	`14`	`+ "github.com/go-task/task/v3/taskfile"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`var _ compiler.Compiler = &CompilerV2{}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/go-task/task/v3/internal/logger"`
`9`	`9`	`"github.com/go-task/task/v3/internal/summary"`
`10`		`- "github.com/go-task/task/v3/internal/taskfile"`
	`10`	`+ "github.com/go-task/task/v3/taskfile"`
`11`	`11`
`12`	`12`	`"github.com/stretchr/testify/assert"`
`13`	`13`	`)`