poetry-plugin-ivcap 0.2.4__tar.gz → 0.2.6__tar.gz

{poetry_plugin_ivcap-0.2.4 → poetry_plugin_ivcap-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: poetry-plugin-ivcap
-Version: 0.2.4
+Version: 0.2.6
 Summary: A custom Poetry command for IVCAP deployments
 License: MIT
 Author: Max Ott

{poetry_plugin_ivcap-0.2.4 → poetry_plugin_ivcap-0.2.6}/poetry_plugin_ivcap/ivcap.py

@@ -43,7 +43,7 @@ def service_register(data, line):
     if not pkg or pkg == "":
         line(f"<error>No package '{dcfg.docker_name}' found. Please build and publish it first.</error>")
         return
-    service_id = get_service_id(data, line)
+    service_id = get_service_id(data, False, line)
 
     cmd = ["poetry", "run", "python", service, "--print-service-description"]
     line(f"<debug>Running: {' '.join(cmd)} </debug>")
@@ -85,7 +85,7 @@ def tool_register(data, line):
     line(f"<debug>Running: {' '.join(cmd)} </debug>")
     svc = subprocess.check_output(cmd).decode()
 
-    service_id = get_service_id(data, line)
+    service_id = get_service_id(data, False, line)
     svc = svc.replace("#SERVICE_ID#", service_id)
 
     with tempfile.NamedTemporaryFile(mode='w+', delete=False) as tmp:

{poetry_plugin_ivcap-0.2.4 → poetry_plugin_ivcap-0.2.6}/poetry_plugin_ivcap/plugin.py

@@ -8,6 +8,7 @@ from poetry.plugins.application_plugin import ApplicationPlugin
 from cleo.commands.command import Command
 from cleo.helpers import argument, option
 import subprocess
+from importlib.metadata import version
 
 from poetry_plugin_ivcap.util import get_version
 
@@ -59,10 +60,17 @@ Configurable options in pyproject.toml:
     ignore_validation_errors = True
 
     def handle(self):
+
+        sub = self.argument("subcommand")
+        if sub == "version":
+            #v = poetry.get_plugin('ivcap').version
+            v = version("poetry-plugin-ivcap")
+            print(f"IVCAP plugin (version {v})")
+            return
+
         poetry = self.application.poetry
         data = poetry.pyproject.data
 
-        sub = self.argument("subcommand")
         args = self.argument("args")
         is_silent = self.option("silent")
 
@@ -84,6 +92,7 @@ Configurable options in pyproject.toml:
             print(sid)
         elif sub == "tool-register":
             tool_register(data, self.line)
+
         else:
             if not (sub == None or sub == "help"):
                 self.line(f"<error>Unknown subcommand: {sub}</error>")

{poetry_plugin_ivcap-0.2.4 → poetry_plugin_ivcap-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry-plugin-ivcap"
-version = "0.2.4"
+version = "0.2.6"
 description = "A custom Poetry command for IVCAP deployments"
 authors = ["Max Ott <max.ott@csiro.au>"]
 license = "MIT"