wizlib 3.1.0__tar.gz → 3.1.1__tar.gz

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

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

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

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

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

@@ -1,3 +1,4 @@
+from argparse import ArgumentError
 import sys
 from dataclasses import dataclass
 import os
@@ -6,7 +7,7 @@ from pathlib import Path
 from wizlib.class_family import ClassFamily
 from wizlib.command import WizHelpCommand
 from wizlib.super_wrapper import SuperWrapper
-from wizlib.parser import WizParser
+from wizlib.parser import WizArgumentError, WizParser
 from wizlib.ui import UI
 
 
@@ -44,7 +45,12 @@ class WizApp:
         """Call this from a Python entrypoint"""
         try:
             cls.initialize()
-            ns = cls.parser.parse_args(args)
+            try:
+                ns = cls.parser.parse_args(args)
+                if (ns.command is None) and (not hasattr(ns, 'help')):
+                    ns = cls.dparser.parse_args(args)
+            except ArgumentError as e:
+                ns = cls.dparser.parse_args(args)
             app = cls(**vars(ns))
             app.run(**vars(ns))
         except AppCancellation as cancellation:
@@ -63,14 +69,17 @@ class WizApp:
     def initialize(cls):
         """Set up the parser for the app class"""
         cls.parser = WizParser(prog=cls.name)
-        for handler in cls.handlers:
-            handler.add_args(cls.parser)
         subparsers = cls.parser.add_subparsers(dest='command')
         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(subparser)
+        for handler in cls.handlers:
+            handler.add_args(cls.parser)
+            handler.add_args(cls.dparser)
 
     def __init__(self, **vals):
         """Create the app. Only interested in the handlers from the parsed
@@ -86,12 +95,13 @@ class WizApp:
         the command itself and its specific arguments from the values passed
         in."""
         if 'help' in vals:
-            return WizHelpCommand(**vals)
-        c = 'command'
-        cname = (vals.pop(c) if c in vals else None) or self.base.default
-        ccls = self.base.family_member('name', cname)
-        if not ccls:
-            raise Exception(f"Unknown command {cname}")
+            ccls = WizHelpCommand
+        else:
+            c = 'command'
+            cname = (vals.pop(c) if c in vals else None) or self.base.default
+            ccls = self.base.family_member('name', cname)
+            if not ccls:
+                raise Exception(f"Unknown command {cname}")
         command = ccls(self, **vals)
         result = command.execute()
         if result:

{wizlib-3.1.0 → wizlib-3.1.1}/wizlib/parser.py

@@ -14,6 +14,8 @@ import sys
 import os
 
 
+# We found the help process a little clumsy
+
 class WizHelpAction(Action):
 
     def __init__(self,