Added support for v2 and v3

Author: venthur

openapi_spec_validator/__main__.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-from openapi_spec_validator import validate_spec_url
+from openapi_spec_validator import validate_spec_url, validate_v2_spec_url
 from openapi_spec_validator.exceptions import ValidationError
 
 logger = logging.getLogger(__name__)
@@ -16,11 +16,24 @@
 def main(args=None):
     parser = argparse.ArgumentParser()
     parser.add_argument('filename', help="Absolute or relative path to file")
+    parser.add_argument(
+        '--schema',
+        help="OpenAPI schema (default: 3.0.0)",
+        type=str,
+        choices=['2.0', '3.0.0'],
+        default='3.0.0'
+    )
     args = parser.parse_args(args)
     filename = args.filename
     filename = os.path.abspath(filename)
+    # choose the validator
+    if args.schema == '2.0':
+        validate_url = validate_v2_spec_url
+    elif args.schema == '3.0.0':
+        validate_url = validate_spec_url
+    # validate
     try:
-        validate_spec_url('file://'+filename)
+        validate_url('file://'+filename)
     except ValidationError as e:
         print(e)
         sys.exit(1)

tests/integration/test_main.py

@@ -3,12 +3,31 @@
 from openapi_spec_validator.__main__ import main
 
 
-def test_happy_path():
-    """No errors when calling with proper file."""
+def test_schema_default():
+    """Test default schema is 3.0.0"""
     testargs = ['./tests/integration/data/v3.0/petstore.yaml']
     main(testargs)
 
 
+def test_schema_v3():
+    """No errors when calling proper v3 file."""
+    testargs = ['--schema',  '3.0.0', './tests/integration/data/v3.0/petstore.yaml']
+    main(testargs)
+
+
+def test_schema_v2():
+    """No errors when calling with proper v2 file."""
+    testargs = ['--schema', '2.0', './tests/integration/data/v2.0/petstore.yaml']
+    main(testargs)
+
+
+def test_schema_unknown():
+    """Errors on running with unknown schema."""
+    testargs = ['--schema', 'x.x', './tests/integration/data/v2.0/petstore.yaml']
+    with pytest.raises(SystemExit):
+        main(testargs)
+
+
 def test_nonexisting_file():
     """Calling with non-existing file should sys.exit."""
     testargs = ['i_dont_exist.yaml']