feat: remove v2 support

go-task · Dec 28, 2023 · d2c8edf · d2c8edf
1 parent 685a6f3
commit d2c8edf
Show file tree

Hide file tree

Showing 29 changed files with 294 additions and 970 deletions.
diff --git a/args/args.go b/args/args.go
@@ -6,8 +6,8 @@ import (
 	"github.com/go-task/task/v3/taskfile"
 )
 
-// ParseV3 parses command line argument: tasks and global variables
-func ParseV3(args ...string) ([]taskfile.Call, *taskfile.Vars) {
+// Parse parses command line argument: tasks and global variables
+func Parse(args ...string) ([]taskfile.Call, *taskfile.Vars) {
 	calls := []taskfile.Call{}
 	globals := &taskfile.Vars{}
 
@@ -24,32 +24,6 @@ func ParseV3(args ...string) ([]taskfile.Call, *taskfile.Vars) {
 	return calls, globals
 }
 
-// ParseV2 parses command line argument: tasks and vars of each task
-func ParseV2(args ...string) ([]taskfile.Call, *taskfile.Vars) {
-	calls := []taskfile.Call{}
-	globals := &taskfile.Vars{}
-
-	for _, arg := range args {
-		if !strings.Contains(arg, "=") {
-			calls = append(calls, taskfile.Call{Task: arg, Direct: true})
-			continue
-		}
-
-		if len(calls) < 1 {
-			name, value := splitVar(arg)
-			globals.Set(name, taskfile.Var{Value: value})
-		} else {
-			if calls[len(calls)-1].Vars == nil {
-				calls[len(calls)-1].Vars = &taskfile.Vars{}
-			}
-			name, value := splitVar(arg)
-			calls[len(calls)-1].Vars.Set(name, taskfile.Var{Value: value})
-		}
-	}
-
-	return calls, globals
-}
-
 func splitVar(s string) (string, string) {
 	pair := strings.SplitN(s, "=", 2)
 	return pair[0], pair[1]

diff --git a/args/args_test.go b/args/args_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/go-task/task/v3/taskfile"
 )
 
-func TestArgsV3(t *testing.T) {
+func TestArgs(t *testing.T) {
 	tests := []struct {
 		Args            []string
 		ExpectedCalls   []taskfile.Call
@@ -97,7 +97,7 @@ func TestArgsV3(t *testing.T) {
 
 	for i, test := range tests {
 		t.Run(fmt.Sprintf("TestArgs%d", i+1), func(t *testing.T) {
-			calls, globals := args.ParseV3(test.Args...)
+			calls, globals := args.Parse(test.Args...)
 			assert.Equal(t, test.ExpectedCalls, calls)
 			if test.ExpectedGlobals.Len() > 0 || globals.Len() > 0 {
 				assert.Equal(t, test.ExpectedGlobals.Keys(), globals.Keys())
@@ -106,114 +106,3 @@ func TestArgsV3(t *testing.T) {
 		})
 	}
 }
-
-func TestArgsV2(t *testing.T) {
-	tests := []struct {
-		Args            []string
-		ExpectedCalls   []taskfile.Call
-		ExpectedGlobals *taskfile.Vars
-	}{
-		{
-			Args: []string{"task-a", "task-b", "task-c"},
-			ExpectedCalls: []taskfile.Call{
-				{Task: "task-a", Direct: true},
-				{Task: "task-b", Direct: true},
-				{Task: "task-c", Direct: true},
-			},
-		},
-		{
-			Args: []string{"task-a", "FOO=bar", "task-b", "task-c", "BAR=baz", "BAZ=foo"},
-			ExpectedCalls: []taskfile.Call{
-				{
-					Task:   "task-a",
-					Direct: true,
-					Vars: &taskfile.Vars{
-						OrderedMap: orderedmap.FromMapWithOrder(
-							map[string]taskfile.Var{
-								"FOO": {Value: "bar"},
-							},
-							[]string{"FOO"},
-						),
-					},
-				},
-				{Task: "task-b", Direct: true},
-				{
-					Task:   "task-c",
-					Direct: true,
-					Vars: &taskfile.Vars{
-						OrderedMap: orderedmap.FromMapWithOrder(
-							map[string]taskfile.Var{
-								"BAR": {Value: "baz"},
-								"BAZ": {Value: "foo"},
-							},
-							[]string{"BAR", "BAZ"},
-						),
-					},
-				},
-			},
-		},
-		{
-			Args: []string{"task-a", "CONTENT=with some spaces"},
-			ExpectedCalls: []taskfile.Call{
-				{
-					Task:   "task-a",
-					Direct: true,
-					Vars: &taskfile.Vars{
-						OrderedMap: orderedmap.FromMapWithOrder(
-							map[string]taskfile.Var{
-								"CONTENT": {Value: "with some spaces"},
-							},
-							[]string{"CONTENT"},
-						),
-					},
-				},
-			},
-		},
-		{
-			Args: []string{"FOO=bar", "task-a", "task-b"},
-			ExpectedCalls: []taskfile.Call{
-				{Task: "task-a", Direct: true},
-				{Task: "task-b", Direct: true},
-			},
-			ExpectedGlobals: &taskfile.Vars{
-				OrderedMap: orderedmap.FromMapWithOrder(
-					map[string]taskfile.Var{
-						"FOO": {Value: "bar"},
-					},
-					[]string{"FOO"},
-				),
-			},
-		},
-		{
-			Args:          nil,
-			ExpectedCalls: []taskfile.Call{},
-		},
-		{
-			Args:          []string{},
-			ExpectedCalls: []taskfile.Call{},
-		},
-		{
-			Args:          []string{"FOO=bar", "BAR=baz"},
-			ExpectedCalls: []taskfile.Call{},
-			ExpectedGlobals: &taskfile.Vars{
-				OrderedMap: orderedmap.FromMapWithOrder(
-					map[string]taskfile.Var{
-						"FOO": {Value: "bar"},
-						"BAR": {Value: "baz"},
-					},
-					[]string{"FOO", "BAR"},
-				),
-			},
-		},
-	}
-
-	for i, test := range tests {
-		t.Run(fmt.Sprintf("TestArgs%d", i+1), func(t *testing.T) {
-			calls, globals := args.ParseV2(test.Args...)
-			assert.Equal(t, test.ExpectedCalls, calls)
-			if test.ExpectedGlobals.Len() > 0 || globals.Len() > 0 {
-				assert.Equal(t, test.ExpectedGlobals, globals)
-			}
-		})
-	}
-}
diff --git a/cmd/task/task.go b/cmd/task/task.go
@@ -300,11 +300,7 @@ func run() error {
 		return err
 	}
 
-	if e.Taskfile.Version.Compare(taskfile.V3) >= 0 {
-		calls, globals = args.ParseV3(tasksAndVars...)
-	} else {
-		calls, globals = args.ParseV2(tasksAndVars...)
-	}
+	calls, globals = args.Parse(tasksAndVars...)
 
 	// If there are no calls, run the default task instead
 	if len(calls) == 0 {