wizlib 1.1.2__tar.gz → 1.1.5__tar.gz

{wizlib-1.1.2 → wizlib-1.1.5}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: wizlib
-Version: 1.1.2
-Summary: A collection of Python modules that might be useful across multiple projects
+Version: 1.1.5
+Summary: Framework for flexible and powerful command-line applications
 License: MIT
 Author: Steampunk Wizard
 Author-email: wizlib@steampunkwizard.ca
@@ -10,12 +10,13 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: PyYAML (>=6.0.1,<7.0.0)
+Requires-Dist: gnureadline (>=8.1.2,<9.0.0) ; sys_platform == "darwin"
 Requires-Dist: pyreadline3 (>=3.4.1,<4.0.0) ; sys_platform == "win32"
 Description-Content-Type: text/markdown
 
 # WizLib
 
-A collection of Python modules that might be useful across multiple projects
+Framework for flexible and powerful command-line applications
 
 ## ClassFamily
 

{wizlib-1.1.2 → wizlib-1.1.5}/README.md

@@ -1,6 +1,6 @@
 # WizLib
 
-A collection of Python modules that might be useful across multiple projects
+Framework for flexible and powerful command-line applications
 
 ## ClassFamily
 

{wizlib-1.1.2 → wizlib-1.1.5}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "wizlib"
-version = "1.1.2"
-description = "A collection of Python modules that might be useful across multiple projects"
+version = "1.1.5"
+description = "Framework for flexible and powerful command-line applications"
 authors = ["Steampunk Wizard <wizlib@steampunkwizard.ca>"]
 license = "MIT"
 readme = "README.md"
@@ -10,7 +10,7 @@ readme = "README.md"
 python = ">=3.11,<3.12"
 PyYAML = "^6.0.1"
 pyreadline3 = { version="^3.4.1", markers="sys_platform=='win32'" }
-# gnureadline = { version="^8.1.2", markers="sys_platform=='darwin'" }
+gnureadline = { version="^8.1.2", markers="sys_platform=='darwin'" }
 
 [tool.poetry.group.dev.dependencies]
 coverage = "^7.3.1"

{wizlib-1.1.2 → wizlib-1.1.5}/wizlib/command_handler.py

@@ -2,6 +2,7 @@ import sys
 from argparse import ArgumentError, ArgumentParser
 from dataclasses import dataclass
 import os
+from pathlib import Path
 
 from wizlib.class_family import ClassFamily
 from wizlib.super_wrapper import SuperWrapper
@@ -31,13 +32,7 @@ class CommandHandler:
 
     def get_command(self, args=None):
         args = args if args else [self.atriarch.default]
-        try:
-            values = vars(self.parser.parse_args(args))
-        except ArgumentError as error:
-            print(error.message)
-            return
-        except SystemExit:
-            return
+        values = vars(self.parser.parse_args(args))
         command = values.pop('command')
         command_class = self.atriarch.family_member('name', command)
         if not command_class:
@@ -79,20 +74,22 @@ class Command(ClassFamily, SuperWrapper):
     @classmethod
     def add_app_args(self, parser):
         """Add pre-subcommand arguments via argparse by optionally overriding -
-        only works in the atricarch."""
+        only works in the atricarch. Default is an optional 'input' argument to
+        take the place of stdin in testing"""
+        parser.add_argument('--input', '-i', default='')
         pass
 
     @classmethod
     def add_args(self, parser):
         """Add arguments to the command's parser - override this.
-        Add global arguments in the base class. Not wrapped.  Default is an
-        optional 'input' argument to take the place of stdin in testing"""
-        parser.add_argument('--input', '-i', default='')
+        Add global arguments in the base class. Not wrapped."""
 
     def handle_args(self):
         """Clean up args, calculate any, ask through UI, etc. - override
         this. For input, default is to grab stdin in non-tty cases."""
-        if (not self.input) and (not sys.stdin.isatty()):
+        if self.input:
+            self.input = Path(self.input).read_text()
+        elif not sys.stdin.isatty():
             self.input = sys.stdin.read()
 
     def execute(self, method, *args, **kwargs):