From fb72b46a3c0e71c7c6fbfb701b173886b2cd7543 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Sun, 16 Aug 2020 15:48:19 -0300 Subject: [PATCH] github.com/go-task/task/v2 -> github.com/go-task/task/v3 --- cmd/task/task.go | 6 +++--- go.mod | 2 +- help.go | 4 ++-- internal/args/args.go | 2 +- internal/args/args_test.go | 4 ++-- internal/compiler/compiler.go | 2 +- internal/compiler/env.go | 2 +- internal/compiler/v2/compiler_v2.go | 10 +++++----- internal/compiler/v3/compiler_v3.go | 10 +++++----- internal/output/output_test.go | 2 +- internal/status/glob.go | 2 +- internal/summary/summary.go | 4 ++-- internal/summary/summary_test.go | 6 +++--- internal/taskfile/precondition_test.go | 2 +- internal/taskfile/read/taskfile.go | 4 ++-- internal/taskfile/read/taskvars.go | 2 +- internal/taskfile/taskfile_test.go | 2 +- internal/templater/templater.go | 2 +- precondition.go | 6 +++--- status.go | 8 ++++---- task.go | 18 +++++++++--------- task_test.go | 22 +++++++++++----------- variables.go | 8 ++++---- watch.go | 4 ++-- 24 files changed, 67 insertions(+), 67 deletions(-) diff --git a/cmd/task/task.go b/cmd/task/task.go index 889fa0ad..d80c972c 100644 --- a/cmd/task/task.go +++ b/cmd/task/task.go @@ -9,9 +9,9 @@ import ( "path/filepath" "syscall" - "github.com/go-task/task/v2" - "github.com/go-task/task/v2/internal/args" - "github.com/go-task/task/v2/internal/logger" + "github.com/go-task/task/v3" + "github.com/go-task/task/v3/internal/args" + "github.com/go-task/task/v3/internal/logger" "github.com/spf13/pflag" ) diff --git a/go.mod b/go.mod index 180b78a8..1104e3c2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/go-task/task/v2 +module github.com/go-task/task/v3 require ( github.com/fatih/color v1.7.0 diff --git a/help.go b/help.go index 0867ca5f..2fa6c42b 100644 --- a/help.go +++ b/help.go @@ -5,8 +5,8 @@ import ( "sort" "text/tabwriter" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/logger" + "github.com/go-task/task/v3/internal/taskfile" ) // PrintTasksHelp prints help os tasks that have a description diff --git a/internal/args/args.go b/internal/args/args.go index e157db32..6d99b323 100644 --- a/internal/args/args.go +++ b/internal/args/args.go @@ -3,7 +3,7 @@ package args import ( "strings" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/taskfile" ) // Parse parses command line argument: tasks and vars of each task diff --git a/internal/args/args_test.go b/internal/args/args_test.go index 779b37f9..69d23495 100644 --- a/internal/args/args_test.go +++ b/internal/args/args_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/go-task/task/v2/internal/args" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/args" + "github.com/go-task/task/v3/internal/taskfile" "github.com/stretchr/testify/assert" ) diff --git a/internal/compiler/compiler.go b/internal/compiler/compiler.go index 75dcb3ee..ea1ec49d 100644 --- a/internal/compiler/compiler.go +++ b/internal/compiler/compiler.go @@ -1,7 +1,7 @@ package compiler import ( - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/taskfile" ) // Compiler handles compilation of a task before its execution. diff --git a/internal/compiler/env.go b/internal/compiler/env.go index 283577cc..068a5846 100644 --- a/internal/compiler/env.go +++ b/internal/compiler/env.go @@ -4,7 +4,7 @@ import ( "os" "strings" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/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 index 6bcbfaf2..1205a26c 100644 --- a/internal/compiler/v2/compiler_v2.go +++ b/internal/compiler/v2/compiler_v2.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/go-task/task/v2/internal/compiler" - "github.com/go-task/task/v2/internal/execext" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/taskfile" - "github.com/go-task/task/v2/internal/templater" + "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" ) var _ compiler.Compiler = &CompilerV2{} diff --git a/internal/compiler/v3/compiler_v3.go b/internal/compiler/v3/compiler_v3.go index 85e68d90..16fdd9eb 100644 --- a/internal/compiler/v3/compiler_v3.go +++ b/internal/compiler/v3/compiler_v3.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/go-task/task/v2/internal/compiler" - "github.com/go-task/task/v2/internal/execext" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/taskfile" - "github.com/go-task/task/v2/internal/templater" + "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" ) var _ compiler.Compiler = &CompilerV3{} diff --git a/internal/output/output_test.go b/internal/output/output_test.go index 347ef5bb..80b49f61 100644 --- a/internal/output/output_test.go +++ b/internal/output/output_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "github.com/go-task/task/v2/internal/output" + "github.com/go-task/task/v3/internal/output" "github.com/stretchr/testify/assert" ) diff --git a/internal/status/glob.go b/internal/status/glob.go index a70f663d..8b6cb1e4 100644 --- a/internal/status/glob.go +++ b/internal/status/glob.go @@ -5,7 +5,7 @@ import ( "path/filepath" "sort" - "github.com/go-task/task/v2/internal/execext" + "github.com/go-task/task/v3/internal/execext" "github.com/mattn/go-zglob" ) diff --git a/internal/summary/summary.go b/internal/summary/summary.go index baa4f481..ba72d442 100644 --- a/internal/summary/summary.go +++ b/internal/summary/summary.go @@ -3,8 +3,8 @@ package summary import ( "strings" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/logger" + "github.com/go-task/task/v3/internal/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 index 95029efc..2cc3ab9d 100644 --- a/internal/summary/summary_test.go +++ b/internal/summary/summary_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/summary" - "github.com/go-task/task/v2/internal/taskfile" + "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/stretchr/testify/assert" ) diff --git a/internal/taskfile/precondition_test.go b/internal/taskfile/precondition_test.go index dd202bd0..cbeb9265 100644 --- a/internal/taskfile/precondition_test.go +++ b/internal/taskfile/precondition_test.go @@ -3,7 +3,7 @@ package taskfile_test import ( "testing" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/taskfile" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/internal/taskfile/read/taskfile.go b/internal/taskfile/read/taskfile.go index edde4bcc..c7cfc912 100644 --- a/internal/taskfile/read/taskfile.go +++ b/internal/taskfile/read/taskfile.go @@ -7,8 +7,8 @@ import ( "path/filepath" "runtime" - "github.com/go-task/task/v2/internal/taskfile" - "github.com/go-task/task/v2/internal/templater" + "github.com/go-task/task/v3/internal/taskfile" + "github.com/go-task/task/v3/internal/templater" "github.com/joho/godotenv" "gopkg.in/yaml.v3" diff --git a/internal/taskfile/read/taskvars.go b/internal/taskfile/read/taskvars.go index cc5bcaa8..9698d799 100644 --- a/internal/taskfile/read/taskvars.go +++ b/internal/taskfile/read/taskvars.go @@ -6,7 +6,7 @@ import ( "path/filepath" "runtime" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/taskfile" "gopkg.in/yaml.v3" ) diff --git a/internal/taskfile/taskfile_test.go b/internal/taskfile/taskfile_test.go index fcdd4bb1..092bc1d5 100644 --- a/internal/taskfile/taskfile_test.go +++ b/internal/taskfile/taskfile_test.go @@ -3,7 +3,7 @@ package taskfile_test import ( "testing" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/taskfile" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/internal/templater/templater.go b/internal/templater/templater.go index 85de72fb..782ee74f 100644 --- a/internal/templater/templater.go +++ b/internal/templater/templater.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/taskfile" ) // Templater is a help struct that allow us to call "replaceX" funcs multiple diff --git a/precondition.go b/precondition.go index ae41d15c..f1a64a63 100644 --- a/precondition.go +++ b/precondition.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/go-task/task/v2/internal/execext" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/execext" + "github.com/go-task/task/v3/internal/logger" + "github.com/go-task/task/v3/internal/taskfile" ) var ( diff --git a/status.go b/status.go index 83f383e6..709f83fb 100644 --- a/status.go +++ b/status.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/go-task/task/v2/internal/execext" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/status" - "github.com/go-task/task/v2/internal/taskfile" + "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" ) // Status returns an error if any the of given tasks is not up-to-date diff --git a/task.go b/task.go index 2807dd7f..74cbb536 100644 --- a/task.go +++ b/task.go @@ -9,15 +9,15 @@ import ( "sync" "sync/atomic" - "github.com/go-task/task/v2/internal/compiler" - compilerv2 "github.com/go-task/task/v2/internal/compiler/v2" - compilerv3 "github.com/go-task/task/v2/internal/compiler/v3" - "github.com/go-task/task/v2/internal/execext" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/output" - "github.com/go-task/task/v2/internal/summary" - "github.com/go-task/task/v2/internal/taskfile" - "github.com/go-task/task/v2/internal/taskfile/read" + "github.com/go-task/task/v3/internal/compiler" + compilerv2 "github.com/go-task/task/v3/internal/compiler/v2" + compilerv3 "github.com/go-task/task/v3/internal/compiler/v3" + "github.com/go-task/task/v3/internal/execext" + "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" "golang.org/x/sync/errgroup" ) diff --git a/task_test.go b/task_test.go index 87a5552a..4a35b274 100644 --- a/task_test.go +++ b/task_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "github.com/go-task/task/v2" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3" + "github.com/go-task/task/v3/internal/taskfile" "github.com/stretchr/testify/assert" ) @@ -823,7 +823,7 @@ func TestDotenvShouldIncludeAllEnvFiles(t *testing.T) { Target: "default", TrimSpace: false, Files: map[string]string{ - "include.txt": "INCLUDE1='from_include1' INCLUDE2='from_include2'\n", + "include.txt": "INCLUDE1='from_include1' INCLUDE2='from_include2'\n", }, } tt.Run(t) @@ -835,11 +835,11 @@ func TestDotenvShouldErrorWithIncludeEnvPath(t *testing.T) { var buff bytes.Buffer e := task.Executor{ - Dir: dir, + Dir: dir, Entrypoint: entry, - Summary: true, - Stdout: &buff, - Stderr: &buff, + Summary: true, + Stdout: &buff, + Stderr: &buff, } err := e.Setup() assert.Error(t, err) @@ -852,11 +852,11 @@ func TestDotenvShouldErrorWhenIncludingDependantDotenvs(t *testing.T) { var buff bytes.Buffer e := task.Executor{ - Dir: dir, + Dir: dir, Entrypoint: entry, - Summary: true, - Stdout: &buff, - Stderr: &buff, + Summary: true, + Stdout: &buff, + Stderr: &buff, } err := e.Setup() diff --git a/variables.go b/variables.go index 4470d296..87a9764c 100644 --- a/variables.go +++ b/variables.go @@ -4,10 +4,10 @@ import ( "path/filepath" "strings" - "github.com/go-task/task/v2/internal/execext" - "github.com/go-task/task/v2/internal/status" - "github.com/go-task/task/v2/internal/taskfile" - "github.com/go-task/task/v2/internal/templater" + "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" ) // CompiledTask returns a copy of a task, but replacing variables in almost all diff --git a/watch.go b/watch.go index f6d68c3b..8c64c022 100644 --- a/watch.go +++ b/watch.go @@ -8,8 +8,8 @@ import ( "syscall" "time" - "github.com/go-task/task/v2/internal/logger" - "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v3/internal/logger" + "github.com/go-task/task/v3/internal/taskfile" "github.com/mattn/go-zglob" "github.com/radovskyb/watcher" )