Refactor bootstrap and support -m to execute a module

Author: vallsv

bootstrap.py

@@ -18,6 +18,8 @@
 import distutils.util
 import subprocess
 import logging
+import collections
+from argparse import ArgumentParser
 
 logging.basicConfig()
 logger = logging.getLogger("bootstrap")
@@ -187,48 +189,50 @@ def find_executable(target):
     return None, None
 
 
-if __name__ == "__main__":
-    home = os.path.dirname(os.path.abspath(__file__))
-    LIBPATH = os.path.join(home, 'build', _distutils_dir_name('lib'))
-    cwd = os.getcwd()
-    os.chdir(home)
-    build = subprocess.Popen([sys.executable, "setup.py", "build"],
-                             shell=False, cwd=os.path.dirname(os.path.abspath(__file__)))
-    build_rc = build.wait()
-    if not os.path.exists(LIBPATH):
-        logger.warning("`lib` directory does not exist, trying common Python3 lib")
-        LIBPATH = os.path.join(os.path.split(LIBPATH)[0], "lib")
-    os.chdir(cwd)
-
-    if build_rc == 0:
-        logger.info("Build process ended.")
-    else:
-        logger.error("Build process ended with rc=%s", build_rc)
-        sys.exit(-1)
-
-    if len(sys.argv) < 2:
-        logger.warning("usage: ./bootstrap.py <script>\n")
-        script = None
-    else:
-        script = sys.argv[1]
+def main(argv):
+    parser = ArgumentParser(prog="bootstrap", usage="./bootstrap.py <script>",
+                            description=__doc__)
+    parser.add_argument("script", nargs="*")
+    parser.add_argument("-m", help="run library module as a script (terminates option list)")
 
-    if script:
-        logger.info("Executing %s from source checkout", script)
+    Options = collections.namedtuple("Options", ["script", "module"])
+    if len(argv) == 1:
+        options = Options(script=None, module=None)
     else:
-        logging.info("Running iPython by default")
-    sys.path.insert(0, LIBPATH)
-    logger.info("Patched sys.path with %s", LIBPATH)
+        if argv[1] in ["-h", "--help"]:
+            parser.print_help()
+            return
+        if argv[1] == "-m":
+            if len(argv) < 3:
+                parser.parse_args(argv[1:])
+                return
+            options = Options(script=None, module=argv[2:])
+        else:
+            options = Options(script=argv[1:], module=None)
 
-    if script:
-        argv = sys.argv[2:]
+    if options.script is not None:
+        logger.info("Executing %s from source checkout", options.script)
+        script = options.script[0]
+        argv = options.script[1:]
         kind, target = find_executable(script)
         if kind == "path":
             run_file(target, argv)
         elif kind == "entry_point":
             run_entry_point(target, argv)
         else:
-            logger.error("Script %s not found", script)
+            logger.error("Script %s not found", options.script)
+    elif options.module is not None:
+        logging.info("Running module %s", options.module)
+        import runpy
+        module = options.module[0]
+        try:
+            old = sys.argv
+            sys.argv = [None] + options.module[1:]
+            runpy.run_module(module, run_name="__main__", alter_sys=True)
+        finally:
+            sys.argv = old
     else:
+        logging.info("Running IPython by default")
         logger.info("Patch the sys.argv: %s", sys.argv)
         sys.path.insert(2, "")
         try:
@@ -240,3 +244,29 @@ def find_executable(target):
             code.interact()
         else:
             embed()
+
+
+if __name__ == "__main__":
+    home = os.path.dirname(os.path.abspath(__file__))
+    LIBPATH = os.path.join(home, 'build', _distutils_dir_name('lib'))
+    cwd = os.getcwd()
+    os.chdir(home)
+    build = subprocess.Popen([sys.executable, "setup.py", "build"],
+                         shell=False, cwd=os.path.dirname(os.path.abspath(__file__)))
+    build_rc = build.wait()
+    if not os.path.exists(LIBPATH):
+        logger.warning("`lib` directory does not exist, trying common Python3 lib")
+        LIBPATH = os.path.join(os.path.split(LIBPATH)[0], "lib")
+    os.chdir(cwd)
+
+    if build_rc == 0:
+        logger.info("Build process ended.")
+    else:
+        logger.error("Build process ended with rc=%s", build_rc)
+        sys.exit(-1)
+
+    sys.path.insert(0, LIBPATH)
+    logger.info("Patched sys.path with %s", LIBPATH)
+
+    main(sys.argv)
+