Merge remote-tracking branch 'origin/master' into is315

[mediagoblin.git] / mediagoblin / gmg_commands / shell.py

diff --git a/mediagoblin/gmg_commands/shell.py b/mediagoblin/gmg_commands/shell.py
index 5e70d5560bf0b48fa0f602bbcd9e8f76f1772f99..dc1621d1f62a800d1c0a2fec1d9ab012d48a1511 100644 (file)
--- a/mediagoblin/gmg_commands/shell.py
+++ b/mediagoblin/gmg_commands/shell.py
@@ -16,21 +16,15 @@
 
 
 import code
-import os
 
-from paste.deploy.loadwsgi import NicerConfigParser
-
-from mediagoblin import app
-from mediagoblin import globals as mgoblin_globals
+from mediagoblin import mg_globals
+from mediagoblin.gmg_commands import util as commands_util
 
 
 def shell_parser_setup(subparser):
     subparser.add_argument(
         '-cf', '--conf_file', default='mediagoblin.ini',
         help="Config file used to set up environment")
-    subparser.add_argument(
-        '-cs', '--app_section', default='app:mediagoblin',
-        help="Section of the config file where the app config is stored.")
 
 
 SHELL_BANNER = """\
@@ -38,33 +32,20 @@ GNU MediaGoblin shell!
 ----------------------
 Available vars:
  - mgoblin_app: instantiated mediagoblin application
- - mgoblin_globals: mediagoblin.globals
+ - mg_globals: mediagoblin.globals
  - db: database instance
 """
 
 
 def shell(args):
     """
+    Setup a shell for the user
     """
-    # Duplicated from from_celery.py, remove when we have the generic util
-    parser = NicerConfigParser(args.conf_file)
-    parser.read(args.conf_file)
-    parser._defaults.setdefault(
-        'here', os.path.dirname(os.path.abspath(args.conf_file)))
-    parser._defaults.setdefault(
-        '__file__', os.path.abspath(args.conf_file))
-
-    mgoblin_section = dict(parser.items(args.app_section))
-    mgoblin_conf = dict(
-        [(section_name, dict(parser.items(section_name)))
-         for section_name in parser.sections()])
-
-    mgoblin_app = app.paste_app_factory(
-        mgoblin_conf, **mgoblin_section)
+    mgoblin_app = commands_util.setup_app(args)
 
     code.interact(
         banner=SHELL_BANNER,
         local={
             'mgoblin_app': mgoblin_app,
-            'mgoblin_globals': mgoblin_globals,
-            'db': mgoblin_globals.database})
+            'mg_globals': mg_globals,
+            'db': mg_globals.database})