Runner skeleton

alice-ci/src/alice/cli.py

@@ -6,6 +6,40 @@ from alice.configparser import ConfigParser
 from alice.exceptions import ConfigException, NonZeroRetcode, RunnerError
 
 
+class ConfigHolder:
+    __instance = None
+    file_name = ".alice"
+
+    @staticmethod
+    def getInstance():
+        """ Static access method. """
+        if ConfigHolder.__instance is None:
+            ConfigHolder()
+        return ConfigHolder.__instance
+
+    def __init__(self):
+        """ Virtually private constructor. """
+        if ConfigHolder.__instance is not None:
+            raise Exception("This class is a singleton!")
+        else:
+            ConfigHolder.__instance = self
+            config = os.path.abspath(os.path.join(os.getcwd(), self.file_name))
+            self.vars = {}
+            if os.path.isfile(config):
+                with open(config) as f:
+                    for line in f:
+                        items = line.split("=")
+                        if len(items) > 1:
+                            self.vars[items[0]] = line.replace(f"{items[0]}=", "")
+            logging.debug(f"Loaded from {self.file_name}: {self.vars}")
+
+    def get(self, key):
+        try:
+            self.vars[key]
+        except KeyError:
+            raise ConfigException(f"{key} not defined in .conf!")
+
+
 def gen_env(param_list):
     env_vars = {}
     for item in param_list:

alice-ci/src/alice/runnerfactory.py

@@ -3,6 +3,7 @@ from os.path import join, abspath
 
 from alice.runners.pythonrunner import PythonRunner
 from alice.runners.pypirunner import PyPiRunner
+from alice.runners.dockerrunner import DockerRunner
 from alice.exceptions import ConfigException
 
 
@@ -21,7 +22,8 @@ class Factory():
         # module = __import__("module_file")
         # my_class = getattr(module, "class_name")
         self.runnertypes = {"python": PythonRunner,
-                            "pypi": PyPiRunner}
+                            "pypi": PyPiRunner,
+                            "docker": DockerRunner}
 
         logging.info(f"[Alice] Available runners: {'|'.join(self.runnertypes.keys())}")
 

alice-ci/src/alice/runners/dockerrunner.py

@@ -1 +1,19 @@
 # TODO Implement
+class DockerConfig:
+    def __init__(self, config={}) -> None:
+        pass
+
+    def copy(self, job_config):
+        pass
+
+
+# Supported tasks:
+#  - Build image
+#  - Push image to repo
+#  - Run arbitrary code in image
+class DockerRunner():
+    def __init__(self) -> None:
+        pass
+
+    def run(self, job_spec):
+        pass

alice-ci/src/alice/runners/pypirunner.py

@@ -7,17 +7,10 @@ import sys
 from urllib import request, error
 from pkg_resources import parse_version
 from os import environ, path
-from alice.runners.pyutils import PackageManager, glob
+from alice.runners.pyutils import PackageManager, glob, grab_from
 from alice.exceptions import ConfigException, RunnerError
 
 
-def grab_from(target):
-    if "from_env" in target:
-        return environ[target["from_env"]]
-    else:
-        raise ConfigException(f"Unsupported grabber: {target.keys()}")
-
-
 def get_uri(config, default):
     url = config.get("repo", {}).get("uri", default)
     if url is not None:

alice-ci/src/alice/runners/pyutils.py

@@ -6,6 +6,7 @@ from pkg_resources import parse_version
 import re
 
 from alice.exceptions import RunnerError, ConfigException
+from alice.cli import ConfigHolder
 
 
 class PackageManager:
@@ -24,7 +25,7 @@ class PackageManager:
             raise Exception("This class is a singleton!")
         else:
             PackageManager.__instance = self
-        self.package_list = self.__get_packages()
+            self.package_list = self.__get_packages()
 
     def __get_packages(self):
         packages = {}
@@ -111,3 +112,15 @@ def glob_command(command, workdir):
     for item in command:
         new_command += glob(item, workdir)
     return new_command
+
+
+def grab_from(target):
+    if "from_env" in target:
+        try:
+            return os.environ[target["from_env"]]
+        except KeyError:
+            raise ConfigException(f"Env var unset: {target['from_env']}")
+    elif "from_cfg" in target:
+        ConfigHolder.getInstance().get(target["from_cfg"])
+    else:
+        raise ConfigException(f"Unsupported grabber: {target.keys()}")

ci-examples/full.yaml

@@ -15,6 +15,8 @@ runners:
     dependencies:
       - flake8
       - build
+  docker:
+    credentials:
 jobs:
   - name: env
     type: python
@@ -46,6 +48,19 @@ jobs:
         from_env: PYPIPASS
     packages:
      - alice-ci
+  - name: image
+    type: docker
+    image:
+      credentials:
+        user:
+          from_env: DOCKERUSER
+        pass:
+          from_env: DOCKERPASS
+      name: python:latest
+      build_dir: ci-examples/docker
+    commands:
+      - python3 --version
+    
 pipelines:
   default:
     - lint

docs/runners/docker.md

@@ -0,0 +1,25 @@
+# Schema
+
+```
+name: ""
+type: docker
+credentials: - global ...ish
+  user
+  pass
+image: - to use, pull, run
+  credentials:
+  build:
+    dir:
+    dockerfile:
+    name:
+    args:
+      - name:
+      - value:
+  name: - pulls, current working image - mutually exclusive with build
+command: - overwrite, not append
+  - ...
+tag:
+  publish: true
+  name: - published name with repo and everything
+  credentials:
+```