Search for config file in local directory

Author: matteosuppo

configs/navigate.go

@@ -1,18 +1,27 @@
 package configs
 
 import (
+	"fmt"
+
 	paths "github.com/arduino/go-paths-helper"
 	homedir "github.com/mitchellh/go-homedir"
 )
 
 func Navigate(root, pwd string) Configuration {
+	fmt.Println("Navigate", root, pwd)
 	home, err := homedir.Dir()
 	if err != nil {
 		panic(err) // Should never happen
 	}
 
-	return Configuration{
+	// Default configuration
+	config := Configuration{
 		SketchbookDir: paths.New(home, "Arduino"),
 		DataDir:       paths.New(home, ".arduino15"),
 	}
+
+	// Search for arduino-cli.yaml in current folder
+	_ = config.LoadFromYAML(paths.New(pwd, "arduino-cli.yaml"))
+
+	return config
 }

configs/navigate_test.go

@@ -14,6 +14,7 @@ import (
 func TestNavigate(t *testing.T) {
 	tests := []string{
 		"noconfig",
+		"local",
 	}
 	for _, tt := range tests {
 		t.Run(tt, func(t *testing.T) {

configs/testdata/navigate/local/first/second/.gitkeep

@@ -0,0 +1,4 @@
+board_manager:
+  additional_urls:
+    - https://downloads.arduino.cc/package_index_mraa.json
+    

configs/testdata/navigate/local/first/second/arduino-cli.yaml

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

configs/testdata/navigate/local/golden.yaml

@@ -23,7 +23,6 @@ import (
 	"net/url"
 
 	paths "github.com/arduino/go-paths-helper"
-	"github.com/sirupsen/logrus"
 	yaml "gopkg.in/yaml.v2"
 )
 
@@ -48,16 +47,13 @@ type yamlProxyConfig struct {
 
 // LoadFromYAML loads the configs from a yaml file.
 func (config *Configuration) LoadFromYAML(path *paths.Path) error {
-	logrus.Info("Unserializing configurations from ", path)
 	content, err := path.ReadFile()
 	if err != nil {
-		logrus.WithError(err).Warn("Error reading config, using default configuration")
 		return err
 	}
 	var ret yamlConfig
 	err = yaml.Unmarshal(content, &ret)
 	if err != nil {
-		logrus.WithError(err).Warn("Error parsing config, using default configuration")
 		return err
 	}
 
@@ -84,12 +80,12 @@ func (config *Configuration) LoadFromYAML(path *paths.Path) error {
 		for _, rawurl := range ret.BoardsManager.AdditionalURLS {
 			url, err := url.Parse(rawurl)
 			if err != nil {
-				logrus.WithError(err).Warn("Error parsing config")
 				continue
 			}
 			config.BoardManagerAdditionalUrls = append(config.BoardManagerAdditionalUrls, url)
 		}
 	}
+
 	return nil
 }
 
@@ -113,9 +109,9 @@ func (config *Configuration) SerializeToYAML() ([]byte, error) {
 			Password: config.ProxyPassword,
 		}
 	}
-	if len(config.BoardManagerAdditionalUrls) > 1 {
+	if len(config.BoardManagerAdditionalUrls) > 0 {
 		c.BoardsManager = &yamlBoardsManagerConfig{AdditionalURLS: []string{}}
-		for _, URL := range config.BoardManagerAdditionalUrls[1:] {
+		for _, URL := range config.BoardManagerAdditionalUrls {
 			c.BoardsManager.AdditionalURLS = append(c.BoardsManager.AdditionalURLS, URL.String())
 		}
 	}