apexcodexpy 0.2.1__tar.gz → 0.2.3__tar.gz

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

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

apexcodexpy-0.2.3/codex/runner.py

@@ -0,0 +1,7 @@
+from codex.typer import root_cli, testing_cli
+
+
+def cli() -> None:
+    root_cli.add_typer(testing_cli, name="test", short_help="Run tests.")
+
+    root_cli()

{apexcodexpy-0.2.1 → apexcodexpy-0.2.3}/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.3}/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.3/codex/typer/__init__.py

@@ -0,0 +1,7 @@
+from codex.typer.root import cli as root_cli
+from codex.typer.testing import cli as testing_cli
+
+__all__ = [
+    "root_cli",
+    "testing_cli",
+]

apexcodexpy-0.2.1/codex/cli.py → apexcodexpy-0.2.3/codex/typer/root.py

@@ -1,255 +1,192 @@
-from __future__ import annotations
-
-from pathlib import Path
-
-import typer
-
-from codex.reporters import DefaultReporter
-from codex.service import Codex, Git
-
-cli = typer.Typer(no_args_is_help=True)
-
-
-@cli.command(
-    name="sync",
-    help="Inject standards into pyproject TOML file.",
-)
-def _(
-    path: str = typer.Option(
-        ".",
-        "--path",
-        "-p",
-        help="Target directory.",
-    ),
-    dry_run: bool = typer.Option(
-        False,
-        "--dry-run",
-        help="Show changes without applying them.",
-    ),
-) -> None:
-    (
-        Codex(target=Path(path))
-        .sync(dry_run=dry_run)
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@cli.command(
-    name="install",
-    help="Install project tools and dependencies.",
-)
-def _(
-    path: str = typer.Option(
-        ".",
-        "--path",
-        "-p",
-        help="Target directory.",
-    ),
-) -> None:
-    (
-        Codex(target=Path(path))
-        .install()
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@cli.command(
-    name="lock",
-    help="Lock project dependencies.",
-)
-def _() -> None:
-    (
-        Codex(target=Path("."))
-        .lock()
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@cli.command(
-    name="update",
-    help="Update project dependencies.",
-)
-def _() -> None:
-    (
-        Codex(target=Path("."))
-        .update()
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@cli.command(
-    name="build",
-    help="Build a Docker image.",
-)
-def _(
-    tag: str = typer.Option(
-        ...,
-        "--tag",
-        "-t",
-        help="Target tag, e.g. my-project:latest",
-    ),
-    path: str = typer.Option(
-        ".",
-        "--path",
-        "-p",
-        help="Target directory.",
-    ),
-) -> None:
-    (
-        Codex(target=Path(path))
-        .build(tag=tag)
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@cli.command(
-    name="lint",
-    help="Run linting (Ruff) and type checking (MyPy).",
-)
-def _(
-    path: str = typer.Option(
-        ".",
-        "--path",
-        "-p",
-        help="Target directory.",
-    ),
-    ci: bool = typer.Option(
-        False,
-        "--ci",
-        help="Run in CI mode.",
-    ),
-    silent: bool = typer.Option(
-        False,
-        "--silent",
-        "-s",
-        help="Suppress output.",
-    ),
-) -> None:
-    (
-        Codex(target=Path(path))
-        .ci(on=ci)
-        .lint()
-        .silenced(when=silent)
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@cli.command(
-    name="fix",
-    help="Automatically fix Ruff linting errors.",
-)
-def _(
-    path: str = typer.Option(
-        ".",
-        "--path",
-        "-p",
-        help="Target directory.",
-    ),
-    silent: bool = typer.Option(
-        False,
-        "--silent",
-        "-s",
-        help="Suppress output.",
-    ),
-    unsafe: bool = typer.Option(
-        False,
-        "--unsafe",
-        help="Run unsafe Ruff fixes.",
-    ),
-) -> None:
-    (
-        Codex(target=Path(path))
-        .fix(unsafe=unsafe)
-        .silenced(when=silent)
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@cli.command(
-    name="amend",
-    help="Amend the last git commit without changing the message.",
-)
-def _() -> None:
-    Git().amend().report(using=DefaultReporter()).exit(using=typer.Exit)
-
-
-test_cli = typer.Typer()
-cli.add_typer(test_cli, name="test", short_help="Run tests.")
-
-
-@test_cli.callback(invoke_without_command=True)
-def _(ctx: typer.Context) -> None:
-    if ctx.invoked_subcommand is not None:
-        return
-
-    run_unit_tests(path=".", ci=False)
-
-
-@test_cli.command(
-    name="unit",
-    help="Run programmer tests.",
-)
-def run_unit_tests(
-    path: str = typer.Option(
-        ".",
-        "--path",
-        "-p",
-        help="Target directory.",
-    ),
-    ci: bool = typer.Option(
-        False,
-        "--ci",
-        help="Run in CI mode.",
-    ),
-) -> None:
-    (
-        Codex(target=Path(path))
-        .ci(on=ci)
-        .test()
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@test_cli.command(
-    name="integration",
-    help="Run integration tests.",
-)
-def _(
-    ci: bool = typer.Option(
-        False,
-        "--ci",
-        help="Run in CI mode.",
-    ),
-) -> None:
-    (
-        Codex(target=Path("./tests/integration"))
-        .ci(on=ci)
-        .test()
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-@test_cli.command(
-    name="behaviour",
-    help="Run behaviour tests.",
-)
-def _() -> None:
-    (
-        Codex(target=Path("."))
-        .test_behaviour()
-        .report(using=DefaultReporter())
-        .exit(using=typer.Exit)
-    )
-
-
-if __name__ == "__main__":
-    cli()
+from pathlib import Path
+
+import typer
+
+from codex.reporters import DefaultReporter
+from codex.service import Codex, Git
+
+cli = typer.Typer(no_args_is_help=True)
+
+
+@cli.command(
+    name="sync",
+    help="Inject standards into pyproject TOML file.",
+)
+def _(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+    dry_run: bool = typer.Option(
+        False,
+        "--dry-run",
+        help="Show changes without applying them.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .sync(dry_run=dry_run)
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="install",
+    help="Install project tools and dependencies.",
+)
+def _(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .install()
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="lock",
+    help="Lock project dependencies.",
+)
+def _(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .lock()
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="update",
+    help="Update project dependencies.",
+)
+def _(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .update()
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="build",
+    help="Build a Docker image.",
+)
+def _(
+    tag: str = typer.Option(
+        ...,
+        "--tag",
+        "-t",
+        help="Target tag, e.g. my-project:latest",
+    ),
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .build(tag=tag)
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="lint",
+    help="Run linting (Ruff) and type checking (MyPy).",
+)
+def _(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+    ci: bool = typer.Option(
+        False,
+        "--ci",
+        help="Run in CI mode.",
+    ),
+    silent: bool = typer.Option(
+        False,
+        "--silent",
+        "-s",
+        help="Suppress output.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .ci(on=ci)
+        .lint()
+        .silenced(when=silent)
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="fix",
+    help="Automatically fix Ruff linting errors.",
+)
+def _(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+    silent: bool = typer.Option(
+        False,
+        "--silent",
+        "-s",
+        help="Suppress output.",
+    ),
+    unsafe: bool = typer.Option(
+        False,
+        "--unsafe",
+        help="Run unsafe Ruff fixes.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .fix(unsafe=unsafe)
+        .silenced(when=silent)
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="amend",
+    help="Amend the last git commit without changing the message.",
+)
+def _() -> None:
+    Git().amend().report(using=DefaultReporter()).exit(using=typer.Exit)

apexcodexpy-0.2.3/codex/typer/testing.py

@@ -0,0 +1,94 @@
+from pathlib import Path
+
+import typer
+
+from codex.reporters import DefaultReporter
+from codex.service import Codex
+
+cli = typer.Typer()
+
+
+@cli.command(
+    name="unit",
+    help="Run programmer tests.",
+)
+def run_unit_tests(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+    ci: bool = typer.Option(
+        False,
+        "--ci",
+        help="Run in CI mode.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .ci(on=ci)
+        .test()
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="integration",
+    help="Run integration tests.",
+)
+def _(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+    ci: bool = typer.Option(
+        False,
+        "--ci",
+        help="Run in CI mode.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .ci(on=ci)
+        .test_integration()
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.command(
+    name="behaviour",
+    help="Run behaviour tests.",
+)
+def _(
+    path: str = typer.Option(
+        ".",
+        "--path",
+        "-p",
+        help="Target directory.",
+    ),
+    ci: bool = typer.Option(
+        False,
+        "--ci",
+        help="Run in CI mode.",
+    ),
+) -> None:
+    (
+        Codex(target=Path(path))
+        .ci(on=ci)
+        .test_behaviour()
+        .report(using=DefaultReporter())
+        .exit(using=typer.Exit)
+    )
+
+
+@cli.callback(invoke_without_command=True)
+def _(ctx: typer.Context) -> None:
+    if ctx.invoked_subcommand is not None:
+        return
+
+    run_unit_tests(path=".", ci=False)

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

@@ -1,6 +1,6 @@
 [project]
 name = "apexcodexpy"
-version = "0.2.1"
+version = "0.2.3"
 description = "The Non-Destructive Configuration Steward for Python Projects."
 readme = "README.md"
 authors = [
@@ -10,7 +10,7 @@ dynamic = ["dependencies"]
 requires-python = ">=3.11"
 
 [project.scripts]
-codex = "codex.cli:cli"
+codex = "codex.runner:cli"
 
 [tool.poetry]
 packages = [