splent-cli 1.4.4__tar.gz → 1.4.5__tar.gz

{splent_cli-1.4.4/src/splent_cli.egg-info → splent_cli-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.4.4
+Version: 1.4.5
 Summary: SPLENT-CLI is a CLI to be able to work on your development more easily.
 Author-email: DiversoLab <diversolab@us.es>
 Project-URL: Homepage, https://github.com/diverso-lab/splent_cli

{splent_cli-1.4.4 → splent_cli-1.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "splent_cli"
-version = "1.4.4"
+version = "1.4.5"
 description = "SPLENT-CLI is a CLI to be able to work on your development more easily."
 readme = "README.md"
 requires-python = ">=3.13"

{splent_cli-1.4.4 → splent_cli-1.4.5}/src/splent_cli/commands/product/product_derive.py

@@ -138,23 +138,21 @@ def product_derive(mode):
       2. product:deploy  — start production containers
     """
     if not mode:
-        click.echo("❌ You must specify --dev or --prod.")
+        click.secho("  error: you must specify --dev or --prod.", fg="red")
         raise SystemExit(1)
 
     workspace = str(context.workspace())
     product = context.require_app()
     product_dir = os.path.join(workspace, product)
 
-    click.echo(
-        click.style(f"\n🧬 SPL Product Derivation — {mode}\n", fg="cyan", bold=True)
-    )
+    click.echo()
+    click.echo(click.style(f"  Deriving {product} ({mode})", bold=True))
+    click.echo()
 
     # ── Pre-flight checks ──────────────────────────────────────────────────
     preflight_failed = not run_preflight(interactive=True)
 
-    # [port conflict check]
-    click.echo(click.style("  [3/3] port conflicts", fg="bright_black"))
-
+    # ports — port conflict check
     def _identify_env(container_name: str) -> str:
         """Guess whether a container belongs to dev or prod based on naming."""
         if "_deploy" in container_name:
@@ -193,16 +191,15 @@ def product_derive(mode):
                         }
                     )
         else:
-            click.echo(
-                "        \u2139\ufe0f  No docker-compose.deploy.yml yet — will be generated by product:build."
+            click.secho(
+                "  ports    no compose file yet — will be generated by product:build",
+                fg="bright_black",
             )
 
     if not port_conflicts:
-        click.secho("        ✅ No port conflicts detected.", fg="green")
+        click.echo("  ports    no conflicts detected")
     else:
-        click.secho(
-            f"        ⚠️  {len(port_conflicts)} port conflict(s) found:\n", fg="yellow"
-        )
+        click.secho(f"  ports    {len(port_conflicts)} conflict(s) found:", fg="yellow")
         all_containers: dict[str, str] = {}  # id → name
         for conflict in port_conflicts:
             for cid, cname in conflict["containers"]:
@@ -211,7 +208,7 @@ def product_derive(mode):
                 f"{n} ({_identify_env(n)})" for _, n in conflict["containers"]
             )
             click.secho(
-                f"          port {conflict['port']:>5}  ←  {conflict['service']}"
+                f"           port {conflict['port']:>5} <- {conflict['service']}"
                 f"  (blocked by: {container_list})",
                 fg="yellow",
             )
@@ -222,80 +219,77 @@ def product_derive(mode):
             for _, cname in conflict["containers"]:
                 blocking_envs_flat.add(_identify_env(cname))
         if mode == "dev" and "prod" in blocking_envs_flat:
-            click.echo(
-                "        💡 Tip: Run 'splent product:down --prod' to stop the production deployment first."
+            click.secho(
+                "           run 'splent product:down --prod' to stop the production deployment first",
+                fg="bright_black",
             )
         elif mode == "prod" and "dev" in blocking_envs_flat:
-            click.echo(
-                "        💡 Tip: Run 'splent product:down --dev' to stop the development environment first."
+            click.secho(
+                "           run 'splent product:down --dev' to stop the development environment first",
+                fg="bright_black",
             )
 
         click.echo()
         stop_them = click.confirm(
-            "        Stop and remove the conflicting containers?", default=False
+            "  Stop and remove the conflicting containers?", default=False
         )
         if stop_them:
             for cid, cname in all_containers.items():
-                click.echo(f"        🛑 Stopping {cname}...")
+                click.echo(f"  ports    stopping {cname}...")
                 subprocess.run(["docker", "stop", cid], capture_output=True)
                 subprocess.run(["docker", "rm", cid], capture_output=True)
-            click.secho("        ✅ Conflicting containers removed.", fg="green")
+            click.echo("  ports    conflicting containers removed")
         else:
             click.secho(
-                "        ❌ Cannot proceed with port conflicts unresolved.",
+                "  ports    cannot proceed with conflicts unresolved",
                 fg="red",
             )
             preflight_failed = True
-    click.echo()
 
     if preflight_failed:
+        click.echo()
         click.secho(
-            "❌ Pre-flight checks failed. Fix the issues above before deriving the product.",
+            "  Pre-flight checks failed. Fix the issues above before deriving.",
             fg="red",
-            bold=True,
         )
         click.echo()
         raise SystemExit(1)
 
-    click.echo(click.style(f"  {'─' * 70}\n", fg="bright_black"))
+    click.echo()
 
     # ── Derivation pipeline ────────────────────────────────────────────────
     ctx = click.get_current_context()
 
     if mode == "dev":
-        click.echo(click.style("━━ [1/6] product:sync", fg="bright_black"))
+        click.echo("  sync     resolving feature symlinks...")
         ctx.invoke(product_sync, force=False)
 
-        click.echo(
-            click.style(
-                "\n━━ [2/6] product:env --generate --all --dev", fg="bright_black"
-            )
-        )
+        click.echo("  env      generating .env files (dev)")
         ctx.invoke(
             product_env, generate=True, merge=False, env_name="dev", process_all=True
         )
 
-        click.echo(
-            click.style("\n━━ [3/6] product:env --merge --dev", fg="bright_black")
-        )
+        click.echo("  env      merging .env files (dev)")
         ctx.invoke(
             product_env, generate=False, merge=True, env_name="dev", process_all=False
         )
 
-        click.echo(click.style("\n━━ [4/6] product:up --dev", fg="bright_black"))
+        click.echo("  up       starting containers (dev)")
         ctx.invoke(product_up, dev=True, prod=False)
 
-        click.echo(click.style("\n━━ [5/6] product:run --dev", fg="bright_black"))
+        click.echo("  run      launching application (dev)")
         ctx.invoke(product_runc, env_dev=True, env_prod=False)
 
-        click.echo(click.style("\n━━ [6/6] product:port", fg="bright_black"))
+        click.echo("  ports    exposing host ports")
         ctx.invoke(product_port, env_flag="dev")
 
     elif mode == "prod":
-        click.echo(click.style("━━ [1/2] product:build", fg="bright_black"))
+        click.echo("  build    merging env + compose + Docker image")
         ctx.invoke(product_build, no_image=False, skip_preflight=True)
 
-        click.echo(click.style("\n━━ [2/2] product:deploy", fg="bright_black"))
+        click.echo("  deploy   starting production containers")
         ctx.invoke(product_deploy, down=False)
 
-    click.echo(click.style("\n✅ Product derived successfully.", fg="green", bold=True))
+    click.echo()
+    click.secho(f"  {product} ({mode}) derived successfully.", fg="green")
+    click.echo()

splent_cli-1.4.5/src/splent_cli/services/preflight.py

@@ -0,0 +1,70 @@
+"""
+Pre-flight checks shared across product commands (derive, build, deploy).
+
+Returns True if all checks pass, False otherwise.
+"""
+
+import os
+
+import click
+
+from splent_cli.services import context
+from splent_cli.commands.uvl.uvl_utils import run_uvl_check
+from splent_cli.commands.feature.feature_diff import run_all_product_check
+
+
+def run_preflight(*, interactive: bool = True) -> bool:
+    """
+    Run UVL and feature:diff pre-flight checks.
+
+    Parameters
+    ----------
+    interactive : bool
+        When True, prints output. When False, silent (returns result only).
+
+    Returns True if all checks pass.
+    """
+    workspace = str(context.workspace())
+    product = context.require_app()
+    product_dir = os.path.join(workspace, product)
+
+    failed = False
+
+    # validate — UVL satisfiability
+    uvl_ok, uvl_msg = run_uvl_check(workspace)
+    if uvl_ok:
+        if interactive:
+            click.echo("  validate UVL configuration is satisfiable")
+    else:
+        if interactive:
+            click.secho(f"  validate {uvl_msg}", fg="red")
+            click.secho(
+                "           run 'splent product:validate' to inspect", fg="bright_black"
+            )
+        failed = True
+
+    # contract — feature:diff --all
+    findings = run_all_product_check(workspace, product_dir)
+    errors = [f for f in findings if f["severity"] == "error"]
+    warnings = [f for f in findings if f["severity"] == "warning"]
+
+    if not errors:
+        if interactive:
+            if warnings:
+                click.echo(
+                    f"  contract no conflicts — {len(warnings)} warning(s), "
+                    "run 'splent feature:diff --all' to review"
+                )
+            else:
+                click.echo("  contract no conflicts detected")
+    else:
+        if interactive:
+            for err in errors:
+                click.secho(f"  contract [{err['field']}] {err['message']}", fg="red")
+            click.secho(
+                "           run 'splent feature:diff --all' to inspect",
+                fg="bright_black",
+            )
+        failed = True
+
+    return not failed

{splent_cli-1.4.4 → splent_cli-1.4.5/src/splent_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.4.4
+Version: 1.4.5
 Summary: SPLENT-CLI is a CLI to be able to work on your development more easily.
 Author-email: DiversoLab <diversolab@us.es>
 Project-URL: Homepage, https://github.com/diverso-lab/splent_cli

splent_cli-1.4.4/src/splent_cli/services/preflight.py

@@ -1,86 +0,0 @@
-"""
-Pre-flight checks shared across product commands (derive, build, deploy).
-
-Returns True if all checks pass, False otherwise.
-"""
-
-import os
-
-import click
-
-from splent_cli.services import context
-from splent_cli.commands.uvl.uvl_utils import run_uvl_check
-from splent_cli.commands.feature.feature_diff import run_all_product_check
-
-
-def run_preflight(*, interactive: bool = True) -> bool:
-    """
-    Run UVL and feature:diff pre-flight checks.
-
-    Parameters
-    ----------
-    interactive : bool
-        When True, prints output. When False, silent (returns result only).
-
-    Returns True if all checks pass.
-    """
-    workspace = str(context.workspace())
-    product = context.require_app()
-    product_dir = os.path.join(workspace, product)
-
-    if interactive:
-        click.echo(click.style("━━ Pre-flight checks", fg="bright_black", bold=True))
-        click.echo()
-
-    failed = False
-
-    # [1/2] product:validate
-    if interactive:
-        click.echo(click.style("  [1/2] product:validate", fg="bright_black"))
-    uvl_ok, uvl_msg = run_uvl_check(workspace)
-    if uvl_ok:
-        if interactive:
-            click.secho("        ✅ UVL configuration is satisfiable.", fg="green")
-    else:
-        if interactive:
-            click.secho(f"        🚨 {uvl_msg}", fg="red")
-            click.secho("        → Run: splent product:validate", fg="yellow")
-        failed = True
-    if interactive:
-        click.echo()
-
-    # [2/2] feature:diff --all
-    if interactive:
-        click.echo(click.style("  [2/2] feature:diff --all", fg="bright_black"))
-    findings = run_all_product_check(workspace, product_dir)
-    errors = [f for f in findings if f["severity"] == "error"]
-    warnings = [f for f in findings if f["severity"] == "warning"]
-
-    if not errors:
-        if interactive:
-            if warnings:
-                click.secho(
-                    f"        ✅ No conflicts. {len(warnings)} warning(s) — "
-                    "run 'splent feature:diff --all' to review.",
-                    fg="green",
-                )
-            else:
-                click.secho("        ✅ No conflicts detected.", fg="green")
-    else:
-        if interactive:
-            for err in errors:
-                click.secho(f"        🚨 [{err['field']}] {err['message']}", fg="red")
-            click.secho("        → Run: splent feature:diff --all", fg="yellow")
-        failed = True
-    if interactive:
-        click.echo()
-
-    if failed and interactive:
-        click.secho(
-            "❌ Pre-flight checks failed. Fix the issues above before proceeding.",
-            fg="red",
-            bold=True,
-        )
-        click.echo()
-
-    return not failed