9-hotfix - Fix #9 (#10)

Co-authored-by: gyulaid <gyulaid@gyulai.cloud>
Reviewed-on: #10
Co-authored-by: Daniel Gyulai <gyulaid@gyulai.cloud>
Co-committed-by: Daniel Gyulai <gyulaid@gyulai.cloud>

alice-ci/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = alice-ci
-version = 0.0.2
+version = 0.0.3
 author = Daniel Gyulai
 description = Alice CI framework
 long_description = file: README.md

alice-ci/src/alice/__init__.py

@@ -1,5 +1,11 @@
 # flake8: noqa F401
-from .cli import App
+from alice.utils import ConfigParser
-from .jobparser import Job, JobParser
+from alice.exceptions import NonZeroRetcode
-from .exceptions import NonZeroRetcode
+from alice.runnerfactory import Factory
-from .pythonrunner import PythonRunner
+from alice.runners.pythonrunner import PythonRunner
+from alice.exceptions import NonZeroRetcode
+from alice.exceptions import RunnerError
+from alice.exceptions import ConfigException
+from alice.__main__ import main
+
+name = "alice"

alice-ci/src/alice/__main__.py

@@ -1,3 +1,3 @@
-from cli import main
+from alice.cli import main
 
 main()

alice-ci/src/alice/cli.py

@@ -1,9 +1,9 @@
 import os
 import argparse
 
-from utils import ConfigParser
+from alice.utils import ConfigParser
-from runnerfactory import Factory
+from alice.runnerfactory import Factory
-from exceptions import ConfigException, NonZeroRetcode, RunnerError
+from alice.exceptions import ConfigException, NonZeroRetcode, RunnerError
 
 
 def gen_env(self, param_list):

alice-ci/src/alice/runnerfactory.py

@@ -1,6 +1,8 @@
-from runners.pythonrunner import PythonRunner
 from os import getcwd
 
+from alice.runners.pythonrunner import PythonRunner
+from alice.exceptions import ConfigException
+
 
 class Factory():
     def __init__(self) -> None:
@@ -30,5 +32,8 @@ class Factory():
 
     def get_runner(self, runnertype):
         if runnertype not in self.runners:
-            self.runners[runnertype] = self.runnertypes[runnertype](self.workdir, self.globals)
+            if runnertype in self.runnertypes:
+                self.runners[runnertype] = self.runnertypes[runnertype](self.workdir, self.globals)
+            else:
+                raise ConfigException(f"Invalid runner type: {runnertype}")
         return self.runners[runnertype]

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

@@ -0,0 +1,3 @@
+from alice.runners.pythonrunner import PythonRunner
+
+__all__ = ["PythonRunner"]

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

@@ -3,7 +3,7 @@ import os
 import sys
 import shlex
 
-from exceptions import NonZeroRetcode, RunnerError, ConfigException
+from alice.exceptions import NonZeroRetcode, RunnerError, ConfigException
 
 
 # same venv across all runs!

alice-ci/src/alice/utils.py

@@ -1,41 +1,6 @@
 import yaml
-from runners.pythonrunner import PythonRunner
-from exceptions import NonZeroRetcode, ConfigException
 
-
+from alice.exceptions import ConfigException
-class DummyRunner():
-    def __init__(self, type) -> None:
-        self.type = type
-
-    def run(self, command, workdir=None, env=None):
-        raise Exception(f"Invalid runner type in config: {self.type}")
-
-
-class Job():
-    def __init__(self, type, repoDir, vpython, workspace, env={}) -> None:
-        self.runner = self.__get_runner(type, repoDir, vpython)
-        self.commands = []
-        self.workspace = workspace
-        self.env = env
-
-    def __get_runner(self, type, repoDir, vpython):
-        if type == "python":
-            return PythonRunner(repoDir, vpython)
-        else:
-            return DummyRunner(type)
-
-    def run_commands(self, _env={}):
-        try:
-            if self.env is None:
-                env = _env.copy()
-            else:
-                env = self.env.copy()
-                env.update(_env)
-            for command in self.commands:
-                self.runner.run(command, self.workspace, env)
-        except NonZeroRetcode as n:
-            print(n)
-            exit(1)
 
 
 class ConfigParser: