apexcodexpy 0.2.1__tar.gz → 0.2.2__tar.gz

{apexcodexpy-0.2.1 → apexcodexpy-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apexcodexpy
-Version: 0.2.1
+Version: 0.2.2
 Summary: The Non-Destructive Configuration Steward for Python Projects.
 License-File: LICENSE
 Author: Apex Dev

{apexcodexpy-0.2.1 → apexcodexpy-0.2.2}/codex/cli.py

@@ -230,9 +230,9 @@ def _(
     ),
 ) -> None:
     (
-        Codex(target=Path("./tests/integration"))
+        Codex(target=Path("."))
         .ci(on=ci)
-        .test()
+        .test_integration()
         .report(using=DefaultReporter())
         .exit(using=typer.Exit)
     )

{apexcodexpy-0.2.1 → apexcodexpy-0.2.2}/codex/service.py

@@ -8,34 +8,14 @@ from codex.tasks import ComboResult, DependabotYaml, PyProjectToml, TaskResult
 from codex.tools import MyPy, Pip, Poetry, Program, Ruff
 
 
-@dataclass(frozen=True)
-class CiMode:
-    codex: Codex
-
-    def lint(self) -> TaskResult:
-        return (
-            ComboResult()
-            .attach(install=self.codex.install())
-            .attach(lint=self.codex.lint())
-        )
-
-    def test(self) -> TaskResult:
-        return (
-            ComboResult()
-            .attach(install=self.codex.install())
-            .attach(pytest=Poetry().run(Pytest.on(self.codex.target).run()))
-        )
-
-
 @dataclass(frozen=True)
 class Codex:
     target: Path
 
-    def ci(self, on: bool) -> CiMode | Codex:
-        if on:
-            return CiMode(self)
+    in_ci: bool = False
 
-        return self
+    def ci(self, on: bool) -> Codex:
+        return Codex(self.target, in_ci=on)
 
     def sync(self, dry_run: bool = False) -> TaskResult:
         return (
@@ -45,10 +25,17 @@ class Codex:
         )
 
     def install(self) -> TaskResult:
+        return self._install(when=True)
+
+    def _install(self, when: bool) -> ComboResult:
         return (
-            ComboResult()
-            .attach(tools=Pip().install("pip", "poetry"))
-            .attach(dependencies=Poetry().install())
+            (
+                ComboResult()
+                .attach(tools=Pip().install("pip", "poetry"))
+                .attach(dependencies=Poetry().install())
+            )
+            if when
+            else ComboResult()
         )
 
     def lock(self) -> TaskResult:
@@ -59,7 +46,7 @@ class Codex:
 
     def lint(self) -> TaskResult:
         return (
-            ComboResult()
+            self._install(when=self.in_ci)
             .attach(poetry=Poetry().lint(self.target))
             .attach(black=Poetry().run(Ruff(on=self.target).format().flag(check=True)))
             .attach(ruff=Poetry().run(Ruff(on=self.target).lint()))
@@ -78,21 +65,16 @@ class Codex:
         )
 
     def test(self) -> TaskResult:
-        return ComboResult().attach(
-            pytest=Poetry().run(
-                Pytest.on(self.target).run(
-                    with_coverage=True,
-                    last_failed=True,
-                )
-            )
-        )
+        return self._install(when=self.in_ci).attach(self.test_unit())
+
+    def test_unit(self) -> TaskResult:
+        return CodexTest(self.target).ci(on=self.in_ci).unit()
+
+    def test_integration(self) -> TaskResult:
+        return CodexTest(self.target).integration()
 
     def test_behaviour(self) -> TaskResult:
-        return ComboResult().attach(
-            behave=Poetry().run(
-                Program("behave").append(self.target / "tests" / "features")
-            )
-        )
+        return CodexTest(self.target).behaviour()
 
     def build(self, tag: str) -> TaskResult:
         return (
@@ -121,6 +103,56 @@ class Codex:
         )
 
 
+@dataclass(frozen=True)
+class CodexTest:
+    target: Path
+
+    in_ci: bool = False
+
+    def ci(self, on: bool = False) -> CodexTest:
+        return CodexTest(self.target, in_ci=on)
+
+    def unit(self) -> TaskResult:
+        return ComboResult().attach(
+            pytest=Poetry().run(
+                Pytest.on(self.target).run(
+                    with_coverage=self._when_not_in_ci(),
+                    last_failed=self._when_not_in_ci(),
+                )
+            )
+        )
+
+    def _when_not_in_ci(self) -> bool | None:
+        return None if self.in_ci else True
+
+    def integration(self) -> TaskResult:
+        return (
+            ComboResult()
+            .attach(
+                setup=(
+                    ComboResult()
+                    .attach(tools=Pip().install("poetry", "poetry-plugin-export"))
+                    .attach(export=Poetry().export(self.target))
+                )
+            )
+            .attach(
+                pytest=Poetry().run(
+                    Pytest.on(self.target / "tests" / "integration").run()
+                )
+            )
+            .attach(
+                teardown=Program("rm").append(self.target / "requirements.txt").run()
+            )
+        )
+
+    def behaviour(self) -> TaskResult:
+        return ComboResult().attach(
+            behave=Poetry().run(
+                Program("behave").append(self.target / "tests" / "features")
+            )
+        )
+
+
 @dataclass(frozen=True)
 class Pytest:
     target: Path | None = None

{apexcodexpy-0.2.1 → apexcodexpy-0.2.2}/codex/tasks/result.py

@@ -37,10 +37,19 @@ class ComboResult:
 
     def attach(self, *args: TaskResult, **kwargs: TaskResult) -> ComboResult:
         for name, result in kwargs.items():
-            self.results.append(result.named(name))
+            self._attach_one(result.named(name))
 
         for result in args:
-            self.results.append(result)
+            self._attach_one(result)
+
+        return self
+
+    def _attach_one(self, result: TaskResult) -> ComboResult:
+        match result:
+            case ComboResult():
+                self.results.extend(result.results)
+            case _:
+                self.results.append(result)
 
         return self
 

{apexcodexpy-0.2.1 → apexcodexpy-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexcodexpy"
-version = "0.2.1"
+version = "0.2.2"
 description = "The Non-Destructive Configuration Steward for Python Projects."
 readme = "README.md"
 authors = [