Merge pull request #201 from gdubicki/pql

Add PQL support, refactor and reorganize code

Author: bastelfreak

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
           pip install -r requirements-test.txt
       - name: Test
         run: |
-          pytest --pep8 --mypy --strict
+          pytest --pep8 --strict
       - name: Run coveralls
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CONTRIBUTING.md

@@ -44,7 +44,7 @@ do this to run the tests:
 
 ```bash
 # Unit tests
-py.test
+py.test --pep8 --strict
 # Security linter
 bandit -r pypuppetdb
 ```

conftest.py

@@ -4,13 +4,13 @@
 
 # Set up our API objects
 @pytest.fixture
-def baseapi():
-    return pypuppetdb.api.BaseAPI()
+def api():
+    return pypuppetdb.api.API()
 
 
 @pytest.fixture
-def token_baseapi():
-    return pypuppetdb.api.BaseAPI(token='tokenstring')
+def token_api():
+    return pypuppetdb.api.API(token='tokenstring')
 
 
 @pytest.fixture

pypuppetdb/__init__.py

@@ -58,7 +58,7 @@
 """
 import logging
 
-from pypuppetdb.api import BaseAPI
+from pypuppetdb.api import API
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
@@ -109,7 +109,7 @@ def connect(host='localhost', port=8080, ssl_verify=False, ssl_key=None,
     :param token: (optional) The x-auth token to use for X-Authentication
     :type token: :obj:`None` or :obj:`string`
     """
-    return BaseAPI(host=host, port=port,
-                   timeout=timeout, ssl_verify=ssl_verify, ssl_key=ssl_key,
-                   ssl_cert=ssl_cert, protocol=protocol, url_path=url_path,
-                   username=username, password=password, token=token)
+    return API(host=host, port=port,
+               timeout=timeout, ssl_verify=ssl_verify, ssl_key=ssl_key,
+               ssl_cert=ssl_cert, protocol=protocol, url_path=url_path,
+               username=username, password=password, token=token)