Make Navigate a method of Configuration

This will make sure it can be chained with other ParseFromYaml

Author: matteosuppo

configs/navigate.go

@@ -5,34 +5,20 @@ import (
 	"strings"
 
 	paths "github.com/arduino/go-paths-helper"
-	homedir "github.com/mitchellh/go-homedir"
 )
 
-func Navigate(root, pwd string) Configuration {
+func (c *Configuration) Navigate(root, pwd string) {
 	relativePath, err := filepath.Rel(root, pwd)
 	if err != nil {
 		panic(err)
 	}
 
-	home, err := homedir.Dir()
-	if err != nil {
-		panic(err) // Should never happen
-	}
-
-	// Default configuration
-	config := Configuration{
-		SketchbookDir: paths.New(home, "Arduino"),
-		DataDir:       paths.New(home, ".arduino15"),
-	}
-
 	// From the root to the current folder, search for arduino-cli.yaml files
 	parts := strings.Split(relativePath, string(filepath.Separator))
 	for i := range parts {
 		path := paths.New(root)
 		path = path.Join(parts[:i+1]...)
 		path = path.Join("arduino-cli.yaml")
-		_ = config.LoadFromYAML(path)
+		_ = c.LoadFromYAML(path)
 	}
-
-	return config
 }

configs/navigate_test.go

@@ -23,8 +23,10 @@ func TestNavigate(t *testing.T) {
 			pwd := filepath.Join("testdata", "navigate", tt, "first", "second")
 			golden := filepath.Join("testdata", "navigate", tt, "golden.yaml")
 
-			got := configs.Navigate(root, pwd)
-			data, _ := got.SerializeToYAML()
+			config, _ := configs.NewConfiguration()
+
+			config.Navigate(root, pwd)
+			data, _ := config.SerializeToYAML()
 
 			diff(t, data, golden)
 		})

configs/testdata/navigate/inheritance/golden.yaml

@@ -1,6 +1,7 @@
-proxy_type: ""
+proxy_type: auto
 sketchbook_path: /tmp
 arduino_data: $HOME/.arduino15
 board_manager:
   additional_urls:
+  - https://downloads.arduino.cc/packages/package_index.json
   - https://downloads.arduino.cc/package_index_mraa.json

configs/testdata/navigate/local/golden.yaml

@@ -1,6 +1,7 @@
-proxy_type: ""
+proxy_type: auto
 sketchbook_path: $HOME/Arduino
 arduino_data: $HOME/.arduino15
 board_manager:
   additional_urls:
+  - https://downloads.arduino.cc/packages/package_index.json
   - https://downloads.arduino.cc/package_index_mraa.json

configs/testdata/navigate/noconfig/golden.yaml

@@ -1,4 +1,6 @@
-proxy_type: ""
+proxy_type: auto
 sketchbook_path: $HOME/Arduino
 arduino_data: $HOME/.arduino15
-board_manager: null
+board_manager:
+  additional_urls:
+  - https://downloads.arduino.cc/packages/package_index.json