Add the specified base-uri function in the CLI

Author: willson-chen

jsonschema/cli.py

@@ -181,11 +181,10 @@ def _namedAnyWithDefault(name):
 )
 parser.add_argument(
     "--base-uri",
-    action="store_true",
     help="""
         use this option to indicate that the schema contains some references
-        to some local files. With this option, the validator will try to
-        resolve those references as paths relative to the given schema.
+        to some local or remote files. With this option, the validator will 
+        try to resolve those references as paths relative to the given schema.
     """,
 )
 parser.add_argument(
@@ -261,15 +260,21 @@ def load(_):
                 raise _CannotLoadFile()
         instances = ["<stdin>"]
 
-    if arguments["base_uri"]:
-        file_prefix = "file:///{}/" if "nt" == os.name else "file://{}/"
-        schema_dirname = os.path.dirname(arguments["schema"])
+    if arguments["base_uri"] is None:
+        resolver = None
+    elif "http:" in arguments["base_uri"] or "https:" in arguments["base_uri"]\
+            or "urn:" in arguments["base_uri"]:
         resolver = RefResolver(
-            base_uri=file_prefix.format(os.path.abspath(schema_dirname)),
+            base_uri=arguments["base_uri"],
             referrer=schema,
         )
     else:
-        resolver = None
+        file_prefix = "file:///{}/" if "nt" == os.name else "file://{}/"
+        resolver = RefResolver(
+            base_uri=file_prefix.format(os.path.abspath(arguments["base_uri"])),
+            referrer=schema,
+        )
+
     validator = arguments["validator"](schema, resolver=resolver)
     exit_code = 0
     for each in instances:

jsonschema/tests/test_cli.py

@@ -7,6 +7,7 @@
 import os
 import subprocess
 import sys
+import tempfile
 
 from jsonschema import Draft4Validator, cli, __version__
 from jsonschema.exceptions import SchemaError, ValidationError
@@ -684,21 +685,30 @@ def test_successful_validation__of_just_the_schema_pretty_output(self):
         )
 
     def test_successful_validation_with_specifying_base_uri(self):
-        schema = """\
-                {"type": "object", "properties": {"KEY1":
-                {"$ref": "schema.json#definitions/schemas"}},
-                "definitions": {"schemas": {"type": "string"}}}
-                """
-        fp = open("schema.json", "w+")
-        fp.write(schema)
-        fp.close()
+        try:
+            schema_file = tempfile.NamedTemporaryFile(
+                mode='w+',
+                prefix='schema',
+                suffix='.json',
+                dir='..',
+                delete=False
+            )
+            self.addCleanup(os.remove, schema_file.name)
+            schema = """
+                    {"type": "object", "properties": {"KEY1":
+                    {"$ref": %s%s#definitions/schemas"}},
+                    "definitions": {"schemas": {"type": "string"}}}
+                    """ % ("\"", os.path.basename(schema_file.name))
+            schema_file.write(schema)
+        finally:
+            schema_file.close()
+
         self.assertOutputs(
             files=dict(some_schema=schema, some_instance='{"KEY1": "1"}'),
-            argv=["-i", "some_instance", "--base-uri", "some_schema"],
+            argv=["-i", "some_instance", "--base-uri", "..", "some_schema"],
             stdout="",
             stderr="",
         )
-        os.remove("schema.json")
 
     def test_real_validator(self):
         self.assertOutputs(