Merge pull request #17 from al4/versionOne

Version 0.1.0

Vagrantfile

@@ -76,7 +76,7 @@ Vagrant.configure(2) do |config|
         | sudo -u postgres -i psql
 
     # Build tools
-    sudo apt-get -y install build-essential git-buildpackage debhelper python-dev
+    sudo apt-get -y install build-essential git-buildpackage debhelper python-dev dh-systemd
 
     sudo pip install --upgrade pip
     sudo pip install sphinx sphinxcontrib-httpdomain

bin/orlo

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-/usr/share/python/python-orlo/bin/python /usr/share/python/python-orlo/lib/python2.7/site-packages/orlo/cli.py $@
+/usr/share/python/orlo/bin/python /usr/share/python/orlo/lib/python2.7/site-packages/orlo/cli.py $@
 
 

debian/control

@@ -1,11 +1,11 @@
-Source: python-orlo
+Source: orlo
 Section: python
 Priority: extra
 Maintainer: Alex Forbes <[email protected]>
-Build-Depends: debhelper (>= 9), python, dh-virtualenv, gcc, python-dev, postgresql-server-dev-all
+Build-Depends: debhelper (>= 9), python, dh-virtualenv, gcc, python-dev, postgresql-server-dev-all, dh-systemd
 Standards-Version: 3.9.5
 
-Package: python-orlo
+Package: orlo
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
 Description: An API for tracking deployments, written with Python, Flask and SqlAlchemy.

debian/dirs

@@ -0,0 +1 @@
+/var/log/orlo

debian/install

@@ -1 +1,3 @@
 bin/orlo usr/bin
+etc/orlo.ini /etc/orlo
+systemd/orlo.service /lib/systemd/system

debian/preinst

@@ -1,11 +1,13 @@
 #!/bin/bash
 
+set -ue
+
 if grep -q "^orlo" /etc/passwd; then
     :
 else
     useradd orlo -s /bin/false -U
 fi
 
-mkdir -p /var/lib/orlo
-chown orlo:orlo /var/lib/orlo
-chmod 755 /var/lib/orlo
+mkdir -p /var/{lib,log}/orlo
+chown orlo:orlo /var/{lib,log}/orlo
+chmod 755 /var/{lib,log}/orlo

debian/rules

@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python-virtualenv
+	dh $@ --with systemd --with python-virtualenv
+
+override_dh_virtualenv:
+	dh_virtualenv --no-test

docs/install.rst

@@ -80,7 +80,7 @@ From the psql prompt:
     CREATE DATABASE
     postgres=#
 
-Update uri under [db] in orlo.conf, e.g.
+Update uri under [db] in orlo.ini, e.g.
 
 ::
 
@@ -96,7 +96,7 @@ Create a directory for the db, e.g. :
     mkdir /var/lib/orlo
     chown orlo:root /var/lib/orlo
 
-Update the uri under [db] in orlo.conf to point to a file in this directory:
+Update the uri under [db] in orlo.ini to point to a file in this directory:
 
 ::
 

etc/orlo.ini

@@ -0,0 +1,11 @@
+[db]
+uri = sqlite://
+
+[main]
+time_zone = UTC
+propagate_exceptions = true
+time_format = %Y-%m-%dT%H:%M:%SZ
+
+[logging]
+file = /var/log/orlo/app.log
+debug = false

orlo/cli.py

@@ -15,7 +15,7 @@ def parse_args():
 
     p_config = argparse.ArgumentParser(add_help=False)
     p_config.add_argument('--file', '-f', dest='filepath', help="File to write to",
-                          default='/etc/orlo.conf')
+                          default='/etc/orlo/orlo.ini')
 
     p_database = argparse.ArgumentParser(add_help=False)
     p_server = argparse.ArgumentParser(add_help=False)
@@ -54,7 +54,7 @@ def setup_database(args):
     if config.get('db', 'uri') == 'sqlite://':
         print("Warning: setting up in-memory database, this is "
               "probably not what you want!\n"
-              "Please configure db:uri in /etc/orlo.conf")
+              "Please configure db:uri in /etc/orlo/orlo.ini")
     db.create_all()
 
 

orlo/config.py

@@ -18,4 +18,4 @@
 config.set('logging', 'debug', 'false')
 config.set('logging', 'file', 'disabled')
 
-config.read('/etc/orlo.conf')
+config.read('/etc/orlo/orlo.ini')

orlo/error_handlers.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 from flask import jsonify, request
 from orlo import app
-from orlo.exceptions import InvalidUsage
+from orlo.exceptions import InvalidUsage, OrloError
 
 __author__ = 'alforbes'
 
@@ -12,6 +12,7 @@ def page_not_found(error):
     return jsonify(d), 404
 
 
+@app.errorhandler(OrloError)
 @app.errorhandler(InvalidUsage)
 def handle_invalid_usage(error):
     response = jsonify(error.to_dict())
@@ -25,3 +26,4 @@ def handle_400(error):
     response.status_code = error.status_code
     return response
 
+

orlo/exceptions.py

@@ -4,6 +4,7 @@
 
 
 class OrloError(Exception):
+    status_code = 500
     def __init__(self, message, status_code=None, payload=None):
         Exception.__init__(self)
         self.message = message