Add --additional-urls flag (#316)

* add --additional-urls flag

* add testdata

* add core search test

Author: masci

cli/cli.go

@@ -78,6 +78,7 @@ func createCliCommandTree(cmd *cobra.Command) {
 	cmd.PersistentFlags().BoolVar(&globals.Debug, "debug", false, "Enables debug output (super verbose, used to debug the CLI).")
 	cmd.PersistentFlags().StringVar(&outputFormat, "format", "text", "The output format, can be [text|json].")
 	cmd.PersistentFlags().StringVar(&globals.YAMLConfigFile, "config-file", "", "The custom config file (if not specified the default will be used).")
+	cmd.PersistentFlags().StringSliceVar(&globals.AdditionalUrls, "additional-urls", []string{}, "Additional URLs for the board manager.")
 }
 
 func preRun(cmd *cobra.Command, args []string) {

cli/globals/globals.go

@@ -39,6 +39,8 @@ var (
 	Config *configs.Configuration
 	// YAMLConfigFile contains the path to the config file
 	YAMLConfigFile string
+	// AdditionalUrls contains the list of additional urls the boards manager can use
+	AdditionalUrls []string
 )
 
 func getHTTPClientHeader() http.Header {

cli/instance/instance.go

@@ -62,6 +62,11 @@ func initInstance() *rpc.InitResp {
 
 func packageManagerInitReq() *rpc.InitReq {
 	urls := []string{}
+
+	for _, urlString := range globals.AdditionalUrls {
+		urls = append(urls, urlString)
+	}
+
 	for _, URL := range globals.Config.BoardManagerAdditionalUrls {
 		urls = append(urls, URL.String())
 	}

test/test_board.py

@@ -19,7 +19,7 @@
 
 
 @pytest.mark.skipif(running_on_ci(), reason="VMs have no serial ports")
-def test_board_list(run_command):
+def test_core_list(run_command):
     result = run_command("core update-index")
     assert result.ok
     result = run_command("board list --format json")
@@ -33,9 +33,29 @@ def test_board_list(run_command):
 
 
 @pytest.mark.skipif(running_on_ci(), reason="VMs have no serial ports")
-def test_board_listall(run_command):
+def test_core_listall(run_command):
     assert run_command("core update-index")
     result = run_command("board listall")
     print(result.stderr, result.stdout)
     assert result.ok
     assert ["Board", "Name", "FQBN"] == result.stdout.splitlines()[0].strip().split()
+
+
+def test_core_search(run_command):
+    url = "https://raw.githubusercontent.com/arduino/arduino-cli/master/test/testdata/test_index.json"
+    assert run_command("core update-index --additional-urls={}".format(url))
+    # default search
+    result = run_command("core search avr")
+    assert result.ok
+    assert 2 < len(result.stdout.splitlines())
+    result = run_command("core search avr --format json")
+    assert result.ok
+    data = json.loads(result.stdout)
+    assert 0 < len(data)
+    # additional URL
+    result = run_command(
+        "core search test_core --format json --additional-urls={}".format(url)
+    )
+    assert result.ok
+    data = json.loads(result.stdout)
+    assert 1 == len(data)

test/testdata/core.txt

@@ -0,0 +1 @@
+HELO

test/testdata/test_index.json

@@ -0,0 +1,35 @@
+{
+    "packages": [
+        {
+            "maintainer": "Arduino",
+            "help": {
+                "online": "https://github.com/Arduino/arduino-cli"
+            },
+            "websiteURL": "https://github.com/Arduino/arduino-cli",
+            "platforms": [
+                {
+                    "category": "Test Category",
+                    "help": {
+                        "online": "https://github.com/Arduino/arduino-cli"
+                    },
+                    "url": "https://raw.githubusercontent.com/arduino/arduino-cli/massi/additional-urls/test/testdata/core.txt",
+                    "checksum": "SHA-256:1ba93f6aea56842dfef065c0f5eb0a34c1f78b72b3f2426c94e47ba3a359c9ff",
+                    "name": "test_core",
+                    "version": "1.0.0",
+                    "architecture": "x86",
+                    "archiveFileName": "core.txt",
+                    "size": "2799",
+                    "toolsDependencies": [],
+                    "boards": [
+                        {
+                            "name": "Test Board"
+                        }
+                    ]
+                }
+            ],
+            "tools": [],
+            "email": "test@example.com",
+            "name": "test"
+        }
+    ]
+}