Refactor CLI into separate files

.gitignore

@@ -22,3 +22,6 @@ devenv.local.nix
 # IntelliJ
 .idea/
 .fleet/
+
+# Output from Karsk
+output/

pyproject.toml

@@ -27,7 +27,7 @@ dev = [
 ]
 
 [project.scripts]
-deploy = "deploy.__main__:cli"
+deploy = "deploy.cli:cli"
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"

src/deploy/cli.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+import click
+
+from deploy.commands.build import subcommand_build
+from deploy.commands.sync import subcommand_sync
+from deploy.commands.test import subcommand_test
+
+
+@click.group()
+def cli() -> None:
+    pass
+
+
+cli.add_command(subcommand_build)
+cli.add_command(subcommand_sync)
+cli.add_command(subcommand_test)
+
+
+if __name__ == "__main__":
+    cli()

src/deploy/build.py → src/deploy/commands/build.py

@@ -12,7 +12,9 @@
 from tempfile import NamedTemporaryFile, TemporaryDirectory
 import shutil
 
-from deploy.config import Config, GitConfig
+import click
+
+from deploy.config import Config, GitConfig, load_config
 from deploy.package import Package
 from deploy.package_list import PackageList
 from deploy.utils import redirect_output
@@ -239,3 +241,31 @@ def _create_wrapper_script(
 
         wrapper_script.write_text(script_content)
         wrapper_script.chmod(0o755)
+
+
+@click.command("build", help="Build Cirrus and dependencies")
+@click.argument(
+    "config-file",
+    type=Path,
+)
+@click.option(
+    "--prefix",
+    default="./output/prefix",
+    type=Path,
+)
+@click.option(
+    "--force",
+    "-f",
+    is_flag=True,
+    default=False,
+    help="Force adding a new environment even if one already exists (rollback)",
+)
+def subcommand_build(config_file: Path, prefix: Path, force: bool) -> None:
+    config = load_config(config_file)
+    builder = Build(
+        config_file.parent,
+        config,
+        force=force,
+        prefix=prefix,
+    )
+    builder.build()

src/deploy/sync.py → src/deploy/commands/sync.py

@@ -8,7 +8,9 @@
 import asyncio
 from pathlib import Path
 
-from deploy.config import Config, AreaConfig
+import click
+
+from deploy.config import Config, AreaConfig, load_config
 from deploy.package_list import PackageList
 from deploy.utils import redirect_output
 
@@ -191,3 +193,37 @@ def do_sync(
     dry_run: bool = False,
 ) -> None:
     asyncio.run(_sync(configpath, config, prefix, dest_prefix, no_async, dry_run))
+
+
+@click.command("sync", help="Synchronise all locations")
+@click.argument(
+    "config-file",
+    type=Path,
+)
+@click.option(
+    "--prefix",
+    default="./output/prefix",
+    type=Path,
+)
+@click.option(
+    "--no-async",
+    help="Don't deploy asynchronously",
+    is_flag=True,
+    default=False,
+)
+@click.option(
+    "--dry-run",
+    is_flag=True,
+    default=False,
+)
+def subcommand_sync(
+    config_file: Path, prefix: Path, no_async: bool, dry_run: bool
+) -> None:
+    config = load_config(config_file)
+    do_sync(
+        config_file.parent,
+        config,
+        prefix=prefix,
+        no_async=no_async,
+        dry_run=dry_run,
+    )