gitlab-runner-tart-driver 0.3.1__tar.gz → 0.3.3__tar.gz

{gitlab-runner-tart-driver-0.3.1/gitlab_runner_tart_driver.egg-info → gitlab-runner-tart-driver-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-runner-tart-driver
-Version: 0.3.1
+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.3/gitlab_runner_tart_driver/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.3"

{gitlab-runner-tart-driver-0.3.1 → gitlab-runner-tart-driver-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):
@@ -67,9 +69,11 @@ class TartSshSession:
     def exec_ssh_command(self, command, get_pty=True):
         """Executes an ssh command and prints it's output continously to stdout/stderr"""
         _, stdout, stderr = self.ssh_client.exec_command(command, get_pty=get_pty)
-        for line in iter(lambda: stdout.readline(2048), ""):
+        stdout._set_mode("b")
+        stderr._set_mode("b")
+        for line in iter(lambda: stdout.readline(2048).decode("utf-8", "ignore"), ""):
             click.echo(line, nl=False)
-        for line in iter(lambda: stderr.readline(2048), ""):
+        for line in iter(lambda: stderr.readline(2048).decode("utf-8", "ignore"), ""):
             click.echo(line, nl=False, err=True)
         return stdout.channel.recv_exit_status()
 
@@ -124,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.1 → gitlab-runner-tart-driver-0.3.3/gitlab_runner_tart_driver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-runner-tart-driver
-Version: 0.3.1
+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.1 → gitlab-runner-tart-driver-0.3.3}/setup.py

@@ -10,7 +10,7 @@ this_directory = os.path.abspath(os.path.dirname(__file__))
 with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
-version = "0.3.1"
+version = "0.3.3"
 
 version = f"{version}{os.environ.get('PIP_VERSION_POSTFIX','')}"
 

gitlab-runner-tart-driver-0.3.1/gitlab_runner_tart_driver/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.1"