unity-devkit 0.1.16__tar.gz → 0.1.18__tar.gz

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: unity-devkit
-Version: 0.1.16
+Version: 0.1.18
 Summary: Unity build, license, and CI tooling
 Requires-Python: >=3.13
 Requires-Dist: bashrun>=0.1.0

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unity-devkit"
-version = "0.1.16"
+version = "0.1.18"
 description = "Unity build, license, and CI tooling"
 requires-python = ">=3.13"
 dependencies = [

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/build_unity.py

@@ -9,7 +9,7 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def build_unity(
-    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
+    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
     build: Annotated[str, typer.Option(help="Build target from the project's builds list (e.g. AndroidMobile)")],
     version: Annotated[
         str,

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/ci_build_unity.py

@@ -63,7 +63,7 @@ def ci_build_unity(
         unity_project_path = resolve_unity_project(project).path
         if unity_project_path.resolve() != project_path.resolve():
             raise SystemExit(
-                f"--project-path {project_path} does not match catalog entry '{project}' at {unity_project_path}"
+                f"--project-path {project_path} does not match discovered project '{project}' at {unity_project_path}"
             )
 
     with ci_step(f"Build {project} [{platform}]"):

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/compile_check_unity.py

@@ -11,7 +11,7 @@ COMPILE_ERROR_SIGNATURES = ("error CS",)
 
 @app.command()
 def compile_check_unity(
-    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
+    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
     execute_method: Annotated[
         str | None,
         typer.Option(help="Static method to run after load (Class.Method) — one editor session per invocation"),

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/dispatch_workflow_generator.py

@@ -1,4 +1,5 @@
 import json
+from collections import Counter
 from pathlib import Path
 from typing import Annotated
 
@@ -6,13 +7,14 @@ import typer
 from pydantic import BaseModel, ConfigDict
 
 from .compile_check_unity import COMPILE_ERROR_SIGNATURES
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import prepare_unity_project, run_unity_batchmode
 
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 DUMP_EXECUTE_METHOD = "Outernet.PlayerBuild.DumpEnvironment"
 DISPATCH_INPUT_CAP = 25
+RESERVED_INPUT_IDS = frozenset({"environment-preset", "development"})
 NUMERIC_FIELD_TYPES = {
     "Byte",
     "SByte",
@@ -56,7 +58,7 @@ class EnvironmentDump(BaseModel):
 
 @app.command()
 def unity_dispatch(
-    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
+    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
     output: Annotated[Path, typer.Option(help="Workflow file to write (or check with --check)")],
     build_workflow: Annotated[
         str,
@@ -67,13 +69,13 @@ def unity_dispatch(
     ],
     environment_config_class: Annotated[
         str | None,
-        typer.Option(help="Env class file path override (defaults to build-config.json's environment_config)"),
+        typer.Option(help="Env class file path override (defaults to unity-devkit.json's environment_config)"),
     ] = None,
     check: Annotated[
         bool, typer.Option("--check", help="Compare against the existing file instead of writing; fail on drift")
     ] = False,
 ) -> None:
-    projects = load_catalog()
+    projects = discover_projects()
     if project not in projects:
         raise SystemExit(f"Unknown project '{project}'. Valid: {', '.join(projects)}")
 
@@ -124,19 +126,26 @@ def extract_environment_dump(log_path: Path) -> EnvironmentDump:
 
 def render_dispatch_workflow(dump: EnvironmentDump, *, project: str, output: str, build_workflow: str) -> str:
     enums_by_name = {environment_enum.name: environment_enum for environment_enum in dump.enums}
-    input_blocks: list[tuple[str, str, list[str], str | None]] = [
+    emitted_fields = [field for field in dump.fields if field.path != dump.mode_field]
+    leaf_counts = Counter(field.path.rsplit(".", 1)[-1] for field in emitted_fields)
+    input_ids: dict[str, str] = {}
+    for field in emitted_fields:
+        leaf = field.path.rsplit(".", 1)[-1]
+        input_ids[field.path] = (
+            leaf if leaf_counts[leaf] == 1 and leaf not in RESERVED_INPUT_IDS else field.path.replace(".", "-")
+        )
+    default_preset = next(iter(dump.presets), "")
+    input_blocks: list[tuple[str, str | None, list[str], str | None]] = [
         (
             "environment-preset",
-            "Environment preset (Presets key) — empty leaves the workspace untouched",
+            "Preset to apply — blank leaves the workspace untouched; leave fields empty to keep the preset's values",
             ["type: choice", "options:", *indent_lines([*(f'- "{preset}"' for preset in ("", *dump.presets))], 2)],
-            'default: ""',
+            f'default: "{default_preset}"',
         ),
-        ("development", "Development build column", ["type: boolean"], "default: false"),
+        ("development", "Development build (debug symbols)", ["type: boolean"], "default: false"),
     ]
-    for field in dump.fields:
-        if field.path == dump.mode_field:
-            continue
-        input_blocks.append(field_input_block(field, enums_by_name))
+    for field in emitted_fields:
+        input_blocks.append(field_input_block(field, input_ids[field.path], enums_by_name))
 
     input_count = len(input_blocks)
     if input_count > DISPATCH_INPUT_CAP:
@@ -145,7 +154,7 @@ def render_dispatch_workflow(dump: EnvironmentDump, *, project: str, output: str
             "Shrink the env class or move configuration out of it."
         )
 
-    transport_lines = [field_transport_line(field) for field in dump.fields if field.path != dump.mode_field]
+    transport_lines = [field_transport_line(field, input_ids[field.path]) for field in emitted_fields]
     header = (
         f"# Generated by '{regen_command(project, output, build_workflow)}' from the environment class "
         f"{dump.class_name} —"
@@ -182,32 +191,23 @@ def regen_command(project: str, output: str, build_workflow: str) -> str:
 
 
 def field_input_block(
-    field: EnvironmentFieldDump, enums_by_name: dict[str, EnvironmentEnum]
-) -> tuple[str, str, list[str], str | None]:
-    input_id = field.path.replace(".", "-")
+    field: EnvironmentFieldDump, input_id: str, enums_by_name: dict[str, EnvironmentEnum]
+) -> tuple[str, str | None, list[str], str | None]:
     if field.field_type == "Boolean":
-        return (
-            input_id,
-            f"environment field {field.path} (bool) — checked overrides the preset value",
-            ["type: boolean"],
-            "default: false",
-        )
+        return (input_id, None, ["type: boolean"], "default: false")
 
     if field.field_type in enums_by_name:
         environment_enum = enums_by_name[field.field_type]
         if environment_enum.flags:
             return (
                 input_id,
-                (
-                    f"environment field {field.path} (flags: {', '.join(environment_enum.values)}) — "
-                    "comma-separated names, empty keeps the preset value"
-                ),
+                f"comma-separated: {', '.join(environment_enum.values)}",
                 ["type: string"],
                 'default: ""',
             )
         return (
             input_id,
-            f"environment field {field.path} ({environment_enum.name}) — empty keeps the preset value",
+            None,
             [
                 "type: choice",
                 "options:",
@@ -217,20 +217,10 @@ def field_input_block(
         )
 
     if field.field_type == "String":
-        return (
-            input_id,
-            f"environment field {field.path} (string) — empty keeps the preset value",
-            ["type: string"],
-            'default: ""',
-        )
+        return (input_id, None, ["type: string"], 'default: ""')
 
     if field.field_type in NUMERIC_FIELD_TYPES:
-        return (
-            input_id,
-            f"environment field {field.path} ({field.field_type}) — empty keeps the preset value",
-            ["type: number"],
-            None,
-        )
+        return (input_id, None, ["type: number"], None)
 
     raise SystemExit(
         f"Environment field '{field.path}' has type '{field.field_type}' — no dispatch input type maps to it "
@@ -238,8 +228,7 @@ def field_input_block(
     )
 
 
-def field_transport_line(field: EnvironmentFieldDump) -> str:
-    input_id = field.path.replace(".", "-")
+def field_transport_line(field: EnvironmentFieldDump, input_id: str) -> str:
     guard = "" if field.field_type == "Boolean" else " != ''"
     return (
         "${{ inputs['"
@@ -254,9 +243,12 @@ def field_transport_line(field: EnvironmentFieldDump) -> str:
     )
 
 
-def build_input_block(input_block: tuple[str, str, list[str], str | None]) -> list[str]:
+def build_input_block(input_block: tuple[str, str | None, list[str], str | None]) -> list[str]:
     input_id, description, type_lines, default_line = input_block
-    lines = [f"{input_id}:", f'  description: "{description}"', *[f"  {line}" for line in type_lines]]
+    lines = [f"{input_id}:"]
+    if description is not None:
+        lines.append(f'  description: "{description}"')
+    lines.extend(f"  {line}" for line in type_lines)
     if default_line is not None:
         lines.append(f"  {default_line}")
     return lines

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/install.py

@@ -8,7 +8,7 @@ from typing import Annotated, Any
 import typer
 from bashrun.bash import bash, bash_handoff, bash_output
 
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import build_player
 
 INSTALLABLE_TARGETS = {"AndroidMobile", "MagicLeap2", "Linux"}
@@ -43,7 +43,7 @@ def main(
         ),
     ] = False,
 ) -> None:
-    projects = load_catalog()
+    projects = discover_projects()
 
     project_name = next((name for name in projects if name.lower() == project.lower()), None)
     if project_name is None:

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/lock_unity.py

@@ -2,7 +2,7 @@ from typing import Annotated
 
 import typer
 
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import prepare_unity_project, run_unity_batchmode
 
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
@@ -10,7 +10,7 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def lock_unity(project: Annotated[str | None, typer.Option(help="Limit to a specific project.")] = None) -> None:
-    config = load_catalog()
+    config = discover_projects()
 
     if project is not None and project not in config:
         raise typer.BadParameter(f"Unknown project '{project}'. Valid: {', '.join(config)}")

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/matrix.py

@@ -1,12 +1,12 @@
 import json
 from pathlib import Path
 
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import LICENSE_IMAGE_MODULE, PLATFORM_CONFIGS, UNITYCI_IMAGE_REVISION, read_editor_version
 
 
 def build_matrix() -> None:
-    projects = load_catalog()
+    projects = discover_projects()
     matrix: list[dict[str, str]] = []
     editor_versions: set[str] = set()
 
@@ -28,7 +28,7 @@ def build_matrix() -> None:
 
     if not editor_versions:
         raise SystemExit(
-            "No projects with builds declared — build-unity-matrix needs at least one unity-devkit.json entry with a 'builds' list"
+            "No projects with builds declared — build-unity-matrix needs at least one unity-devkit.json with a non-empty 'platforms' map"
         )
     license_version = max(editor_versions)
     print(f"matrix={json.dumps({'include': matrix})}")
@@ -36,7 +36,7 @@ def build_matrix() -> None:
 
 
 def compile_check_matrix() -> None:
-    projects = load_catalog()
+    projects = discover_projects()
     matrix: list[dict[str, str]] = []
     editor_versions: set[str] = set()
 

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/player_build.py

@@ -9,7 +9,7 @@ from typing import TypedDict
 
 from bashrun.bash import CalledProcessError, bash, bash_pipe
 
-from .projects import CatalogEntry, load_catalog
+from .projects import ProjectEntry, discover_projects
 
 
 class PlatformConfig(TypedDict):
@@ -135,8 +135,8 @@ def editor_version(project_path: Path) -> str | None:
     return None
 
 
-def resolve_unity_project(project: str) -> CatalogEntry:
-    projects = load_catalog()
+def resolve_unity_project(project: str) -> ProjectEntry:
+    projects = discover_projects()
     if project not in projects:
         raise SystemExit(f"Unknown project '{project}'. Valid: {', '.join(projects)}")
     return projects[project]
@@ -182,7 +182,7 @@ def build_player(
     valid_builds = project_config.builds or []
     if not valid_builds:
         raise SystemExit(
-            f"Project '{project}' declares no builds — add a 'builds' list to its entry in unity-devkit.json"
+            f"Project '{project}' declares no builds — add platform keys to its unity-devkit.json 'platforms' map"
         )
     if build not in valid_builds:
         raise SystemExit(f"Unknown build '{build}' for project '{project}'. Valid: {', '.join(valid_builds)}")

unity_devkit-0.1.18/src/unity_devkit/projects.py

@@ -0,0 +1,73 @@
+import os
+from collections.abc import Iterator
+from pathlib import Path
+from typing import Any
+
+from pydantic import BaseModel, ConfigDict, field_validator
+
+BUILD_CONFIG_FILENAME = "unity-devkit.json"
+PROJECT_MARKER = Path("ProjectSettings") / "ProjectVersion.txt"
+PRUNE_DIRECTORIES = {".git", "Library", "Temp", "obj", "Build", "node_modules", "__pycache__"}
+
+
+class BuildConfigFile(BaseModel):
+    model_config = ConfigDict(extra="ignore")
+
+    name: str
+    platforms: dict[str, Any] | None = None
+
+    @field_validator("name")
+    @classmethod
+    def nonempty_name(cls, value: str) -> str:
+        if not value.strip():
+            raise ValueError("unity-devkit.json 'name' must be a non-empty string")
+        return value
+
+
+class ProjectEntry(BaseModel):
+    path: Path
+    builds: list[str] | None = None
+
+
+def discover_projects() -> dict[str, ProjectEntry]:
+    root = Path.cwd()
+    discovered: dict[str, ProjectEntry] = {}
+    first_seen: dict[str, Path] = {}
+
+    for directory in visible_directories(root):
+        config_path = directory / BUILD_CONFIG_FILENAME
+        if not config_path.is_file():
+            continue
+        if not (directory / PROJECT_MARKER).is_file():
+            raise SystemExit(
+                f"{config_path} sits in {directory}, which is not a Unity project: missing {PROJECT_MARKER}"
+            )
+        parsed = BuildConfigFile.model_validate_json(config_path.read_text(encoding="utf-8"))
+        if parsed.name in discovered:
+            raise SystemExit(
+                f"Duplicate project name '{parsed.name}' — declared at {config_path} "
+                f"and previously at {first_seen[parsed.name]}"
+            )
+        first_seen[parsed.name] = config_path
+        builds = list(parsed.platforms.keys()) if parsed.platforms else None
+        discovered[parsed.name] = ProjectEntry(path=directory, builds=builds)
+
+    if not discovered:
+        raise SystemExit(
+            f"No {BUILD_CONFIG_FILENAME} found under {root} — declare Unity projects with a "
+            f"{BUILD_CONFIG_FILENAME} per project root (carrying a 'name' field; 'platforms' "
+            f"keys are the build targets)"
+        )
+    return discovered
+
+
+def visible_directories(root: Path) -> Iterator[Path]:
+    for directory, subdirectories, _filenames in os.walk(root):
+        subdirectories[:] = sorted(
+            name for name in subdirectories if name not in PRUNE_DIRECTORIES and not name.startswith(".")
+        )
+        yield Path(directory)
+
+
+def directories_containing(root: Path, filename: str) -> list[Path]:
+    return [directory for directory in visible_directories(root) if (directory / filename).is_file()]

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/src/unity_devkit/test_unity.py

@@ -5,7 +5,7 @@ from typing import Annotated
 
 import typer
 
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import run_unity_batchmode
 
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
@@ -13,13 +13,13 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def main(
-    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
+    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
     test_platform: Annotated[str, typer.Option(help="Unity test platform (EditMode or PlayMode)")] = "EditMode",
     results: Annotated[Path, typer.Option(help="Output path for NUnit XML results")] = Path(
         "artifacts/unity-test-results.xml"
     ),
 ) -> None:
-    projects = load_catalog()
+    projects = discover_projects()
     if project not in projects:
         raise SystemExit(f"Unknown project '{project}'. Valid: {', '.join(projects)}")
 

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/tests/test_build_player.py

@@ -21,10 +21,10 @@ def write_repository(tmp_path: Path, project_settings: str, *, builds: list[str]
     (project / "ProjectSettings").mkdir(parents=True)
     (project / "ProjectSettings" / "ProjectSettings.asset").write_text(project_settings)
     (project / "ProjectSettings" / "ProjectVersion.txt").write_text("m_EditorVersion: 6000.0.66f1\n")
-    entry: dict[str, object] = {"path": "apps/Tool"}
+    config: dict[str, object] = {"name": "tool"}
     if builds is not None:
-        entry["builds"] = builds
-    (tmp_path / "unity-devkit.json").write_text(json.dumps({"tool": entry}))
+        config["platforms"] = {platform: {} for platform in builds}
+    (project / "unity-devkit.json").write_text(json.dumps(config))
     return project
 
 

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/tests/test_dispatch_workflow_generator.py

@@ -38,22 +38,72 @@ def test_render_modes_are_deduped_into_the_preset_choice() -> None:
     assert 'options:\n          - ""\n          - "Airgapped"' in workflow
 
 
-def test_render_maps_field_types_to_dispatch_inputs() -> None:
+def test_render_defaults_the_preset_choice_to_the_first_map_key() -> None:
+    document = yaml.safe_load(render_fixture_workflow().replace("${{", "__EXPR_OPEN__").replace("}}", "__EXPR_CLOSE__"))
+
+    trigger = document.get("on", document[True])
+    preset = trigger["workflow_dispatch"]["inputs"]["environment-preset"]
+    assert preset["options"] == ["", "Airgapped"]
+    assert preset["default"] == "Airgapped"
+
+
+def test_render_states_the_override_law_once_on_the_preset_input() -> None:
+    workflow = render_fixture_workflow()
+
+    assert "environment field" not in workflow
+    assert "empty keeps the preset value" not in workflow
+    assert "checked overrides the preset value" not in workflow
+    assert workflow.count("description:") == 3
+
+
+def test_render_maps_field_types_to_dispatch_inputs_without_descriptions() -> None:
+    workflow = render_fixture_workflow()
+
+    assert "\n      username:\n        type: string" in workflow
+    assert "\n      verboseLogging:\n        type: boolean" in workflow
+    assert "\n      pollIntervalSeconds:\n        type: number" in workflow
+
+
+def test_render_uses_leaf_names_as_input_ids_when_unique() -> None:
     workflow = render_fixture_workflow()
 
-    assert 'username:\n        description: "environment field username (string)' in workflow
-    assert 'verboseLogging:\n        description: "environment field verboseLogging (bool)' in workflow
-    assert "type: number" in workflow
-    assert "localConfig-apiUrl" in workflow
-    assert "inputs['localConfig-apiUrl']" in workflow
+    assert "\n      apiUrl:" in workflow
+    assert "\n      portNumber:" in workflow
+    assert "localConfig-apiUrl" not in workflow
+    assert "${{ inputs['apiUrl'] != '' && format('localConfig.apiUrl={0}', inputs['apiUrl']) || '' }}" in workflow
+
+
+def test_render_falls_back_to_dashed_paths_on_leaf_collision() -> None:
+    dump = load_fixture_dump()
+    dump.fields.append(EnvironmentFieldDump(path="remoteConfig.apiUrl", field_type="String"))
+
+    workflow = render_dispatch_workflow(
+        dump, project="PlayerBuild", output=".github/workflows/build.yml", build_workflow=PINNED_BUILD_WORKFLOW
+    )
+
+    assert "\n      apiUrl:" not in workflow
+    assert "\n      localConfig-apiUrl:" in workflow
+    assert "\n      remoteConfig-apiUrl:" in workflow
+
+
+def test_render_falls_back_to_dashed_paths_on_control_id_collision() -> None:
+    dump = load_fixture_dump()
+    dump.fields.append(EnvironmentFieldDump(path="misc.development", field_type="Boolean"))
+
+    workflow = render_dispatch_workflow(
+        dump, project="PlayerBuild", output=".github/workflows/build.yml", build_workflow=PINNED_BUILD_WORKFLOW
+    )
+
+    assert "\n      misc-development:" in workflow
+    assert workflow.split("jobs:")[0].count("\n      development:") == 1
 
 
 def test_render_flags_enum_is_text_not_choice() -> None:
     workflow = render_fixture_workflow()
 
-    assert "comma-separated names" in workflow
-    capabilities_choice = "capabilities:\n        description:"
-    assert capabilities_choice in workflow
+    assert 'description: "comma-separated: None, Capture, Stream, Analyze"' in workflow
+    assert "\n      capabilities:\n        description:" in workflow
+    assert "\n      capabilities:\n        type: string" not in workflow
     assert "type: choice" in workflow
 
 
@@ -106,8 +156,8 @@ def test_rendered_workflow_is_valid_yaml() -> None:
         "verboseLogging",
         "pollIntervalSeconds",
         "capabilities",
-        "localConfig-apiUrl",
-        "localConfig-portNumber",
+        "apiUrl",
+        "portNumber",
     ]
     assert document["jobs"]["build"]["uses"] == PINNED_BUILD_WORKFLOW
     assert document["jobs"]["build"]["secrets"] == "inherit"

{unity_devkit-0.1.16 → unity_devkit-0.1.18}/tests/test_matrix.py

@@ -6,17 +6,20 @@ import pytest
 from unity_devkit import matrix
 
 
-def write_repository(tmp_path: Path, entry: dict[str, object]) -> None:
+def write_repository(tmp_path: Path, builds: list[str] | None = None) -> None:
     project = tmp_path / "apps" / "Tool"
     (project / "ProjectSettings").mkdir(parents=True)
     (project / "ProjectSettings" / "ProjectVersion.txt").write_text("m_EditorVersion: 6000.0.66f1\n")
-    (tmp_path / "unity-devkit.json").write_text(json.dumps({"tool": entry}))
+    config: dict[str, object] = {"name": "tool"}
+    if builds is not None:
+        config["platforms"] = {platform: {} for platform in builds}
+    (project / "unity-devkit.json").write_text(json.dumps(config))
 
 
 def test_matrix_emits_entries_from_catalog(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    write_repository(tmp_path, {"path": "apps/Tool", "builds": ["Linux"]})
+    write_repository(tmp_path, builds=["Linux"])
     monkeypatch.chdir(tmp_path)
 
     matrix.build_matrix()
@@ -37,7 +40,7 @@ def test_matrix_emits_entries_from_catalog(
 
 
 def test_matrix_fails_without_builds(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    write_repository(tmp_path, {"path": "apps/Tool"})
+    write_repository(tmp_path)
     monkeypatch.chdir(tmp_path)
 
     with pytest.raises(SystemExit, match="No projects with builds declared"):
@@ -47,7 +50,7 @@ def test_matrix_fails_without_builds(tmp_path: Path, monkeypatch: pytest.MonkeyP
 def test_check_matrix_includes_path_only_projects(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    write_repository(tmp_path, {"path": "apps/Tool"})
+    write_repository(tmp_path)
     monkeypatch.chdir(tmp_path)
 
     matrix.compile_check_matrix()

unity_devkit-0.1.18/tests/test_projects.py

@@ -0,0 +1,120 @@
+import json
+from pathlib import Path
+
+import pytest
+from pydantic import ValidationError
+
+from unity_devkit.projects import directories_containing, discover_projects
+
+
+def create_unity_project(root: Path, relative: str) -> Path:
+    project = root / relative
+    (project / "ProjectSettings").mkdir(parents=True)
+    (project / "ProjectSettings" / "ProjectVersion.txt").write_text("m_EditorVersion: 6000.0.66f1\n")
+    return project
+
+
+def write_build_config(project_dir: Path, config: dict[str, object]) -> Path:
+    config_path = project_dir / "unity-devkit.json"
+    config_path.write_text(json.dumps(config))
+    return config_path
+
+
+def test_discovers_project_with_platforms_keys_as_builds(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    project = create_unity_project(tmp_path, "Alpha")
+    write_build_config(project, {"name": "Alpha", "platforms": {"Linux": {}, "AndroidMobile": {}}})
+    monkeypatch.chdir(tmp_path)
+
+    projects = discover_projects()
+
+    assert set(projects) == {"Alpha"}
+    assert projects["Alpha"].path == project
+    assert projects["Alpha"].builds == ["Linux", "AndroidMobile"]
+
+
+def test_name_is_decoupled_from_directory_name(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    project = create_unity_project(tmp_path, "apps/capture-tool")
+    write_build_config(project, {"name": "capture"})
+    monkeypatch.chdir(tmp_path)
+
+    projects = discover_projects()
+
+    assert set(projects) == {"capture"}
+    assert projects["capture"].path == project
+
+
+def test_path_only_project_has_no_builds(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    project = create_unity_project(tmp_path, "Harness")
+    write_build_config(project, {"name": "Harness"})
+    monkeypatch.chdir(tmp_path)
+
+    projects = discover_projects()
+
+    assert set(projects) == {"Harness"}
+    assert projects["Harness"].builds is None
+
+
+def test_no_build_config_found_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.chdir(tmp_path)
+
+    with pytest.raises(SystemExit, match=r"No unity-devkit\.json found"):
+        discover_projects()
+
+
+def test_config_outside_unity_project_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    not_a_project = tmp_path / "not-a-project"
+    not_a_project.mkdir()
+    write_build_config(not_a_project, {"name": "broken"})
+    monkeypatch.chdir(tmp_path)
+
+    with pytest.raises(SystemExit, match="not a Unity project"):
+        discover_projects()
+
+
+def test_duplicate_project_name_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    first = create_unity_project(tmp_path, "apps/one")
+    write_build_config(first, {"name": "dup"})
+    second = create_unity_project(tmp_path, "apps/two")
+    write_build_config(second, {"name": "dup"})
+    monkeypatch.chdir(tmp_path)
+
+    with pytest.raises(SystemExit, match="Duplicate project name 'dup'"):
+        discover_projects()
+
+
+def test_ignores_csharp_owned_fields(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    project = create_unity_project(tmp_path, "App")
+    write_build_config(
+        project,
+        {
+            "name": "App",
+            "environment_config": "Assets/App/UnityEnv.cs",
+            "platforms": {"AndroidMobile": {"render_pipeline": "Assets/Settings/Android.asset"}},
+        },
+    )
+    monkeypatch.chdir(tmp_path)
+
+    projects = discover_projects()
+
+    assert projects["App"].builds == ["AndroidMobile"]
+
+
+def test_missing_name_field_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    project = create_unity_project(tmp_path, "Alpha")
+    write_build_config(project, {"platforms": {"Linux": {}}})
+    monkeypatch.chdir(tmp_path)
+
+    with pytest.raises(ValidationError):
+        discover_projects()
+
+
+def test_directories_containing_honors_prune_list(tmp_path: Path) -> None:
+    vendored = tmp_path / "vendor" / "Library" / "SomeProject"
+    (vendored / "ProjectSettings").mkdir(parents=True)
+    (vendored / "ProjectSettings" / "ProjectVersion.txt").write_text("m_EditorVersion: 6000.0.66f1\n")
+    real = create_unity_project(tmp_path, "Real")
+
+    settings_directories = directories_containing(tmp_path, "ProjectVersion.txt")
+
+    assert real / "ProjectSettings" in settings_directories
+    assert vendored / "ProjectSettings" not in settings_directories

unity_devkit-0.1.16/src/unity_devkit/projects.py

@@ -1,55 +0,0 @@
-import os
-from collections.abc import Iterator
-from pathlib import Path
-
-from pydantic import BaseModel, ConfigDict, TypeAdapter, field_validator
-
-CATALOG_FILENAME = "unity-devkit.json"
-PROJECT_MARKER = Path("ProjectSettings") / "ProjectVersion.txt"
-PRUNE_DIRECTORIES = {".git", "Library", "Temp", "obj", "Build", "node_modules", "__pycache__"}
-
-
-class CatalogEntry(BaseModel):
-    model_config = ConfigDict(extra="forbid")
-
-    path: Path
-    builds: list[str] | None = None
-
-    @field_validator("path")
-    @classmethod
-    def anchor_relative_path(cls, value: Path) -> Path:
-        return value if value.is_absolute() else Path.cwd() / value
-
-
-CATALOG_ADAPTER = TypeAdapter(dict[str, CatalogEntry])
-
-
-def load_catalog() -> dict[str, CatalogEntry]:
-    catalog_path = Path.cwd() / CATALOG_FILENAME
-    if not catalog_path.is_file():
-        raise SystemExit(
-            f"No {CATALOG_FILENAME} catalog at {catalog_path} — declare Unity projects as catalog entries at the repo root"
-        )
-
-    catalog = CATALOG_ADAPTER.validate_json(catalog_path.read_text(encoding="utf-8"))
-    if not catalog:
-        raise SystemExit(f"{catalog_path} declares no projects — at least one catalog entry is required")
-
-    for name, entry in catalog.items():
-        if not (entry.path / PROJECT_MARKER).is_file():
-            raise SystemExit(
-                f"Catalog entry '{name}' points at {entry.path}, which is not a Unity project: missing {PROJECT_MARKER}"
-            )
-    return catalog
-
-
-def visible_directories(root: Path) -> Iterator[Path]:
-    for directory, subdirectories, _filenames in os.walk(root):
-        subdirectories[:] = sorted(
-            name for name in subdirectories if name not in PRUNE_DIRECTORIES and not name.startswith(".")
-        )
-        yield Path(directory)
-
-
-def directories_containing(root: Path, filename: str) -> list[Path]:
-    return [directory for directory in visible_directories(root) if (directory / filename).is_file()]

unity_devkit-0.1.16/tests/test_projects.py

@@ -1,88 +0,0 @@
-import json
-from pathlib import Path
-
-import pytest
-from pydantic import ValidationError
-
-from unity_devkit.projects import directories_containing, load_catalog
-
-
-def write_catalog(root: Path, catalog: dict[str, object]) -> Path:
-    catalog_path = root / "unity-devkit.json"
-    catalog_path.write_text(json.dumps(catalog))
-    return catalog_path
-
-
-def create_unity_project(root: Path, relative: str) -> Path:
-    project = root / relative
-    (project / "ProjectSettings").mkdir(parents=True)
-    (project / "ProjectSettings" / "ProjectVersion.txt").write_text("m_EditorVersion: 6000.0.66f1\n")
-    return project
-
-
-def test_catalog_entry_loads_with_intent_fields(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    create_unity_project(tmp_path, "Alpha")
-    write_catalog(tmp_path, {"Alpha": {"path": "Alpha", "builds": ["Linux"]}})
-    monkeypatch.chdir(tmp_path)
-
-    projects = load_catalog()
-
-    assert set(projects) == {"Alpha"}
-    assert projects["Alpha"].path == Path.cwd() / "Alpha"
-    assert projects["Alpha"].builds == ["Linux"]
-
-
-def test_catalog_name_is_decoupled_from_directory_name(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    create_unity_project(tmp_path, "apps/capture-tool")
-    write_catalog(tmp_path, {"capture": {"path": "apps/capture-tool"}})
-    monkeypatch.chdir(tmp_path)
-
-    projects = load_catalog()
-
-    assert set(projects) == {"capture"}
-    assert projects["capture"].path == Path.cwd() / "apps" / "capture-tool"
-
-
-def test_missing_catalog_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    monkeypatch.chdir(tmp_path)
-
-    with pytest.raises(SystemExit, match=r"No unity-devkit\.json catalog"):
-        load_catalog()
-
-
-def test_empty_catalog_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    write_catalog(tmp_path, {})
-    monkeypatch.chdir(tmp_path)
-
-    with pytest.raises(SystemExit, match="declares no projects"):
-        load_catalog()
-
-
-def test_entry_outside_unity_project_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    (tmp_path / "not-a-project").mkdir()
-    write_catalog(tmp_path, {"broken": {"path": "not-a-project"}})
-    monkeypatch.chdir(tmp_path)
-
-    with pytest.raises(SystemExit, match="not a Unity project"):
-        load_catalog()
-
-
-def test_unknown_entry_key_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    create_unity_project(tmp_path, "Alpha")
-    write_catalog(tmp_path, {"Alpha": {"path": "Alpha", "unity-build": True}})
-    monkeypatch.chdir(tmp_path)
-
-    with pytest.raises(ValidationError):
-        load_catalog()
-
-
-def test_directories_containing_honors_prune_list(tmp_path: Path) -> None:
-    vendored = tmp_path / "vendor" / "Library" / "SomeProject"
-    (vendored / "ProjectSettings").mkdir(parents=True)
-    (vendored / "ProjectSettings" / "ProjectVersion.txt").write_text("m_EditorVersion: 6000.0.66f1\n")
-    real = create_unity_project(tmp_path, "Real")
-
-    settings_directories = directories_containing(tmp_path, "ProjectVersion.txt")
-
-    assert real / "ProjectSettings" in settings_directories
-    assert vendored / "ProjectSettings" not in settings_directories