drove-cli 0.0.6__tar.gz → 0.0.7__tar.gz

{drove_cli-0.0.6 → drove_cli-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drove-cli
-Version: 0.0.6
+Version: 0.0.7
 Summary: Drove Command Line Interface
 License: Apache-2.0
 Keywords: container,docker,podman,distributed-systems,container-orchestrator

{drove_cli-0.0.6 → drove_cli-0.0.7}/drove.py

@@ -36,14 +36,14 @@ def run():
     except (BrokenPipeError, IOError, KeyboardInterrupt):
         pass
     except droveclient.DroveException as e:
-        debug = True if client != None and client.debug else False
+        debug = True if client is not None and client.debug else False
         droveutils.print_drove_error(e, debug)
         if debug:
             traceback.print_exc()
 
     except Exception as e:
         print("Drove CLI error: " + str(e))
-        debug = True if client != None and client.debug else False
+        debug = True if client is not None and client.debug else False
         if debug:
             traceback.print_exc()
         else:

{drove_cli-0.0.6 → drove_cli-0.0.7}/drovecli.py

@@ -8,14 +8,14 @@ from types import SimpleNamespace
 class DroveCli:
     def __init__(self, parser: argparse.ArgumentParser):
         self.parser = parser
-        self.drove_client = droveclient.DroveClient()
         self.plugins: list = []
         self.debug = False
         subparsers = parser.add_subparsers(help="Available plugins")
+        drove_client = droveclient.DroveClient()
         for plugin_class in DrovePlugin.plugins:
             plugin = plugin_class()
             # print("Loading plugin: " + str(plugin))
-            plugin.populate_options(drove_client=self.drove_client, subparser=subparsers)
+            plugin.populate_options(drove_client=drove_client, subparser=subparsers)
             self.plugins.append(plugin)
         parser.set_defaults(func=self.show_help)
         
@@ -23,10 +23,6 @@ class DroveCli:
     def run(self):
         args = self.parser.parse_args()
         self.debug = args.debug
-        drove_client = droveclient.build_drove_client(self.drove_client, args=args)
-        if drove_client is None:
-            return None
-        self.drove_client = drove_client
 
         # Load plugins
         

{drove_cli-0.0.6 → drove_cli-0.0.7}/plugins/__init__.py

@@ -17,12 +17,20 @@ class DrovePlugin:
     def __init__(self) -> None:
         self.drove_client: droveclient.DroveClient = None
         self.parser: argparse.ArgumentParser = None
-        
+
+    def needs_client(self) -> bool:
+        return True
+
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
         self.drove_client = drove_client
-        subparser.set_defaults(func=self.process)
+        subparser.set_defaults(func=self.run_plugin)
         self.parser = subparser
 
+    def run_plugin(self, options: SimpleNamespace):
+        if self.needs_client():
+            droveclient.build_drove_client(self.drove_client, options)
+        self.process(options)
+
     def process(self, options: SimpleNamespace):
         self.parser.print_help()
         exit(-1)

{drove_cli-0.0.6 → drove_cli-0.0.7}/plugins/config.py

@@ -85,6 +85,9 @@ class Config(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
 
+    def needs_client(self) -> bool:
+        return False
+
     def populate_options(self, drove_client, subparser: argparse.ArgumentParser):
         parser = subparser.add_parser("config", help="Manage drove cluster configurations")
         commands = parser.add_subparsers(help="Available config commands")

{drove_cli-0.0.6 → drove_cli-0.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "drove-cli"
-version = "0.0.6"
+version = "0.0.7"
 description = "Drove Command Line Interface"
 authors = ["Santanu Sinha <santanu.sinha@gmail.com>"]
 maintainers = [