Added check for missing core/arch/version in core arg parsing

Author: cmaglie

cli/globals/args.go

@@ -54,10 +54,18 @@ func ParseReferenceArgs(args []string, parseArch bool) ([]*ReferenceArg, error)
 // "packager:arch@version", useful to represent a platform (or core) name.
 func ParseReferenceArg(arg string, parseArch bool) (*ReferenceArg, error) {
 	ret := &ReferenceArg{}
-
+	if arg == "" {
+		return nil, fmt.Errorf("invalid empry core argument")
+	}
 	toks := strings.SplitN(arg, "@", 2)
+	if toks[0] == "" {
+		return nil, fmt.Errorf("invalid empty core reference '%s'", arg)
+	}
 	ret.PackageName = toks[0]
 	if len(toks) > 1 {
+		if toks[1] == "" {
+			return nil, fmt.Errorf("invalid empty core version: '%s'", arg)
+		}
 		ret.Version = toks[1]
 	}
 
@@ -66,7 +74,13 @@ func ParseReferenceArg(arg string, parseArch bool) (*ReferenceArg, error) {
 		if len(toks) != 2 {
 			return nil, fmt.Errorf("invalid item %s", arg)
 		}
+		if toks[0] == "" {
+			return nil, fmt.Errorf("invalid empty core name '%s'", arg)
+		}
 		ret.PackageName = toks[0]
+		if toks[1] == "" {
+			return nil, fmt.Errorf("invalid empty core architecture '%s'", arg)
+		}
 		ret.Architecture = toks[1]
 	}
 
@@ -100,7 +114,7 @@ func ParseLibraryReferenceArg(arg string) (*LibraryReferenceArg, error) {
 	ret.Name = tokens[0]
 	if len(tokens) > 1 {
 		if tokens[1] == "" {
-			return nil, fmt.Errorf("invalid empty library version")
+			return nil, fmt.Errorf("invalid empty library version: %s", arg)
 		}
 		ret.Version = tokens[1]
 	}

cli/globals/args_test.go

@@ -31,7 +31,6 @@ var goodCores = []struct {
 }{
 	{"arduino:avr", &globals.ReferenceArg{"arduino", "avr", ""}},
 	{"arduino:avr@1.6.20", &globals.ReferenceArg{"arduino", "avr", "1.6.20"}},
-	{"arduino:avr@", &globals.ReferenceArg{"arduino", "avr", ""}},
 }
 
 var goodLibs = []struct {
@@ -49,6 +48,11 @@ var badCores = []struct {
 	{"arduino:avr:avr", nil},
 	{"arduino@1.6.20:avr", nil},
 	{"arduino:avr:avr@1.6.20", nil},
+	{"arduino:@1.6.20", nil},
+	{":avr@1.5.0", nil},
+	{"@1.5.0", nil},
+	{"arduino:avr@", nil},
+	{"", nil},
 }
 
 var badLibs = []struct {
@@ -63,6 +67,9 @@ func TestArgsStringify(t *testing.T) {
 	for _, lib := range goodLibs {
 		require.Equal(t, lib.in, lib.expected.String())
 	}
+	for _, core := range goodCores {
+		require.Equal(t, core.in, core.expected.String())
+	}
 }
 
 func TestParseReferenceArgCores(t *testing.T) {
@@ -74,8 +81,8 @@ func TestParseReferenceArgCores(t *testing.T) {
 
 	for _, tt := range badCores {
 		actual, err := globals.ParseReferenceArg(tt.in, true)
-		assert.NotNil(t, err)
-		assert.Equal(t, tt.expected, actual)
+		require.NotNil(t, err, "Testing bad core '%s'", tt.in)
+		require.Equal(t, tt.expected, actual, "Testing bad core '%s'", tt.in)
 	}
 }