Start fixing CircleCI config

Adds first test.  Progress for #3

Author: dbanty

.circleci/config.yml

@@ -8,31 +8,22 @@ jobs:
         keys:
         - v1-dependencies-{{ checksum "poetry.lock" }}
     - run:
-        command: 'pip install poetry --user --upgrade
-
+        name: install dependencies
+        command: |
+          pip install poetry --user --upgrade
           poetry config virtualenvs.in-project true
-
-          poetry config repositories.triaxtec https://pypi.fury.io/triaxtec/
-
-          poetry config http-basic.triaxtec $GEMFURY_PULL_TOKEN $GEMFURY_PULL_TOKEN
-
           poetry install
 
-          '
-        name: install dependencies
     - run:
-        command: 'mkdir -p test-reports/safety test-reports/mypy test-reports/pytest
-
-          poetry run black . --check
-
-          poetry run safety check --json > test-reports/safety/results.json
-
-          poetry run mypy openapi_python_client --junit-xml=test-reports/mypy/results.xml
-
-          poetry run pytest --junitxml=test-reports/pytest/results.xml
-
-          '
         name: run tests
+        command: |
+          mkdir -p test-reports/safety test-reports/mypy test-reports/pytest
+          poetry shell
+          black . --check
+          isort
+          safety check --json > test-reports/safety/results.json
+          mypy openapi_python_client --junit-xml=test-reports/mypy/results.xml
+          pytest --junitxml=test-reports/pytest/results.xml
     - store_test_results:
         path: test-reports
     - run:

openapi_python_client/__init__.py

@@ -1,6 +1,6 @@
 """ Generate modern Python clients from OpenAPI """
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any, Dict, Optional
 
 import orjson
 import requests
@@ -9,24 +9,24 @@
 from .openapi_parser import OpenAPI, import_string_from_reference
 
 
-def main(url: str) -> None:
+def main(*, url: Optional[str], path: Optional[str]) -> None:
     """ Generate the client library """
-    json = _get_json(url)
-    data_dict = _parse_json(json)
+    data_dict = _get_json(url=url, path=path)
     openapi = OpenAPI.from_dict(data_dict)
-    _build_project(openapi)
+    _build_project(openapi=openapi)
 
 
-def _get_json(url: str) -> bytes:
-    response = requests.get(url)
-    return response.content
+def _get_json(*, url: Optional[str], path: Optional[str]) -> Dict[str, Any]:
+    json_bytes: bytes
+    if url:
+        response = requests.get(url)
+        json_bytes = response.content
+    else:
+        json_bytes = Path(path).read_bytes()
+    return orjson.loads(json_bytes)
 
 
-def _parse_json(json: bytes) -> Dict[str, Any]:
-    return orjson.loads(json)
-
-
-def _build_project(openapi: OpenAPI) -> None:
+def _build_project(*, openapi: OpenAPI) -> None:
     env = Environment(loader=PackageLoader(__package__), trim_blocks=True, lstrip_blocks=True)
 
     # Create output directories

openapi_python_client/cli.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import click
 
 from . import main
@@ -10,7 +12,11 @@ def cli():
 
 
 @cli.command()
-@click.option("--url", required=True, help="The URL to the openapi.json file")
-def generate(url: str):
+@click.option("--url", help="The URL to the openapi.json file")
+@click.option("--path", help="The path to the openapi.json file")
+def generate(url: Optional[str], path: Optional[str]):
     """ Generate a new OpenAPI Client library """
-    main(url=url)
+    if not url and not path:
+        print("You must either provide --url or --path")
+        exit(1)
+    main(url=url, path=path)

tests/__init__.py

@@ -0,0 +1,15 @@
+def test_main(mocker):
+    data_dict = mocker.MagicMock()
+    _get_json = mocker.patch("openapi_python_client._get_json", return_value=data_dict)
+    openapi = mocker.MagicMock()
+    from_dict = mocker.patch("openapi_python_client.openapi_parser.OpenAPI.from_dict", return_value=openapi)
+    _build_project = mocker.patch("openapi_python_client._build_project")
+    url = mocker.MagicMock()
+    path = mocker.MagicMock()
+
+    from openapi_python_client import main
+    main(url=url, path=path)
+
+    _get_json.assert_called_once_with(url=url, path=path)
+    from_dict.assert_called_once_with(data_dict)
+    _build_project.assert_called_once_with(openapi=openapi)