wizlib 3.1.4__tar.gz → 3.2.0__tar.gz

{wizlib-3.1.4 → wizlib-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizlib
-Version: 3.1.4
+Version: 3.2.0
 Summary: Framework for flexible and powerful command-line applications
 License: MIT
 Author: Steampunk Wizard
@@ -43,4 +43,3 @@ WizLib wraps the built-in ArgumentParser with a set of functions, classes, and c
 Logo by [Freepik](https://www.freepik.com/?_gl=1*1y9rvc9*test_ga*Mjc1MTIzODYxLjE2ODA3OTczNTg.*test_ga_523JXC6VL7*MTY4MDc5NzM1OC4xLjEuMTY4MDc5NzQxNS4zLjAuMA..*fp_ga*Mjc1MTIzODYxLjE2ODA3OTczNTg.*fp_ga_1ZY8468CQB*MTY4MDc5NzM1OC4xLjEuMTY4MDc5NzQxNS4zLjAuMA..)
 
 
-

{wizlib-3.1.4 → wizlib-3.2.0}/README.md

@@ -24,4 +24,3 @@ WizLib wraps the built-in ArgumentParser with a set of functions, classes, and c
 
 Logo by [Freepik](https://www.freepik.com/?_gl=1*1y9rvc9*test_ga*Mjc1MTIzODYxLjE2ODA3OTczNTg.*test_ga_523JXC6VL7*MTY4MDc5NzM1OC4xLjEuMTY4MDc5NzQxNS4zLjAuMA..*fp_ga*Mjc1MTIzODYxLjE2ODA3OTczNTg.*fp_ga_1ZY8468CQB*MTY4MDc5NzM1OC4xLjEuMTY4MDc5NzQxNS4zLjAuMA..)
 
-

{wizlib-3.1.4 → wizlib-3.2.0}/pyproject.toml

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

wizlib-3.2.0/wizlib/io.py

@@ -0,0 +1,27 @@
+# Primitive i/o functions referenced elsewhere, useful for test patching (a
+# sort of dependency injection
+
+import sys
+
+import readchar
+
+from wizlib.parser import WizArgumentError
+
+
+ISATTY = all(s.isatty() for s in (sys.stdin, sys.stdout, sys.stderr))
+
+
+def isatty():
+    return ISATTY
+
+
+def stream():
+    return '' if ISATTY else sys.stdin.read()
+
+
+def ttyin():
+    if ISATTY:
+        return readchar.readkey()
+    else:
+        raise WizArgumentError(
+            'Command designed for interactive use')

wizlib-3.2.0/wizlib/stream_handler.py

@@ -0,0 +1,42 @@
+# In a non-interactive, non-testing mode, route input from stdin to the output.
+# When testing, read from the object provided (probably a StreamIO)
+
+from pathlib import Path
+import sys
+
+from wizlib.handler import Handler
+from wizlib.parser import WizParser
+import wizlib.io
+
+
+class StreamHandler(Handler):
+    """Handle non-interactive input, such as via a pipe in a shell. Only runs
+    when not in a tty."""
+
+    name = 'stream'
+    text: str = ''
+
+    def __init__(self, file=None):
+        self.file = file
+
+    def read(self):
+        """Play like a file, sorta"""
+        if self.file:
+            return Path(self.file).read_text()
+        else:
+            return wizlib.io.stream()
+
+    @property
+    def text(self):
+        """Legacy approach - deprecated"""
+        return self.read()
+
+    # def __str__(self):
+    #     return self.text
+
+    # @classmethod
+    # def fake(cls, value):
+    #     """Return a fake StreamHandler with forced values, for testing"""
+    #     handler = cls(stdin=False)
+    #     handler.text = value
+    #     return handler

wizlib-3.1.4/wizlib/io.py

@@ -1,21 +0,0 @@
-# Primitive i/o functions referenced elsewhere, useful for test patching (a
-# sort of dependency injection
-
-import sys
-
-import readchar
-
-
-ISATTY = sys.stdin.isatty()
-
-
-def isatty():
-    return ISATTY
-
-
-def stream():
-    return '' if ISATTY else sys.stdin.read()
-
-
-def ttyin():
-    return readchar.readkey()

wizlib-3.1.4/wizlib/stream_handler.py

@@ -1,33 +0,0 @@
-# In a non-interactive, non-testing mode, route input from stdin to the output.
-# When testing, read from the object provided (probably a StreamIO)
-
-from pathlib import Path
-import sys
-
-from wizlib.handler import Handler
-from wizlib.parser import WizParser
-import wizlib.io
-
-
-class StreamHandler(Handler):
-    """Handle non-interactive input, such as via a pipe in a shell. Only runs
-    when not in a tty."""
-
-    name = 'stream'
-    text: str = ''
-
-    def __init__(self, file=None, stdin=True):
-        if file:
-            self.text = Path(file).read_text()
-        elif not wizlib.io.isatty():
-            self.text = wizlib.io.stream()
-
-    def __str__(self):
-        return self.text
-
-    @classmethod
-    def fake(cls, value):
-        """Return a fake StreamHandler with forced values, for testing"""
-        handler = cls(stdin=False)
-        handler.text = value
-        return handler