align sketch new behaviour in sketch path parameter mangling adding proper testing

Author: Roberto Sora

cli/Test/Test.ino

@@ -0,0 +1,6 @@
+
+void setup() {
+}
+
+void loop() {
+}

cli/cli_test.go

@@ -296,12 +296,6 @@ func TestUploadIntegration(t *testing.T) {
 	require.NotZero(t, exitCode)
 }
 
-func TestSketchCommandsIntegration(t *testing.T) {
-	exitCode, d := executeWithArgs("sketch", "new", "Test")
-	require.Zero(t, exitCode)
-	require.Contains(t, string(d), "Sketch created")
-}
-
 func TestCompileCommandsIntegration(t *testing.T) {
 	// Set staging dir to a temporary dir
 	tmp := tmpDirOrDie()

cli/sketch/new.go

@@ -18,11 +18,12 @@
 package sketch
 
 import (
+	"io/ioutil"
 	"os"
+	"path/filepath"
 
 	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
-	"github.com/arduino/go-paths-helper"
 	"github.com/spf13/cobra"
 )
 
@@ -47,18 +48,21 @@ void loop() {
 `)
 
 func runNewCommand(cmd *cobra.Command, args []string) {
-	sketchDir := paths.New(args[0])
-	sketchDir.ToAbs()
-	if err := sketchDir.MkdirAll(); err != nil {
+	sketchDir, err := filepath.Abs(args[0])
+	if err != nil {
+		feedback.Errorf("Error creating sketch: %v", err)
+		os.Exit(errorcodes.ErrGeneric)
+	}
+	if err := os.MkdirAll(sketchDir, os.FileMode(0755)); err != nil {
 		feedback.Errorf("Could not create sketch directory: %v", err)
 		os.Exit(errorcodes.ErrGeneric)
 	}
-	sketchName := sketchDir.Base()
-	sketchFile := sketchDir.Join(sketchName + ".ino")
-	if err := sketchFile.WriteFile(emptySketch); err != nil {
+	sketchName := filepath.Base(sketchDir)
+	sketchFile := filepath.Join(sketchDir, sketchName+".ino")
+	if err := ioutil.WriteFile(sketchFile, emptySketch, os.FileMode(0644)); err != nil {
 		feedback.Errorf("Error creating sketch: %v", err)
 		os.Exit(errorcodes.ErrGeneric)
 	}
 
-	feedback.Print("Sketch created in: " + sketchDir.String())
+	feedback.Print("Sketch created in: " + sketchDir)
 }

test/test_compile.py

@@ -14,11 +14,33 @@
 # a commercial license, send an email to [email protected].
 import json
 import os
+
 import pytest
 
 from .common import running_on_ci
 
 
+def test_sketch_new_(run_command):
+    # Create a test sketch in current directory
+    current_path = os.getcwd()
+    sketch_name = "SketchNewIntegrationTest"
+    current_sketch_path = os.path.join(current_path, sketch_name)
+    result = run_command("sketch new {}".format(sketch_name))
+    assert result.ok
+    assert "Sketch created in: {}".format(current_sketch_path) in result.stdout
+    assert os.path.isfile(os.path.join(current_sketch_path, sketch_name + ".ino"))
+
+    # Create a test sketch in current directory but using an absolute path
+    sketch_name = "SketchNewIntegrationTestAbsolute"
+    current_sketch_path = os.path.join(current_path, sketch_name)
+    result = run_command("sketch new {}".format(current_sketch_path))
+    assert result.ok
+    assert "Sketch created in: {}".format(current_sketch_path) in result.stdout
+    assert os.path.isfile(os.path.join(current_sketch_path, sketch_name + ".ino"))
+
+
+
+
 def test_compile_without_fqbn(run_command):
     # Init the environment explicitly
     result = run_command("core update-index")