Merge branch 'master' of github.com:redshodan/unsonic into docker

* 'master' of github.com:redshodan/unsonic:
  0.1b7 release
  Removed unsonic version of sync, let mishmash sync itself. all unsonic commands make sure alembic is run.
  Make the serve command not load the db and take extra loading time.

unsonic/commands/__init__.py

@@ -1,8 +1,8 @@
 # flake8: noqa: F401
 
-import mishmash.commands
+from nicfit.command import register
+from mishmash.core import Command
 
-from . import sync
 from .adduser import AddUser
 from .deluser import DelUser
 from .listusers import ListUsers

unsonic/commands/adduser.py

@@ -1,13 +1,11 @@
 import argparse
 
-from nicfit import command
-from mishmash.core import Command
-
+from . import Command, register
 from .. import models, auth
-from ..models import User
+from ..models import User, initAlembic
 
 
-@command.register
+@register
 class AddUser(Command):
     NAME = "adduser"
     HELP = "Add a user to the database."
@@ -21,6 +19,8 @@ def _initArgParser(self, parser):
 
 
     def _run(self, args=None):
+        initAlembic()
+
         args = args or self.args
 
         if len(args.roles):

unsonic/commands/deluser.py

@@ -1,10 +1,8 @@
-from nicfit import command
-from mishmash.core import Command
+from . import Command, register
+from ..models import User, initAlembic
 
-from ..models import User
 
-
-@command.register
+@register
 class DelUser(Command):
     NAME = "deluser"
     HELP = "Delete a user from the database."
@@ -15,6 +13,8 @@ def _initArgParser(self, parser):
 
 
     def _run(self, args=None):
+        initAlembic()
+
         args = args or self.args
 
         res = self.db_session.query(User).filter(User.name == args.username[0])

unsonic/commands/listusers.py

@@ -1,19 +1,19 @@
-from nicfit import command
-from mishmash.core import Command
+from . import Command, register
+from ..models import listUsers, initAlembic
 
-from .. import models
 
-
-@command.register
+@register
 class ListUsers(Command):
     NAME = "listusers"
     HELP = "List users in the database"
 
 
     def _run(self, args=None):
+        initAlembic()
+
         args = args or self.args
 
         print("Users:")
-        for uname, roles in models.listUsers(self.db_session):
+        for uname, roles in listUsers(self.db_session):
             print("   %s:  roles: %s" % (uname, ", ".join(roles)))
         return 0

unsonic/commands/password.py

@@ -1,10 +1,8 @@
-from nicfit import command
-from mishmash.core import Command
+from . import Command, register
+from ..models import setUserPassword, initAlembic
 
-from .. import models
 
-
-@command.register
+@register
 class Password(Command):
     NAME = "password"
     HELP = "Change a users password."
@@ -17,7 +15,7 @@ def _initArgParser(self, parser):
 
     def _run(self, args=None):
         args = args or self.args
-        if models.setUserPassword(self.db_session, args.username[0],
+        if setUserPassword(self.db_session, args.username[0],
                                   args.password[0]):
             print("Password set for '%s'." % args.username[0])
             return 0

unsonic/commands/serve.py

@@ -3,11 +3,10 @@
 import argparse
 import shutil
 
-from nicfit import command
-from mishmash.core import Command
+from . import Command, register
 
 
-@command.register
+@register
 class Serve(Command):
     NAME = "serve"
     HELP = "Run the unsonic web interface using the Pyramid pserve script."
@@ -19,11 +18,10 @@ def _initArgParser(self, parser):
                                  "any pserve arguments.")
 
 
-    def _run(self, args=None):
-        args = args or self.args
+    def run(self, args, config):
         pargs = args.pserve_args
 
-        if not self.config.filename:
+        if not config.filename:
             print("No config file specified. Must specify a config file.")
             sys.exit(-1)
 
@@ -40,6 +38,6 @@ def _run(self, args=None):
         if len(pargs) and pargs[0] == "--":
             pargs = pargs[1:]
         argv.extend(pargs)
-        argv.append(str(self.config.filename))
+        argv.append(str(config.filename))
         print(" ".join(argv))
         os.execv(path, argv)

unsonic/version.py

@@ -1,3 +1,3 @@
-VERSION = "0.1b6"
+VERSION = "0.1b7"
 UNSONIC_PROTOCOL_VERSION = "0.1"
 PROTOCOL_VERSION = "1.14.0"