wip

.gitpod.yml

@@ -1,13 +1,12 @@
 tasks:
   - name: CLI
     init: |
-      cd ./up_cli
+      cd ./upcli
       poetry install
       alias up='poetry run up'
     command: |
       echo "Ready at $(date)"
 
-
 vscode:
   extensions:
     - ms-azuretools.vscode-docker

install_all.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -ex
+
+rm -f */poetry.lock
+rm -rf /workspace/.pyenv_mirror/poetry/virtualenvs/*
+
+pushd uplib
+poetry config virtualenvs.create false
+poetry install -vvv 
+popd
+
+pushd up_ansible
+poetry config virtualenvs.create false
+poetry install  -vvv 
+popd
+
+pushd up_splat
+poetry install
+popd
+
+pushd upcli
+poetry install
+popd
+
+echo "done installing all"

up_ansible/up_ansible/run_for_prompt.py

@@ -1,13 +1,12 @@
-from uplib import hookimpl
-from uplib.match import match_prompt
-from uplib.containers import RunConfig
+import uplib as up
 
 def mk_run_config(prompt):
-    result = RunConfig(
+    result = up.RunConfig(
         image="cytopia/ansible:latest",
         command=prompt)
     return result
 
-@hookimpl
+
+@up.hookimpl
 def run_for_prompt(prompt):
-    return match_prompt(mk_run_config, prompt, "ansible")
+    return up.match_prompt(mk_run_config, prompt, "ansible")

up_splat/up_splat/run_for_prompt.py

@@ -1,15 +1,13 @@
-from uplib import hookimpl
-from uplib.match import match_prompt
-from uplib.containers import RunConfig
+import uplib as up
 
 
 def mk_run_config(prompt):
-    result = RunConfig(
+    result = up.RunConfig(
         image="fedora",
         command=['echo', 'Thanks for trying UP: '] + prompt)
     return result
 
-@hookimpl
+@up.hookimpl
 def run_for_prompt(prompt):
-    return match_prompt(mk_run_config, prompt, "splat")
+    return up.match_prompt(mk_run_config, prompt, "splat")
 

uplib/uplib/__init__.py

@@ -1,12 +1,23 @@
 import pluggy
 from typing import TypeAlias
 
-Context:TypeAlias = dict[str, str]
-Prompt:TypeAlias = list[str]
+
+Context: TypeAlias = dict[str, str]
+Prompt: TypeAlias = list[str]
 
 
 hookspec = pluggy.HookspecMarker("up")
 hookimpl = pluggy.HookimplMarker("up")
 pm = pluggy.PluginManager("up")
 
+from .match import does_match, match_prompt
+from .containers import RunConfig
 
+__all__ = [Context,
+           Prompt,
+           RunConfig,
+           hookspec,
+           hookimpl,
+           pm,
+           does_match,
+           match_prompt]

uplib/uplib/match.py

@@ -3,19 +3,21 @@
 from typing import Callable
 from .containers import RunConfig
 
+
 def does_match(prompt: Prompt, args) -> bool:
     for p, a in zip(prompt, args):
         if p != a:
             return False
     return True
 
+
 def match_prompt(mk_run_config: Callable[[], RunConfig],
-                 prompt: Prompt, 
+                 prompt: Prompt,
                  *args) -> list[RunConfig]:
     if not prompt:
         return None
     if does_match(prompt, args):
         log.info(f"MATCH: prompt={prompt}, args={args}")
         return [mk_run_config(prompt)]
     log.info(f"NO MATCH: prompt={prompt}, args={args}")
-    return None
+    return None

uplib/uplib/plugins.py

@@ -3,10 +3,11 @@
 import pkgutil
 import pluggy
 
-from . import  hookspec
+from . import hookspec
 from .containers import Containers
 from .hookspecs import run_for_prompt
 
+
 def load_plugins(context):
     log.info("Loading plugins")
     discovered_plugins = {
@@ -15,9 +16,10 @@ def load_plugins(context):
         in pkgutil.iter_modules()
         if name.startswith('up_')
     }
-    log.info("Discovered %s plugins: %s", len(discovered_plugins), discovered_plugins)
+    log.info("Discovered %s plugins: %s", len(
+        discovered_plugins), discovered_plugins)
     # create a manager and add the spec
     #    pm.load_setuptools_entrypoints("up")
     # pm.add_hookspecs(hookspec)
-    log.debug("Plugins loaded.") 
-    log.debug(str(pm.get_plugins()))
+    # log.debug("Plugins loaded.")
+    # log.debug(str(pm.get_plugins()))