lockss-turtles 0.6.0.dev21__py3-none-any.whl → 0.6.0.dev23__py3-none-any.whl

lockss/turtles/__init__.py

@@ -6,7 +6,7 @@ registries.
 """
 
 #: This package's version.
-__version__ = '0.6.0-dev21'
+__version__ = '0.6.0-dev23'
 
 #: This package's copyright.
 __copyright__ = '''

lockss/turtles/cli.py

@@ -144,22 +144,18 @@ class PluginJarOptions(BaseModel):
 
 
 class NonInteractiveOptions(BaseModel):
-    non_interactive: Optional[bool] = Field(False, description='(plugin signing credentials) disallow interactive prompts')
+    non_interactive: Optional[bool] = Field(False,
+                                            description='(plugin signing credentials) disallow interactive prompts')
 
 
-class BuildPluginCommand(OutputFormatOptions, NonInteractiveOptions, PluginBuildingOptions, PluginIdentifierOptions):
-    pass
-
-
-class DeployPluginCommand(OutputFormatOptions, NonInteractiveOptions, PluginDeploymentOptions, PluginJarOptions):
-    pass
+class TurtlesCommand(BaseModel):
 
+    class BuildPluginCommand(OutputFormatOptions, NonInteractiveOptions, PluginBuildingOptions, PluginIdentifierOptions): pass
 
-class ReleasePluginCommand(OutputFormatOptions, NonInteractiveOptions, PluginDeploymentOptions, PluginBuildingOptions, PluginIdentifierOptions):
-    pass
+    class DeployPluginCommand(OutputFormatOptions, NonInteractiveOptions, PluginDeploymentOptions, PluginJarOptions): pass
 
+    class ReleasePluginCommand(OutputFormatOptions, NonInteractiveOptions, PluginDeploymentOptions, PluginBuildingOptions, PluginIdentifierOptions): pass
 
-class TurtlesCommand(BaseModel):
     bp: Optional[BuildPluginCommand] = Field(description='synonym for: build-plugin')
     build_plugin: Optional[BuildPluginCommand] = Field(description='build plugins', alias='build-plugin')
     copyright: Optional[StringCommand.type(__copyright__)] = Field(description=COPYRIGHT_DESCRIPTION)
@@ -237,10 +233,10 @@ class TurtlesCli(BaseCli[TurtlesCommand]):
     #     if len(result) > 0:
     #         self._tabulate(title, result, headers)
 
-    def _bp(self, build_plugin_command: BuildPluginCommand) -> None:
+    def _bp(self, build_plugin_command: TurtlesCommand.BuildPluginCommand) -> None:
         return self._build_plugin(build_plugin_command)
 
-    def _build_plugin(self, build_plugin_command: BuildPluginCommand) -> None:
+    def _build_plugin(self, build_plugin_command: TurtlesCommand.BuildPluginCommand) -> None:
         errs = []
         for psc in build_plugin_command.get_plugin_set_catalogs():
             try:
@@ -276,7 +272,7 @@ class TurtlesCli(BaseCli[TurtlesCommand]):
     def _copyright(self, string_command: StringCommand) -> None:
         self._do_string_command(string_command)
 
-    def _deploy_plugin(self, deploy_plugin_command: DeployPluginCommand) -> None:
+    def _deploy_plugin(self, deploy_plugin_command: TurtlesCommand.DeployPluginCommand) -> None:
         errs = []
         for prc in deploy_plugin_command.get_plugin_registry_catalogs():
             try:
@@ -307,7 +303,7 @@ class TurtlesCli(BaseCli[TurtlesCommand]):
     def _do_string_command(self, string_command: StringCommand) -> None:
         string_command()
 
-    def _dp(self, deploy_plugin_command: DeployPluginCommand) -> None:
+    def _dp(self, deploy_plugin_command: TurtlesCommand.DeployPluginCommand) -> None:
         return self._deploy_plugin(deploy_plugin_command)
 
     def _license(self, string_command: StringCommand) -> None:
@@ -322,7 +318,7 @@ class TurtlesCli(BaseCli[TurtlesCommand]):
             self._parser.error('no plugin signing password specified while in non-interactive mode')
         self._app.set_password(lambda: _p)
 
-    def _release_plugin(self, release_plugin_command: ReleasePluginCommand) -> None:
+    def _release_plugin(self, release_plugin_command: TurtlesCommand.ReleasePluginCommand) -> None:
         errs = []
         for psc in release_plugin_command.get_plugin_set_catalogs():
             try:
@@ -371,7 +367,7 @@ class TurtlesCli(BaseCli[TurtlesCommand]):
                                 headers=['Plugin identifier', 'Plugin version', 'Plugin registry', 'Plugin registry layer', 'Deployed JAR'],
                                 tablefmt=release_plugin_command.output_format))
 
-    def _rp(self, release_plugin_command: ReleasePluginCommand) -> None:
+    def _rp(self, release_plugin_command: TurtlesCommand.ReleasePluginCommand) -> None:
         self._release_plugin(release_plugin_command)
 
     def _version(self, string_command: StringCommand) -> None: