no positional args in dev

Author: gilesknap

src/epics_containers_cli/dev/dev_cli.py

@@ -57,7 +57,13 @@ def launch_local(
     IOC project folder.
     """
     DevCommands().launch_local(
-        ioc_instance, generic_ioc, execute, target, tag, args, ioc_name
+        ioc_instance=ioc_instance,
+        generic_ioc=generic_ioc,
+        execute=execute,
+        target=target,
+        tag=tag,
+        args=args,
+        ioc_name=ioc_name,
     )
 
 
@@ -93,7 +99,15 @@ def launch(
     instances. You may find the devcontainer a more convenient way to
     do this.
     """
-    DevCommands().launch(ioc_instance, execute, target, image, tag, args, ioc_name)
+    DevCommands().launch(
+        ioc_instance=ioc_instance,
+        execute=execute,
+        target=target,
+        image=image,
+        tag=tag,
+        args=args,
+        ioc_name=ioc_name,
+    )
 
 
 @dev.command()
@@ -110,7 +124,7 @@ def debug_last(
     Useful for debugging failed builds - if the last build failed it will
     start the container after the most recent successful build step.
     """
-    DevCommands().debug_last(generic_ioc, mount_repos)
+    DevCommands().debug_last(generic_ioc=generic_ioc, mount_repos=mount_repos)
 
 
 @dev.command()
@@ -133,7 +147,7 @@ def versions(
     or the local project folder (defaults to .) e.g.
         ec dev versions ../ioc-template
     """
-    DevCommands().versions(generic_ioc, arch, image)
+    DevCommands().versions(generic_ioc=generic_ioc, arch=arch, image=image)
 
 
 @dev.command()
@@ -146,24 +160,24 @@ def stop(
     """
     Stop a running local IOC container
     """
-    DevCommands().stop(ioc_name)
+    DevCommands().stop(ioc_name=ioc_name)
 
 
 @dev.command()
 def exec(
     ctx: typer.Context,
-    ioc_name: str = typer.Option(
-        IOC_NAME, help="container name override. Use to run multiple instances"
-    ),
     command: str = typer.Argument(
         "bash", help="command to execute inside the container must be 'single quoted'"
     ),
+    ioc_name: str = typer.Option(
+        IOC_NAME, help="container name override. Use to run multiple instances"
+    ),
     args: str = typer.Option("", help="Additional args for exec, 'must be quoted'"),
 ):
     """
     Execute a command inside a running local IOC container
     """
-    DevCommands().exec(ioc_name, command, args)
+    DevCommands().exec(ioc_name=ioc_name, command=command, args=args)
 
 
 @dev.command()
@@ -180,7 +194,7 @@ def wait_pv(
     """
     Execute a command inside a running local IOC container
     """
-    DevCommands().wait_pv(pv_name, ioc_name, attempts)
+    DevCommands().wait_pv(pv_name=pv_name, ioc_name=ioc_name, attempts=attempts)
 
 
 @dev.command()
@@ -206,13 +220,13 @@ def build(
     Builds both developer and runtime targets.
     """
     DevCommands().build(
-        generic_ioc,
-        tag,
-        arch,
-        platform,
-        cache,
-        cache_from,
-        cache_to,
-        push,
-        rebuild,
+        generic_ioc=generic_ioc,
+        tag=tag,
+        arch=arch,
+        platform=platform,
+        cache=cache,
+        cache_from=cache_from,
+        cache_to=cache_to,
+        push=push,
+        rebuild=rebuild,
     )

src/epics_containers_cli/dev/dev_commands.py

@@ -1,6 +1,5 @@
 import time
 from pathlib import Path
-from subprocess import CalledProcessError
 from typing import Optional
 
 import typer
@@ -158,23 +157,21 @@ def stop(self, ioc_name: str):
         """
         self.docker.stop(ioc_name)
 
-    def exec(self, command: str, ioc_name: str, args: str = ""):
+    def exec(self, ioc_name: str, command: str, args: str = ""):
         """
         execute a command in a locally running container
         """
-        self.docker.exec(command, ioc_name, args)
+        self.docker.exec(container=ioc_name, command=command, args=args)
 
     def wait_pv(self, pv_name: str, ioc_name: str, attempts: int):
         """
         wait for a local IOC instance to start by monitoring for a PV
         """
         for i in range(attempts):
-            try:
-                cmd = f"caget {pv_name}"
-                result = self.docker.exec(ioc_name, cmd, interactive=False)
-            except CalledProcessError:
-                pass  # assume the IOC is not running yet
-
+            cmd = f"caget {pv_name}"
+            result = self.docker.exec(
+                container=ioc_name, command=cmd, interactive=False, errorOK=True
+            )
             if str(result).startswith(pv_name):
                 break
             time.sleep(1)

src/epics_containers_cli/docker.py

@@ -133,7 +133,12 @@ def build(
         run_command(f"{cmd} build --target {target}{t_arch} {args} -t {name} {context}")
 
     def exec(
-        self, container: str, command: str, args: str = "", interactive: bool = True
+        self,
+        container: str,
+        command: str,
+        args: str = "",
+        interactive: bool = True,
+        errorOK: bool = False,
     ):
         """
         execute a command in a local IOC instance
@@ -143,6 +148,7 @@ def exec(
         result = run_command(
             f'{self.docker} exec {args}{container} bash -c "{command}"',
             interactive=interactive,
+            error_OK=errorOK,
         )
         return result