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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drove-cli
-Version: 0.0.6
+Version: 0.0.8
 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.8}/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.8}/drovecli.py

@@ -8,28 +8,30 @@ from types import SimpleNamespace
 class DroveCli:
     def __init__(self, parser: argparse.ArgumentParser):
         self.parser = parser
-        self.drove_client = droveclient.DroveClient()
-        self.plugins: list = []
+        self.plugins: dict[str, DrovePlugin] = {}
         self.debug = False
-        subparsers = parser.add_subparsers(help="Available plugins")
+        subparsers = parser.add_subparsers(help="Available plugins", dest="plugin")
+        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)
-            self.plugins.append(plugin)
+            plugin.populate_options(drove_client=drove_client, subparser=subparsers)
+            self.plugins[plugin.name()] = plugin
         parser.set_defaults(func=self.show_help)
         
         
     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
-        
+        if args.debug:
+            print("Selected plugin: " + args.plugin)
+
+        if args.plugin:
+            plugin = self.plugins.get(args.plugin)
+            if plugin and plugin.needs_client():
+                droveclient.build_drove_client(plugin.drove_client, args)
         args.func(args)
     
     def show_help(self, options: SimpleNamespace) -> None:

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

@@ -17,7 +17,13 @@ class DrovePlugin:
     def __init__(self) -> None:
         self.drove_client: droveclient.DroveClient = None
         self.parser: argparse.ArgumentParser = None
-        
+
+    def name(self) -> str:
+        raise NotImplementedError("Looks like plugin did not implement name() method")
+
+    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)

{drove_cli-0.0.6 → drove_cli-0.0.8}/plugins/appinstances.py

@@ -12,8 +12,11 @@ class Applications(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
 
+    def name(self) -> str:
+        return "appinstances"
+
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
-        parser = subparser.add_parser("appinstances", help="Drove application instance related commands")
+        parser = subparser.add_parser(self.name(), help="Drove application instance related commands")
 
         commands = parser.add_subparsers(help="Available commands for application management")
 

{drove_cli-0.0.6 → drove_cli-0.0.8}/plugins/applications.py

@@ -13,8 +13,11 @@ class Applications(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
 
+    def name(self) -> str:
+        return "apps"
+
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
-        parser = subparser.add_parser("apps", help="Drove application related commands")
+        parser = subparser.add_parser(self.name(), help="Drove application related commands")
 
         commands = parser.add_subparsers(help="Available commands for application management")
 

{drove_cli-0.0.6 → drove_cli-0.0.8}/plugins/cluster.py

@@ -9,11 +9,14 @@ import time
 from types import SimpleNamespace
 
 class Cluster(plugins.DrovePlugin):
+    def name(self):
+        return "cluster"
+
     def __init__(self) -> None:
         pass
 
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
-        parser = subparser.add_parser("cluster", help="Drove cluster related commands")
+        parser = subparser.add_parser(self.name(), help="Drove cluster related commands")
 
         commands = parser.add_subparsers(help="Available commands for cluster management")
 

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

@@ -85,8 +85,14 @@ class Config(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
 
+    def name(self) -> str:
+        return "config"
+
+    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")
+        parser = subparser.add_parser(self.name(), help="Manage drove cluster configurations")
         commands = parser.add_subparsers(help="Available config commands")
 
         # get-clusters: List all available clusters

{drove_cli-0.0.6 → drove_cli-0.0.8}/plugins/describe.py

@@ -33,8 +33,11 @@ class Describe(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
 
+    def name(self) -> str:
+        return "describe"
+
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
-        parser = subparser.add_parser("describe", help="Show detailed information about a resource")
+        parser = subparser.add_parser(self.name(), help="Show detailed information about a resource")
         commands = parser.add_subparsers(help="Available describe commands")
 
         # describe executor

{drove_cli-0.0.6 → drove_cli-0.0.8}/plugins/executors.py

@@ -10,9 +10,11 @@ from urllib.parse import urlencode
 class Executors(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
+    def name(self) -> str:
+        return "executor"
 
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
-        parser = subparser.add_parser("executor", help="Drove cluster executor related commands")
+        parser = subparser.add_parser(self.name(), help="Drove cluster executor related commands")
         
         commands = parser.add_subparsers(help="Available commands for cluster executor management")
 

{drove_cli-0.0.6 → drove_cli-0.0.8}/plugins/localserviceinstances.py

@@ -12,8 +12,11 @@ class LocalServices(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
 
+    def name(self) -> str:
+        return "lsinstances"
+
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
-        parser = subparser.add_parser("lsinstances", help="Drove local service instance related commands")
+        parser = subparser.add_parser(self.name(), help="Drove local service instance related commands")
 
         commands = parser.add_subparsers(help="Available commands for local service management")
 

{drove_cli-0.0.6 → drove_cli-0.0.8}/plugins/localservices.py

@@ -13,8 +13,11 @@ class LocalServices(plugins.DrovePlugin):
     def __init__(self) -> None:
         super().__init__()
 
+    def name(self) -> str:
+        return "localservices"
+
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
-        parser = subparser.add_parser("localservices", help="Drove local service related commands")
+        parser = subparser.add_parser(self.name(), help="Drove local service related commands")
 
         commands = parser.add_subparsers(help="Available commands for local services management")
 

{drove_cli-0.0.6 → drove_cli-0.0.8}/plugins/tasks.py

@@ -12,8 +12,11 @@ class Tasks(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
 
+    def name(self) -> str:
+        return "tasks"
+
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
-        parser = subparser.add_parser("tasks", help="Drove task related commands")
+        parser = subparser.add_parser(self.name(), help="Drove task related commands")
 
         commands = parser.add_subparsers(help="Available commands for task management")
 

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

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