Move nilmtool into a dedicated nilmdb.scripts module

.coveragerc

@@ -7,4 +7,4 @@
 exclude_lines =
 	pragma: no cover
 	if 0:
-omit = nilmdb/utils/datetime_tz*
+omit = nilmdb/utils/datetime_tz*,nilmdb/scripts

nilmdb/cmdline/__init__.py

@@ -1,3 +1,3 @@
 """nilmdb.cmdline"""
 
-from nilmdb.cmdline.cmdline import Cmdline, main
+from nilmdb.cmdline.cmdline import Cmdline

nilmdb/cmdline/cmdline.py

@@ -154,7 +154,3 @@ class Cmdline(object):
 
         self.client.close()
         sys.exit(retval)
-
-# Entry point for the "nilmtool" script
-def main(): # pragma: no cover
-    nilmdb.cmdline.Cmdline().run()

nilmdb/scripts/__init__.py

@@ -0,0 +1 @@
+# Command line scripts

nilmdb/scripts/nilmtool.py

@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+import nilmdb.cmdline
+
+def main():
+    """Main entry point for the 'nilmtool' command line script"""
+    nilmdb.cmdline.Cmdline().run()
+
+if __name__ == "__main__":
+    main()

setup.py

@@ -43,10 +43,11 @@ setup(name='nilmdb',
                    'nilmdb.server',
                    'nilmdb.client',
                    'nilmdb.cmdline',
+                   'nilmdb.scripts',
                    ],
       entry_points = {
           'console_scripts': [
-              'nilmtool = nilmdb.cmdline:main',
+              'nilmtool = nilmdb.scripts.nilmtool:main',
               ],
           },
       ext_modules = cython_modules,