Cli conversion (fix #189)

.gitignore

@@ -63,3 +63,6 @@ GeoHealthCheck.conf
 
 # Data
 GeoHealthCheck/data.db
+
+# IDE
+.idea

.travis.yml

@@ -6,17 +6,18 @@ python:
 sudo: false
 
 install:
-  - pip install -r requirements.txt
+  - pip install -e .
   - pip install -r requirements-dev.txt
-  - paver setup
+  - geohc create-instance
 
 script:
-  - echo -e "admin\ntest\ntest\nyou@example.com\nyou@example.com" | python GeoHealthCheck/models.py create
+  - geohc db create
+  - geohc db adduser -u admin -p test -e you@example.com -r admin
   - flake8
-  - python GeoHealthCheck/models.py load tests/data/fixtures.json y
-  - python GeoHealthCheck/healthcheck.py
-  - python tests/run_tests.py
+  - geohc db load -f tests/data/fixtures.json -y
+  - geohc run-healthchecks
+  - geohc run-tests
   - cd docs && make html
 
 after-script:
-  - python GeoHealthCheck/models.py drop
+  - geohc db drop

Dockerfile

@@ -45,22 +45,22 @@ ENV LC_ALL="en_US.UTF-8" \
 	GHC_SMTP_PASSWORD=None \
 	GHC_METADATA_CACHE_SECS=900 \
     \
-# WSGI server settings, assumed is gunicorn  \
-HOST=0.0.0.0 \
-PORT=80 \
-WSGI_WORKERS=4 \
-WSGI_WORKER_TIMEOUT=6000 \
-WSGI_WORKER_CLASS='eventlet' \
-\
-# GHC Core Plugins modules and/or classes, seldom needed to set:  \
-# if not specified here or in Container environment  \
-# all GHC built-in Plugins will be active.  \
-#ENV GHC_PLUGINS 'GeoHealthCheck.plugins.probe.owsgetcaps,\
-#        GeoHealthCheck.plugins.probe.wms, ...., ...\
-#        GeoHealthCheck.plugins.check.checks' \
-\
-# GHC User Plugins, best be overridden via Container environment \
-GHC_USER_PLUGINS=''
+    # WSGI server settings, assumed is gunicorn  \
+    HOST=0.0.0.0 \
+    PORT=80 \
+    WSGI_WORKERS=4 \
+    WSGI_WORKER_TIMEOUT=6000 \
+    WSGI_WORKER_CLASS='eventlet' \
+    \
+    # GHC Core Plugins modules and/or classes, seldom needed to set:  \
+    # if not specified here or in Container environment  \
+    # all GHC built-in Plugins will be active.  \
+    #ENV GHC_PLUGINS 'GeoHealthCheck.plugins.probe.owsgetcaps,\
+    #        GeoHealthCheck.plugins.probe.wms, ...., ...\
+    #        GeoHealthCheck.plugins.check.checks' \
+    \
+    # GHC User Plugins, best be overridden via Container environment \
+    GHC_USER_PLUGINS=''
 
 RUN apk add --no-cache --virtual .build-deps gcc build-base libxslt-dev libxml2-dev linux-headers postgresql-dev \
     && apk add --no-cache bash postgresql-client libxslt libxml2 tzdata openntpd python3 python3-dev \

GeoHealthCheck/__init__.py

@@ -27,12 +27,4 @@
 #
 # =================================================================
 
-from util import read
-
-
-def get_package_version(file_):
-    """get version from top-level package init"""
-    return read(file_)
-
-
-__version__ = get_package_version('../VERSION')
+__version__ = '0.8.dev0'

GeoHealthCheck/app.py

@@ -42,14 +42,15 @@
 from flask_migrate import Migrate
 from itertools import chain
 
-import views
-from __init__ import __version__
-from enums import RESOURCE_TYPES
-from factory import Factory
-from init import App
-from models import Resource, Run, ProbeVars, CheckVars, Tag, User, Recipient
-from resourceauth import ResourceAuth
-from util import send_email, geocode, format_checked_datetime, \
+from GeoHealthCheck import views
+from GeoHealthCheck.__init__ import __version__
+from GeoHealthCheck.enums import RESOURCE_TYPES
+from GeoHealthCheck.factory import Factory
+from GeoHealthCheck.init import App
+from GeoHealthCheck.models import Resource, Run, ProbeVars, CheckVars, Tag, \
+    User, Recipient
+from GeoHealthCheck.resourceauth import ResourceAuth
+from GeoHealthCheck.util import send_email, geocode, format_checked_datetime, \
     format_run_status, format_obj_value
 
 # Module globals for convenience
@@ -76,7 +77,7 @@
 # Should GHC Runner be run within GHC webapp?
 if CONFIG['GHC_RUNNER_IN_WEBAPP'] is True:
     LOGGER.info('Running GHC Scheduler in WebApp')
-    from scheduler import start_schedule
+    from GeoHealthCheck.scheduler import start_schedule
 
     # Start scheduler
     start_schedule()
@@ -531,7 +532,8 @@ def add():
     url = request.form['url'].strip()
     resources_to_add = []
 
-    from healthcheck import sniff_test_resource, run_test_resource
+    from GeoHealthCheck.healthcheck import sniff_test_resource, \
+        run_test_resource
     sniffed_resources = sniff_test_resource(CONFIG, resource_type, url)
 
     if not sniffed_resources:
@@ -734,7 +736,7 @@ def test(resource_identifier):
         flash(gettext('Resource not found'), 'danger')
         return redirect(request.referrer)
 
-    from healthcheck import run_test_resource
+    from GeoHealthCheck.healthcheck import run_test_resource
     result = run_test_resource(
         resource)
 

GeoHealthCheck/check.py

@@ -1,5 +1,5 @@
-from plugin import Plugin
-from result import CheckResult
+from GeoHealthCheck.plugin import Plugin
+from GeoHealthCheck.result import CheckResult
 
 
 class Check(Plugin):