wip

up_ansible/up_ansible/__init__.py

@@ -1,4 +1,4 @@
 from uplib import pm
-from . import run_for_prompt
+from . import containers_for_prompt
 
-pm.register(run_for_prompt)
+pm.register(containers_for_prompt)

up_ansible/up_ansible/containers_for_prompt.py

@@ -0,0 +1,11 @@
+import uplib as up
+
+def run_container(prompt):
+    return up.ContainerRun(
+        image="cytopia/ansible:latest",
+        command=prompt)
+
+
+@up.hookimpl
+def containers_for_prompt(prompt):
+    return up.if_prompt_matches(run_container, prompt, "ansible")

up_splat/up_splat/__init__.py

@@ -1,4 +1,4 @@
 from uplib import pm
-from up_splat import run_for_prompt
+from up_splat import containers_for_prompt
 
-pm.register(run_for_prompt)
+pm.register(containers_for_prompt)

up_splat/up_splat/containers_for_prompt.py

@@ -0,0 +1,13 @@
+import uplib as up
+
+
+def create_containers(prompt):
+    result = up.ContainerRun(
+        image="fedora",
+        command=['echo', 'Thanks for trying UP: '] + prompt)
+    return result
+
+@up.hookimpl
+def containers_for_prompt(prompt):
+    return up.if_prompt_matches(create_containers, prompt, "splat")
+

upcli/up/main.py

@@ -4,9 +4,8 @@
 import shlex
 
 from uplib import pm, Context, Prompt
-from uplib.containers import Containers, RunConfig
+from uplib.containers import Containers, ContainerRun
 from uplib.plugins import load_plugins
-from uplib.match import match_prompt
 
 containers = Containers()
 
@@ -56,19 +55,19 @@ def up(context: Context, prompt: Prompt):
         containers.run(run_config)
 
 
-def run_configs_for_prompt(prompt) -> list[RunConfig]:
+def run_configs_for_prompt(prompt) -> list[ContainerRun]:
     from_plugins = run_configs_from_plugins(prompt)
     from_configs = run_configs_from_dynaconf(prompt)
     result = from_plugins + from_configs
     return result
 
 
-def run_configs_from_dynaconf(prompt: list[str]) -> list[RunConfig]:
+def run_configs_from_dynaconf(prompt: list[str]) -> list[ContainerRun]:
     return []
 
 
-def run_configs_from_plugins(prompt: list[str]) -> list[RunConfig]:
-    results = pm.hook.run_for_prompt(prompt=prompt)
+def run_configs_from_plugins(prompt: list[str]) -> list[ContainerRun]:
+    results = pm.hook.containers_for_prompt(prompt=prompt)
     result = sum(results, [])
     if not result:
         result = []

uplib/uplib/__init__.py

@@ -10,14 +10,15 @@
 hookimpl = pluggy.HookimplMarker("up")
 pm = pluggy.PluginManager("up")
 
-from .match import does_match, match_prompt
-from .containers import RunConfig
+from .match import does_match, if_prompt_matches
+from .containers import ContainerRun, ContainerRuns
 
 __all__ = [Context,
            Prompt,
-           RunConfig,
+           ContainerRun,
+           ContainerRuns,
            hookspec,
            hookimpl,
            pm,
            does_match,
-           match_prompt]
+           if_prompt_matches]

uplib/uplib/containers.py

@@ -6,7 +6,7 @@
 
 # https://docker-py.readthedocs.io/en/stable/containers.html
 @dataclass
-class RunConfig:
+class ContainerRun:
     name: str = field(kw_only=True, default="")
     image: str = field(kw_only=True, default="")
     command: list[str]  = field(kw_only=True, default_factory=list)
@@ -16,11 +16,11 @@ class RunConfig:
     auto_remove: bool  = field(kw_only=True, default=True)
     network_mode: str  = field(kw_only=True, default="host")
 
-RunConfigs:TypeAlias = list[RunConfig]
+ContainerRuns:TypeAlias = list[ContainerRun]
 
 
 class DockerContainers:
-    def run(self, run: RunConfig):
+    def run(self, run: ContainerRun):
         log.debug("Running container: %s", run)
         client = docker.from_env()
         #TODO: Catch errors, print properly, pass all params
@@ -44,5 +44,5 @@ def run(self, run: RunConfig):
 class Containers:
     delegate = DockerContainers()
 
-    def run(self, run: RunConfig):
+    def run(self, run: ContainerRun):
         self.delegate.run(run)

uplib/uplib/hookspecs.py

@@ -1,8 +1,6 @@
-import pluggy
-from . import Prompt, hookspec
-from .containers import RunConfigs
+from . import hookspec, Prompt, ContainerRuns
 
 
 @hookspec(firstresult=True)
-def run_for_prompt(prompt: Prompt) -> RunConfigs:
+def containers_for_prompt(prompt: Prompt) -> ContainerRuns:
     """Present run configurations to execute for prompt"""

uplib/uplib/match.py

@@ -1,7 +1,7 @@
 import logging as log
 from . import Prompt
 from typing import Callable
-from .containers import RunConfig
+from .containers import ContainerRun
 
 
 def does_match(prompt: Prompt, args) -> bool:
@@ -11,9 +11,9 @@ def does_match(prompt: Prompt, args) -> bool:
     return True
 
 
-def match_prompt(mk_run_config: Callable[[], RunConfig],
+def if_prompt_matches(mk_run_config: Callable[[], ContainerRun],
                  prompt: Prompt,
-                 *args) -> list[RunConfig]:
+                 *args) -> list[ContainerRun]:
     if not prompt:
         return None
     if does_match(prompt, args):

uplib/uplib/plugins.py

@@ -5,7 +5,7 @@
 
 from . import hookspec
 from .containers import Containers
-from .hookspecs import run_for_prompt
+from .hookspecs import containers_for_prompt
 
 
 def load_plugins(context):