Merge pull request #32 from nephila/feature/fix_args

Fix arguments handling

djangocms_helper/main.py

@@ -335,6 +335,9 @@ def main(argv=sys.argv):  # pragma: no cover
             if argv[2] == 'help':
                 raise
             args = docopt(__doc__, argv[1:3], version=application_module.__version__)
+        args['--cms'] = '--cms' in argv
+        if '--extra-settings' in argv:
+            args['--extra-settings'] = argv['--extra-settings']
         args['options'] = [argv[0]] + argv[2:]
         if args['test'] and '--native' in args['options']:
             args['test'] = False

djangocms_helper/runner.py

@@ -12,12 +12,12 @@ def run(app, argv=sys.argv):
 
     :param app: application
     """
-    if len(argv) == 1:
-        # test argument is given if not argument is passed
-        argv.append('test')
-    if app not in argv:
+    if app not in argv[:2]:
         # app is automatically added if not present
         argv.insert(1, app)
+    if len(argv) < 3 and 'test' not in argv[:2]:
+        # test argument is given if not argument is passed
+        argv.insert(2, 'test')
     runner(argv)
 
 
@@ -31,15 +31,15 @@ def cms(app, argv=sys.argv):
         import cms  # NOQA
     except ImportError:
         print(u"runner.cms is available only if django CMS is installed")
-    if len(argv) == 1:
-        # test argument is given if not argument is passed
-        argv.append('test')
-    if app not in argv:
+    if app not in argv[:2]:
         # app is automatically added if not present
         argv.insert(1, app)
+    if len(argv) < 3 and 'test' not in argv[:2]:
+        # test argument is given if not argument is passed
+        argv.insert(2, 'test')
     if '--cms' not in argv:
         # this is the cms runner, just add the cms argument
-        argv.insert(2, '--cms')
+        argv.append('--cms')
     runner(argv)
 
 

djangocms_helper/utils.py

@@ -151,7 +151,7 @@ def _make_settings(args, application, settings, STATIC_ROOT, MEDIA_ROOT):
         extra_settings = load_from_file(extra_settings_file).HELPER_SETTINGS
     except (IOError, AttributeError):
         extra_settings = None
-    default_name = ':memory:' if not args['server'] else 'local.sqlite'
+    default_name = ':memory:' if args['test'] else 'local.sqlite'
     db_url = os.environ.get("DATABASE_URL", "sqlite://localhost/%s" % default_name)
     migrate = args.get('--migrate', False)
     configs = {