Click

CHANGELOG.md

@@ -28,6 +28,7 @@
   but it ensures that PKs cannot be resued. (#143)
 + The REST API for `DataPoint` has been implemented. (#122)
 + Example `docker-compose.yml` file now includes `depends_on`. (#99)
++ Command line stuff is now handled by `click`. (#150)
 
 
 ## 0.5.0 (2019-02-28)

runserver.py

@@ -2,17 +2,47 @@
 import os
 from pathlib import Path
 
+import click
+
+import trendlines.orm as orm
 from trendlines.app_factory import create_app
 
 PORT = 5000
 
-# Load our configuration. We're using pathlib and `.resolve()` because
-# Flask's working dir is src/trendlines and uses that when running
-# `app.config.from_envvar`, so the path it attemps to load is
-# `/proj_folder/src/trendlines/config/localhost.cfg` if `cfg_file` is not
-# absolute.
-cfg_file = Path('./config/localhost.cfg')
-os.environ['TRENDLINES_CONFIG_FILE'] = str(cfg_file.resolve())
 
-app = create_app()
-app.run(debug=True, port=PORT, use_reloader=True)
+def make_db_from_orm():
+    """
+    Make the database directly from the ORM rather than via migrations.
+    """
+    print("making...")
+    orm.db.init("internal.db", pragmas=orm.DB_OPTS)
+    orm.db.connect()
+    orm.db.create_tables([orm.Metric, orm.DataPoint])
+    orm.db.close()
+    print("Done.")
+
+
+def runserver():
+    # Load our configuration. We're using pathlib and `.resolve()` because
+    # Flask's working dir is src/trendlines and uses that when running
+    # `app.config.from_envvar`, so the path it attemps to load is
+    # `/proj_folder/src/trendlines/config/localhost.cfg` if `cfg_file` is not
+    # absolute.
+    cfg_file = Path('./config/localhost.cfg')
+    os.environ['TRENDLINES_CONFIG_FILE'] = str(cfg_file.resolve())
+
+    app = create_app()
+    app.run(debug=True, port=PORT, use_reloader=True)
+
+
+@click.command()
+@click.option("--db-from-orm", is_flag=True)
+def main(db_from_orm):
+    if db_from_orm:
+        make_db_from_orm()
+    else:
+        runserver()
+
+
+if __name__ == "__main__":
+    main()

runworker.py

@@ -5,19 +5,31 @@
 import os
 from pathlib import Path
 
+import click
 from celery.bin import worker
 
 from trendlines.celery_factory import create_celery
 
-# Load our configuration. We're using pathlib and `.resolve()` because
-# Flask's working dir is src/trendlines and uses that when running
-# `app.config.from_envvar`, so the path it attemps to load is
-# `/proj_folder/src/trendlines/config/localhost.cfg` if `cfg_file` is not
-# absolute.
-cfg_file = Path('./config/localhost.cfg')
-os.environ['TRENDLINES_CONFIG_FILE'] = str(cfg_file.resolve())
-
-#  app.worker_main()
-celery = create_celery()
-worker = worker.worker(app=celery)
-worker.run()
+
+def runworker():
+    # Load our configuration. We're using pathlib and `.resolve()` because
+    # Flask's working dir is src/trendlines and uses that when running
+    # `app.config.from_envvar`, so the path it attemps to load is
+    # `/proj_folder/src/trendlines/config/localhost.cfg` if `cfg_file` is not
+    # absolute.
+    cfg_file = Path('./config/localhost.cfg')
+    os.environ['TRENDLINES_CONFIG_FILE'] = str(cfg_file.resolve())
+
+    #  app.worker_main()
+    celery = create_celery()
+    this_worker = worker.worker(app=celery)
+    this_worker.run()
+
+
+@click.command()
+def main():
+    runworker()
+
+
+if __name__ == "__main__":
+    main()