gitlab-runner-tart-driver 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

gitlab_runner_tart_driver/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.2"
+__version__ = "0.3.3"

gitlab_runner_tart_driver/modules/tart.py

@@ -28,6 +28,8 @@ class TartVmSpec(BaseModel):
     display: str
     running: bool
     ip_address: str
+    os: str
+    size: str
 
 
 class TartVolume(BaseModel):
@@ -126,43 +128,53 @@ class Tart(object):
         # 'spec' will look like this:
         #
         # tart version < 2.7
-        #    CPU Memory Disk Display  Running
-        #    4   8192   46   1024x768 true
+        # CPU Memory Disk Display  Running
+        # 4   8192   46   1024x768 true
         #
         # tart version > 2.6
         # CPU Memory Disk Size   Display  State
         # 4   8192   50   20.794 1024x768 running
+        #
+        # tart version > 2.8
+        # OS     CPU Memory Disk Size   Display  State
+        # darwin 4   8192   50   22.294 1024x768 stopped
+
+        # Read headers
+        headers = specs.split("\n")[0]
+        header_elements = headers.split(" ")
+        header_elements = [s.strip().lower() for s in header_elements if s]
 
-        spec_line = specs.split("\n")[1]
-        spec_elements = spec_line.split(" ")
+        spec = specs.split("\n")[1]
+        spec_elements = spec.split(" ")
         spec_elements = [s.strip() for s in spec_elements if s]
 
-        # old version
-        if len(spec_elements) == 5:
-            spec = TartVmSpec(
-                cpu_count=int(spec_elements[0]),
-                memory=int(spec_elements[1]),
-                disk=int(spec_elements[2]),
-                display=spec_elements[3],
-                running=True if spec_elements[4].lower() == "true" else False,
-                ip_address="n/a",
-            )
-        elif len(spec_elements) == 6:
-            spec = TartVmSpec(
-                cpu_count=int(spec_elements[0]),
-                memory=int(spec_elements[1]),
-                disk=int(spec_elements[2]),
-                display=spec_elements[4],
-                running=True if spec_elements[5].lower() == "running" else False,
-                ip_address="n/a",
-            )
+        specs = {}
+        for i, spec_element in enumerate(spec_elements):
+            specs[header_elements[i]] = spec_element
+
+        # check the state of the machine
+        vm_state = specs.get("state", "n/a")
+        running = True
+        if vm_state == "running" or vm_state == "true":
+            running = True
         else:
-            raise ValueError("cloud not determine vm specs")
+            running = False
+
+        vm_spec = TartVmSpec(
+            cpu_count=int(specs.get("cpu", 0)),
+            memory=int(specs.get("memory", 0)),
+            disk=int(specs.get("disk", 0)),
+            display=specs.get("display", "n/a"),
+            running=running,
+            ip_address="n/a",
+            os=specs.get("os", "n/a"),
+            size=specs.get("size", "n/a"),
+        )
 
-        if spec.running:
-            spec.ip_address = self.ip(name)
+        if vm_spec.running:
+            vm_spec.ip_address = self.ip(name)
 
-        return spec
+        return vm_spec
 
     def print_spec(self, name, tablefmt="fancy_grid"):
         spec = self.get(name)

{gitlab_runner_tart_driver-0.3.2.dist-info → gitlab_runner_tart_driver-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-runner-tart-driver
-Version: 0.3.2
+Version: 0.3.3
 Home-page: https://gitlab.com/schmieder.matthias/gitlab-runner-tart-driver
 Author: Matthias Schmieder
 Author-email: schmieder.matthias@gmail.com

{gitlab_runner_tart_driver-0.3.2.dist-info → gitlab_runner_tart_driver-0.3.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-gitlab_runner_tart_driver/__init__.py,sha256=vNiWJ14r_cw5t_7UDqDQIVZvladKFGyHH2avsLpN7Vg,22
+gitlab_runner_tart_driver/__init__.py,sha256=8KcCYTXH99C2-gCLuPILJvtT9YftRWJsartIx6TQ2ZY,22
 gitlab_runner_tart_driver/__main__.py,sha256=FiyMv64vDC-R8i3CGEP9QP48djZFHm7utyChwZJWCeY,107
 gitlab_runner_tart_driver/cli.py,sha256=1eFi9m8L4zcBO5eE4g4EP8phtE1znF54qt-xAigPsOE,596
 gitlab_runner_tart_driver/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,12 +9,12 @@ gitlab_runner_tart_driver/commands/run.py,sha256=2grP79TARRL0xzmppRITbSpIH0WL4YP
 gitlab_runner_tart_driver/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gitlab_runner_tart_driver/modules/gitlab_custom_command_config.py,sha256=XvE83QmQUcqtVMYZY3okGOgO86DBX6Y7xhXNenmKxFY,3086
 gitlab_runner_tart_driver/modules/gitlab_custom_driver_config.py,sha256=ujxlzP1ZbfsZyLIsghID5c_jLPSt-1pDazE2B5CPORY,447
-gitlab_runner_tart_driver/modules/tart.py,sha256=bXwUTtR60oIdI_o-lDNakVQ_FL-12a6qykmeFlEl3VY,9677
+gitlab_runner_tart_driver/modules/tart.py,sha256=rD6IPtpz57dwsPGVBWaeKeVoqI1MoBvdtkqozXgmAxA,9914
 gitlab_runner_tart_driver/modules/utils.py,sha256=7ipKjy_5tC5iW67Na_A9XhF4o2lKcAqO8LRTTSJKNd0,923
 gitlab_runner_tart_driver/scripts/install-gitlab-runner.sh.j2,sha256=-rBzxZ92w7lMrTCVcjMHhlZgqPIK1RJKVoOc2wjZvck,2533
-gitlab_runner_tart_driver-0.3.2.dist-info/LICENSE.txt,sha256=TiYXQpEfbzcPBNGb7k1NslUngq_un-5cxGyT4W1S_f4,3303
-gitlab_runner_tart_driver-0.3.2.dist-info/METADATA,sha256=Ns7pOOlS-y1GeZlM0T6-Xf3jsX3F1hWNewRbRqOi0ek,20706
-gitlab_runner_tart_driver-0.3.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-gitlab_runner_tart_driver-0.3.2.dist-info/entry_points.txt,sha256=xmvpGQf1wvFPy5wqDWXu8k5FD_k9KkCNCkpuworTsr0,82
-gitlab_runner_tart_driver-0.3.2.dist-info/top_level.txt,sha256=JjRzCs2sr24xG4SV_5tIBPpNC1Tec7I4AbK4IKMDqOc,26
-gitlab_runner_tart_driver-0.3.2.dist-info/RECORD,,
+gitlab_runner_tart_driver-0.3.3.dist-info/LICENSE.txt,sha256=TiYXQpEfbzcPBNGb7k1NslUngq_un-5cxGyT4W1S_f4,3303
+gitlab_runner_tart_driver-0.3.3.dist-info/METADATA,sha256=0rUA-uUqMDTOx657qWQbVNiMhQzuroumn8aIENgVZzs,20706
+gitlab_runner_tart_driver-0.3.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+gitlab_runner_tart_driver-0.3.3.dist-info/entry_points.txt,sha256=xmvpGQf1wvFPy5wqDWXu8k5FD_k9KkCNCkpuworTsr0,82
+gitlab_runner_tart_driver-0.3.3.dist-info/top_level.txt,sha256=JjRzCs2sr24xG4SV_5tIBPpNC1Tec7I4AbK4IKMDqOc,26
+gitlab_runner_tart_driver-0.3.3.dist-info/RECORD,,