Added main module detection and command line construction, now should…

… show the right name (instead of __main__.py) when called for modules

Co-Authored-By: Henry Fredrick Schreiner <[email protected]>

plumbum/cli/application.py

@@ -9,7 +9,7 @@
 
 from plumbum import colors, local
 from plumbum.cli.i18n import get_translation_for
-from plumbum.lib import getdoc, six
+from plumbum.lib import getdoc, six, get_main_module_frame
 
 from .switches import (
     CountOf,
@@ -78,6 +78,7 @@ def __repr__(self):
 # CLI Application base class
 # ===================================================================================================
 
+main_module_ending_rx = re.compile("\.__main__$")
 
 class Application(object):
     """The base class for CLI applications; your "entry point" class should derive from it,
@@ -176,7 +177,11 @@ def __init__(self, executable):
         # Filter colors
 
         if self.PROGNAME is None:
-            self.PROGNAME = os.path.basename(executable)
+            spec = get_main_module_frame().f_globals.get("__spec__", None)
+            if spec:
+                self.PROGNAME = " ".join(("python -m", main_module_ending_rx.sub("", spec.name)))
+            else:
+                self.PROGNAME = os.path.basename(executable)
         elif isinstance(self.PROGNAME, colors._style):
             self.PROGNAME = self.PROGNAME | os.path.basename(executable)
         elif colors.filter(self.PROGNAME) == "":

plumbum/lib.py

@@ -165,3 +165,12 @@ def read_fd_decode_safely(fd, size=4096):
             if i == 3:
                 raise
             data += os.read(fd.fileno(), 1)
+
+def get_main_module_frame():
+    """
+    Gets the frame of the __main__ module (the one which is called with command line) of an app.
+    """
+    fr = sys._getframe(0)
+    while fr and fr.f_globals["__name__"] != "__main__":
+        fr = fr.f_back
+    return fr