add cmdline argument handling (inc. interactive run)

thomasballinger · thomasballinger · commit 5620fd276174 · 2013-10-18T12:47:31.000-04:00
--HG--
branch : scroll-frontend
diff --git a/bpython/scroll.py b/bpython/scroll.py
@@ -1,20 +1,46 @@
+import sys
+
 from fmtstr.terminal import Terminal
 from fmtstr.terminalcontrol import TerminalController
 
 from bpython.scrollfrontend.repl import Repl
+import bpython.args
 
-import sys
 if '-v' in sys.argv:
     import logging
     logging.basicConfig(filename='scroll.log', level=logging.DEBUG)
+    sys.argv.remove('-v')
+
+def cli():
+    config, options, exec_args = bpython.args.parse(sys.argv[1:])
+    return main(config=config, options=options, exec_args=exec_args)
+
+def main(locals_=None, config=None, exec_args=None, options=None):
+    #TODO this is gross - passing in args and options means you can't
+    # easily have that functionality without running it frmo the command line,
+    # but it makes reusing bpython code easier
 
-def main():
     with TerminalController() as tc:
         with Terminal(tc, keep_last_line=True, hide_cursor=False) as term:
-            with Repl() as repl:
+            with Repl(config=config, locals_=locals_) as repl:
                 rows, columns = tc.get_screen_size()
                 repl.width = columns
                 repl.height = rows
+
+                exit_value = 0
+                if exec_args:
+                    assert options, "don't pass in exec_args without options"
+                    try:
+                        #TODO replace this so that stdout is properly harvested for display!
+                        bpython.args.exec_code(repl.interp, exec_args)
+                    except SystemExit:
+                        pass
+                    if not options.interactive:
+                        #TODO treat this properly: no prompt should ever display, but stdout should!
+                        array, cursor_pos = repl.paint(about_to_exit=True)
+                        term.render_to_terminal(array, cursor_pos)
+                        raise SystemExit(exit_value)
+
                 while True:
                     try:
                         repl.process_event(tc.get_event())
@@ -28,4 +54,4 @@ def main():
                         repl.scroll_offset += scrolled
 
 if __name__ == '__main__':
-    main()
+    cli()
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -137,12 +137,14 @@ class Repl(BpythonRepl):
     """
 
     ## initialization, cleanup
-    def __init__(self):
+    def __init__(self, locals_=None, config=None):
         logging.debug("starting init")
-        interp = code.InteractiveInterpreter()
+        interp = code.InteractiveInterpreter(locals=locals_)
+
+        if config is None:
+            config = Struct()
+            loadini(config, default_config_path())
 
-        config = Struct()
-        loadini(config, default_config_path())
         config.autocomplete_mode = SIMPLE # only one implemented currently
 
         if config.cli_suggestion_width <= 0 or config.cli_suggestion_width > 1:
diff --git a/data/bpython-scroll b/data/bpython-scroll
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 import sys
-from bpython.scroll import main
+from bpython.scroll import cli
 
-sys.exit(main())
+sys.exit(cli())
