wizlib 3.1.1__tar.gz → 3.1.3__tar.gz

{wizlib-3.1.1 → wizlib-3.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizlib
-Version: 3.1.1
+Version: 3.1.3
 Summary: Framework for flexible and powerful command-line applications
 License: MIT
 Author: Steampunk Wizard

{wizlib-3.1.1 → wizlib-3.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wizlib"
-version = "3.1.1"
+version = "3.1.3"
 description = "Framework for flexible and powerful command-line applications"
 authors = ["Steampunk Wizard <wizlib@steampunkwizard.ca>"]
 license = "MIT"

{wizlib-3.1.1 → wizlib-3.1.3}/wizlib/app.py

@@ -70,15 +70,18 @@ class WizApp:
         """Set up the parser for the app class"""
         cls.parser = WizParser(prog=cls.name)
         subparsers = cls.parser.add_subparsers(dest='command')
+        cls.dparser = WizParser(prog=f"{cls.name} {cls.base.default}")
         for command in cls.base.family_members('name'):
             key = command.get_member_attr('key')
             aliases = [key] if key else []
             subparser = subparsers.add_parser(command.name, aliases=aliases)
             if command.name == cls.base.default:
-                cls.dparser = subparser
+                command.add_args(cls.dparser)
             command.add_args(subparser)
         for handler in cls.handlers:
             handler.add_args(cls.parser)
+            # Throws ArgumentError if the default command includes an optional
+            # argument that overlaps with one of the handlers
             handler.add_args(cls.dparser)
 
     def __init__(self, **vals):
@@ -110,3 +113,8 @@ class WizApp:
                 print()
         if command.status:
             print(command.status, file=sys.stderr)
+
+    def parse_run(self, *args):
+        """For testing, parse just the command part and tun"""
+        ns = self.parser.parse_args(args)
+        self.run(**vars(ns))

{wizlib-3.1.1 → wizlib-3.1.3}/wizlib/super_wrapper.py

@@ -5,4 +5,5 @@ class SuperWrapper:
         def wrapper(self, *args, **kwargs):
             parent_method = getattr(parent_class, method.__name__)
             return parent_method(self, method, *args, **kwargs)
+        wrapper.__name__ = method.__name__
         return wrapper