fix: support multiple tools, add test

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

src/validate_pyproject/cli.py

@@ -101,9 +101,8 @@ def critical_logging():
     ),
     "tool": dict(
         flags=("-t", "--tool"),
-        nargs="+",
+        action="append",
         dest="tool",
-        default=(),
         help="External tools file/url(s) to load, of the form name=URL#path",
     ),
 }
@@ -155,6 +154,7 @@ def parse_args(
     enabled = params.pop("enable", ())
     disabled = params.pop("disable", ())
     params["plugins"] = select_plugins(plugins, enabled, disabled)
+    params["tool"] = params["tool"] or []
     return params_class(**params)  # type: ignore[call-overload]
 
 

src/validate_pyproject/pre_compile/cli.py

@@ -60,9 +60,8 @@ def JSON_dict(name: str, value: str):
     ),
     "tool": dict(
         flags=("-t", "--tool"),
-        nargs="+",
+        action="append",
         dest="tool",
-        default=(),
         help="External tools file/url(s) to load, of the form name=URL#path",
     ),
 }

tests/examples/localtool/localtool.schema.json

@@ -0,0 +1,9 @@
+{
+    "$id": "https://simple-id.example",
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "properties": {
+        "one": { "type": "integer" }
+    },
+    "additionalProperties": false
+}

tests/examples/localtool/nestedtool.schema.json

@@ -0,0 +1,15 @@
+{
+    "$id": "http://nested-id.example",
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "properties": {
+        "nestedtool": {
+            "type": "object",
+            "properties": {
+                "two": { "type": "integer" }
+            },
+            "additionalProperties": false
+        }
+    },
+    "additionalProperties": false
+}

tests/examples/localtool/test_config.json

@@ -0,0 +1,6 @@
+{
+    "tools": {
+        "localtool": "tests/examples/localtool/localtool.schema.json",
+        "nestedtool": "tests/examples/localtool/nestedtool.schema.json#/properties/nestedtool"
+    }
+}

tests/examples/localtool/working.toml

@@ -0,0 +1,5 @@
+[tool.localtool]
+one = 1
+
+[tool.nestedtool]
+two = 2

tests/invalid-examples/localtool/fail1.errors.txt

@@ -0,0 +1 @@
+`tool.localtool.one` must be integer

tests/invalid-examples/localtool/fail1.toml

@@ -0,0 +1,2 @@
+[tool.localtool]
+one = "one"

tests/invalid-examples/localtool/fail2.errors.txt

@@ -0,0 +1 @@
+`tool.nestedtool.two` must be integer

tests/invalid-examples/localtool/fail2.toml

@@ -0,0 +1,2 @@
+[tool.nestedtool]
+two = "two"

tests/invalid-examples/localtool/test_config.json

@@ -0,0 +1,6 @@
+{
+    "tools": {
+        "localtool": "tests/examples/localtool/localtool.schema.json",
+        "nestedtool": "tests/examples/localtool/nestedtool.schema.json#/properties/nestedtool"
+    }
+}

tests/test_cli.py

@@ -9,7 +9,7 @@
 import pytest
 from fastjsonschema import JsonSchemaValueException
 
-from validate_pyproject import cli, plugins
+from validate_pyproject import cli, errors, plugins
 
 
 class TestHelp:
@@ -181,6 +181,15 @@ def test_multiple_files(tmp_path, capsys):
     assert number_invalid == N + 3
 
 
+def test_missing_toolname(tmp_path, capsys):
+    example = write_example(tmp_path, name="valid-pyproject.toml")
+    with pytest.raises(
+        errors.URLMissingTool,
+        match=r"Correct form is '--tool=<tool-name>=http://json\.schemastore\.org/poetry\.toml', with an optional",
+    ):
+        cli.run(["--tool=http://json.schemastore.org/poetry.toml", str(example)])
+
+
 @pytest.mark.skipif(sys.version_info[:2] < (3, 11), reason="requires 3.11+")
 def test_parser_is_tomllib():
     """Make sure Python >= 3.11 uses tomllib instead of tomli"""