doover-cli 0.6.2__tar.gz → 0.6.3__tar.gz

{doover_cli-0.6.2 → doover_cli-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doover-cli
-Version: 0.6.2
+Version: 0.6.3
 Summary: CLI for Doover
 License-File: LICENSE
 Requires-Python: >=3.11

{doover_cli-0.6.2 → doover_cli-0.6.3}/src/doover_cli/__init__.py

@@ -1,7 +1,7 @@
 from doover_cli.renderer import Renderer
 from typing import Annotated, Optional
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"
 
 import click
 import typer

{doover_cli-0.6.2 → doover_cli-0.6.3}/src/doover_cli/apps/apps.py

@@ -1303,6 +1303,9 @@ def discover(
         )
         raise typer.Exit(1)
 
+    for entry in found:
+        entry["dir"] = os.path.normpath(os.path.join(root, entry["dir"]))
+
     if as_json:
         # Compact and on one line so it can be captured straight into a step output.
         print(json.dumps(found, separators=(",", ":")))

{doover_cli-0.6.2 → doover_cli-0.6.3}/src/doover_cli/config_schema.py

@@ -8,6 +8,7 @@ import typer
 import jsf
 
 from .utils.apps import (
+    app_names_in_config,
     get_app_directory,
     call_with_uv,
     get_app_config,
@@ -94,10 +95,12 @@ def validate(
     config_file = root_fp / "doover_config.json"
 
     if export_ is True:
-        # Validate the schema the Python *currently* generates, without leaving
-        # doover_config.json modified (e.g. when run as a pre-commit hook).
+        targets = [app_name] if app_name else app_names_in_config(root_fp) or [None]
         with preserve_file(config_file):
-            ctx.invoke(export, ctx, app_fp=root_fp, validate_=False, app_name=app_name)
+            for target in targets:
+                ctx.invoke(
+                    export, ctx, app_fp=root_fp, validate_=False, app_name=target
+                )
             _validate_config_file(config_file)
     else:
         _validate_config_file(config_file)

{doover_cli-0.6.2 → doover_cli-0.6.3}/src/doover_cli/ui_schema.py

@@ -7,6 +7,7 @@ import rich
 import typer
 
 from .utils.apps import (
+    app_names_in_config,
     get_app_directory,
     call_with_uv,
     get_app_config,
@@ -86,10 +87,12 @@ def validate(
     config_file = root_fp / "doover_config.json"
 
     if export_ is True:
-        # Validate the schema the Python *currently* generates, without leaving
-        # doover_config.json modified (e.g. when run as a pre-commit hook).
+        targets = [app_name] if app_name else app_names_in_config(root_fp) or [None]
         with preserve_file(config_file):
-            ctx.invoke(export, ctx, app_fp=root_fp, validate_=False, app_name=app_name)
+            for target in targets:
+                ctx.invoke(
+                    export, ctx, app_fp=root_fp, validate_=False, app_name=target
+                )
             _validate_ui_file(config_file)
     else:
         _validate_ui_file(config_file)

{doover_cli-0.6.2 → doover_cli-0.6.3}/src/doover_cli/utils/apps.py

@@ -459,6 +459,29 @@ def get_docker_path() -> Path:
 _selected_app_name: dict[Path, str] = {}
 
 
+def app_names_in_config(root_fp: Path) -> list[str]:
+    """Every app name declared in this directory's doover_config.json.
+
+    Never prompts, unlike `get_app_config`. For commands that act on the whole
+    file rather than one app — schema validation checks every app's schema, so
+    prompting for one would be asking a question whose answer does not matter, and
+    aborts outright when stdin is not a terminal (pre-commit, CI).
+    """
+    config_path = root_fp / "doover_config.json"
+    if not config_path.exists():
+        return []
+
+    with open(config_path, "r") as file:
+        data = json.load(file)
+
+    # Same rule as get_app_config: `type` marks an app entry.
+    return [
+        v.get("name") or k
+        for k, v in data.items()
+        if isinstance(v, dict) and "type" in v
+    ]
+
+
 def get_app_config(root_fp: Path, app_name: str | None = None) -> Any:
     config_path = root_fp / "doover_config.json"
     if not config_path.exists():