Merge branch 'develop' of github.com:jeffknupp/sandman into develop

scripts/sandmanctl → sandman/sandmanctl.py

@@ -1,17 +1,16 @@
-#! /usr/bin/env python
 """Script to run sandman via command line
 
 Usage:
-    sandmanctl.py [URI]
-    
+    sandmanctl.py URI
+
 Start sandman and connect to database at URI
 
 Supported database dialects:
 
 [PostgreSQL]
 [MySQL]
-[Oracle] 
-[Microsoft SQL Server] 
+[Oracle]
+[Microsoft SQL Server]
 [SQLite]
 [Drizzle]
 [Firebird]
@@ -28,25 +27,19 @@
 
 Options:
     -h --help   Show this screen.
-    
+
 'postgresql+psycopg2://scott:tiger@localhost/test'
 
 """
-
-import argparse
-import os
-import sys
+from __future__ import absolute_import
 
 from docopt import docopt
 
-from sandman import app, db
+from sandman import app
 from sandman.model import activate
 
 def main():
     options = docopt(__doc__)
     app.config['SQLALCHEMY_DATABASE_URI'] = options['URI']
     activate(admin=True)
     app.run('0.0.0.0', debug=True)
-
-if __name__ == '__main__':
-    sys.exit(main())

setup.py

@@ -44,12 +44,17 @@ def run_tests(self):
                       'Flask-SQLAlchemy>=1.0',
                       'SQLAlchemy>=0.8.2',
                       'Flask-Admin>=1.0.6',
+                      'docopt>=0.6.1',
                       ],
     cmdclass={'test': PyTest},
     author_email='jeff@jeffknupp.com',
     description='Automated REST APIs for existing database-driven systems',
     long_description=long_description,
-    scripts=['scripts/sandmanctl'],
+    entry_points={
+        'console_scripts': [
+            'sandmanctl = sandman.sandmanctl:main',
+            ],
+        },
     packages=['sandman', 'sandman.model'],
     include_package_data=True,
     platforms='any',