Merge pull request #24 from mittel-labs/fix/improve-cli

fixing cli on REPL mode

Author: fmamud

src/bibleit/__main__.py

@@ -1,5 +1,5 @@
-from bibleit.command import args as bargs
-from bibleit import repl
+from bibleit.command import args as bargs, set
+from bibleit import repl, context, config
 
 _FLAG_PREFIX = "flag_"
 
@@ -16,24 +16,22 @@ def get_active_flags(ctx):
             yield flag
 
 
-if args.repl:
-    repl.run()
-else:
-    if args.args:
-        from bibleit import context, config
-        from bibleit.command import set
-
-        for flag in get_active_flags(args):
-            config.set_flag(flag, True)
+ctx = context.Context()
 
-        ctx = context.Context()
+if args.bible:
+    set.bible(ctx, ",".join(args.bible))
 
-        if args.bible:
-            set.bible(ctx, ",".join(args.bible))
+if args.linesep is not None:
+    set.linesep(ctx, str(args.linesep))
 
-        if args.linesep is not None:
-            set.linesep(ctx, str(args.linesep))
+for flag in get_active_flags(args):
+    config.set_flag(flag, True)
 
+if args.repl:
+    ctx.__main__ = "__main__"
+    repl.run(ctx)
+else:
+    if args.args:
         repl.eval(ctx, " ".join(args.args))
     else:
         bargs.parser.print_help()

src/bibleit/repl.py

@@ -63,7 +63,7 @@ def eval(ctx, target=None):
             sys.exit(0)
 
 
-def run():
+def run(ctx=None):
     print(config.welcome)
 
     ac = AutoCompleter()
@@ -73,8 +73,9 @@ def run():
     readline.set_completer_delims(" \t\n;")
     readline.parse_and_bind("tab: complete")
 
-    ctx = Context()
-    ctx.__main__ = __name__
+    if ctx is None:
+        ctx = Context()
+        ctx.__main__ = __name__
 
     eval(ctx)