lockss-pybasic 0.1.0.dev5__tar.gz → 0.1.0.dev7__tar.gz

{lockss_pybasic-0.1.0.dev5 → lockss_pybasic-0.1.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-pybasic
-Version: 0.1.0.dev5
+Version: 0.1.0.dev7
 Summary: Basic Python utilities
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin

{lockss_pybasic-0.1.0.dev5 → lockss_pybasic-0.1.0.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lockss-pybasic"
-version = "0.1.0-dev5"
+version = "0.1.0-dev7"
 description = "Basic Python utilities"
 authors = [
     { name = "Thib Guicherd-Callin", email = "thib@cs.stanford.edu" }

{lockss_pybasic-0.1.0.dev5 → lockss_pybasic-0.1.0.dev7}/src/lockss/pybasic/__init__.py

@@ -32,4 +32,4 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 '''.strip()
 
-__version__ = '0.1.0-dev5'
+__version__ = '0.1.0-dev7'

{lockss_pybasic-0.1.0.dev5 → lockss_pybasic-0.1.0.dev7}/src/lockss/pybasic/cliutil.py

@@ -28,17 +28,63 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+'''
+Utilities for command line processing.
+'''
+
+from abc import ABC, abstractmethod
 import sys
 
-from pydantic.v1.fields import FieldInfo
+from pydantic.v1 import BaseModel, Field
+
+
+class Printable(ABC):
+
+    def print(self, file=sys.stdout):
+        print(self.get_display(), file=file)
+
+    @abstractmethod
+    def get_display(self):
+        pass
+
+
+class CopyrightCommand:
+
+    @staticmethod
+    def make(copyright):
+        class CopyrightModel(Printable, BaseModel):
+            def get_display(self):
+                return copyright
+        return CopyrightModel
+
+    @staticmethod
+    def field():
+        return Field(description='print the copyright and exit')
+
+
+class LicenseCommand:
+
+    @staticmethod
+    def make(license):
+        class LicenseModel(Printable, BaseModel):
+            def get_display(self):
+                return license
+        return LicenseModel
+
+    @staticmethod
+    def field():
+        return Field(description='print the software license and exit')
+
 
-class VersionCommand(FieldInfo):
+class VersionCommand:
 
-    def __init__(self, version: str, *args, **kwargs):
-        kwargs.setdefault('description', 'print the version number and exit')
-        super().__init__(*args, **kwargs)
-        self._version = version
-        self._validate() # Same as the Field(...) function
+    @staticmethod
+    def make(version):
+        class VersionModel(Printable, BaseModel):
+            def get_display(self):
+                return version
+        return VersionModel
 
-    def print_version(self, file=sys.stdout):
-        print(self._version, file=file)
+    @staticmethod
+    def field():
+        return Field(description='print the version number and exit')