upload: sketch is ignored if input-dir or input-file is specified

There is no point in overriding the sketch name if the user explicitly
give it via command line.

Author: cmaglie

arduino/sketches/sketches.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	"github.com/arduino/go-paths-helper"
+	"github.com/pkg/errors"
 )
 
 // Sketch is a sketch for Arduino
@@ -43,9 +44,17 @@ type BoardMetadata struct {
 
 // NewSketchFromPath loads a sketch from the specified path
 func NewSketchFromPath(path *paths.Path) (*Sketch, error) {
+	path, err := path.Abs()
+	if err != nil {
+		return nil, errors.Errorf("getting sketch path: %s", err)
+	}
 	if !path.IsDir() {
 		path = path.Parent()
 	}
+	sketchFile := path.Join(path.Base() + ".ino")
+	if !sketchFile.Exist() {
+		return nil, errors.Errorf("no valid sketch found in %s: missing %s", path, sketchFile.Base())
+	}
 	sketch := &Sketch{
 		FullPath: path,
 		Name:     path.Base(),

commands/upload/upload.go

@@ -44,12 +44,9 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 
 	// TODO: make a generic function to extract sketch from request
 	// and remove duplication in commands/compile.go
-	if req.GetSketchPath() == "" {
-		return nil, fmt.Errorf("missing sketchPath")
-	}
 	sketchPath := paths.New(req.GetSketchPath())
 	sketch, err := sketches.NewSketchFromPath(sketchPath)
-	if err != nil {
+	if err != nil && req.GetImportDir() == "" && req.GetImportFile() == "" {
 		return nil, fmt.Errorf("opening sketch: %s", err)
 	}
 
@@ -474,16 +471,9 @@ func determineBuildPathAndSketchName(importFile, importDir string, sketch *sketc
 	}
 
 	if importDir != "" {
-		// Case 2: importDir flag with a sketch
-		if sketch != nil {
-			// In this case we have both the build path and the sketch name given,
-			// so we just return them as-is
-			return paths.New(importDir), sketch.Name + ".ino", nil
-		}
-
-		// Case 3: importDir flag without a sketch
+		// Case 2: importDir flag has been specified
 
-		// In this case we have a build path but the sketch name is not given, we may
+		// In this case we have a build path but ignore the sketch name, we'll
 		// try to determine the sketch name by applying some euristics to the build folder.
 		// - "build.path" as importDir
 		// - "build.project_name" after trying to autodetect it from the build folder.
@@ -495,12 +485,12 @@ func determineBuildPathAndSketchName(importFile, importDir string, sketch *sketc
 		return buildPath, sketchName, nil
 	}
 
-	// Case 4: nothing given...
+	// Case 3: nothing given...
 	if sketch == nil {
 		return nil, "", fmt.Errorf("no sketch or build directory/file specified")
 	}
 
-	// Case 5: only sketch specified. In this case we use the default sketch build path
+	// Case 4: only sketch specified. In this case we use the default sketch build path
 	// and the given sketch name.
 
 	// TODO: Create a function to obtain importPath from sketch

commands/upload/upload_test.go

@@ -69,8 +69,8 @@ func TestDetermineBuildPathAndSketchName(t *testing.T) {
 		{"", "", blonk, nil, "<nil>", "", true},
 		// 05: use importFile to detect build.path and project_name, sketch is ignored.
 		{"testdata/build_path_2/Blink.ino.hex", "", blonk, nil, "testdata/build_path_2", "Blink.ino", false},
-		// 06: use importPath as build.path and Blonk as project name (forced by the sketch)
-		{"", "testdata/build_path_2", blonk, nil, "testdata/build_path_2", "Blonk.ino", false},
+		// 06: use importPath as build.path and Blink as project name, ignore the sketch Blonk
+		{"", "testdata/build_path_2", blonk, nil, "testdata/build_path_2", "Blink.ino", false},
 		// 07: error: used both importPath and importFile
 		{"testdata/build_path_2/Blink.ino.hex", "testdata/build_path_2", blonk, nil, "<nil>", "", true},
 
@@ -86,8 +86,8 @@ func TestDetermineBuildPathAndSketchName(t *testing.T) {
 		{"", "", blonk, fqbn, "testdata/Blonk/build/arduino.samd.mkr1000", "Blonk.ino", false},
 		// 13: use importFile to detect build.path and project_name, sketch+fqbn is ignored.
 		{"testdata/build_path_2/Blink.ino.hex", "", blonk, fqbn, "testdata/build_path_2", "Blink.ino", false},
-		// 14: use importPath as build.path and Blonk as project name (forced by the sketch), fqbn ignored
-		{"", "testdata/build_path_2", blonk, fqbn, "testdata/build_path_2", "Blonk.ino", false},
+		// 14: use importPath as build.path and Blink as project name, ignore the sketch Blonk, ignore fqbn
+		{"", "testdata/build_path_2", blonk, fqbn, "testdata/build_path_2", "Blink.ino", false},
 		// 15: error: used both importPath and importFile
 		{"testdata/build_path_2/Blink.ino.hex", "testdata/build_path_2", blonk, fqbn, "<nil>", "", true},
 	}