print_event usage and styling

Author: davegaeddert

plain-code/plain/code/cli.py

@@ -102,21 +102,16 @@ def maybe_exit(return_code: int) -> None:
             sys.exit(return_code)
 
     if not skip_ruff:
-        print_event(
-            click.style("Ruff lint:", bold=True) + click.style(" ruff check", dim=True)
-        )
+        print_event("ruff check...", newline=False)
         result = subprocess.run(["ruff", "check", path, *ruff_args])
         maybe_exit(result.returncode)
 
-        print_event(
-            click.style("Ruff format:", bold=True)
-            + click.style(" ruff format --check", dim=True)
-        )
+        print_event("ruff format --check...", newline=False)
         result = subprocess.run(["ruff", "format", path, "--check", *ruff_args])
         maybe_exit(result.returncode)
 
     if not skip_ty and config.get("ty", {}).get("enabled", True):
-        print_event(click.style("Ty:", bold=True) + click.style(" ty check", dim=True))
+        print_event("ty check...", newline=False)
         result = subprocess.run(["ty", "check", path])
         maybe_exit(result.returncode)
 
@@ -126,9 +121,7 @@ def maybe_exit(return_code: int) -> None:
         if biome.needs_update():
             ctx.invoke(install)
 
-        print_event(
-            click.style("Biome:", bold=True) + click.style(" biome check", dim=True)
-        )
+        print_event("biome check...")
         result = biome.invoke("check", path)
         maybe_exit(result.returncode)
 
@@ -153,32 +146,21 @@ def fix(ctx: click.Context, path: str, unsafe_fixes: bool, add_noqa: bool) -> No
         raise click.UsageError("Cannot use both --unsafe-fixes and --add-noqa")
 
     if unsafe_fixes:
-        print_event(
-            click.style("Ruff lint:", bold=True)
-            + click.style(" ruff check --fix --unsafe-fixes", dim=True)
-        )
+        print_event("ruff check --fix --unsafe-fixes...", newline=False)
         result = subprocess.run(
             ["ruff", "check", path, "--fix", "--unsafe-fixes", *ruff_args]
         )
     elif add_noqa:
-        print_event(
-            click.style("Ruff lint:", bold=True)
-            + click.style(" ruff check --add-noqa", dim=True)
-        )
+        print_event("ruff check --add-noqa...", newline=False)
         result = subprocess.run(["ruff", "check", path, "--add-noqa", *ruff_args])
     else:
-        print_event(
-            click.style("Ruff lint:", bold=True)
-            + click.style(" ruff check --fix", dim=True)
-        )
+        print_event("ruff check --fix...", newline=False)
         result = subprocess.run(["ruff", "check", path, "--fix", *ruff_args])
 
     if result.returncode != 0:
         sys.exit(result.returncode)
 
-    print_event(
-        click.style("Ruff format:", bold=True) + click.style(" ruff format", dim=True)
-    )
+    print_event("ruff format...", newline=False)
     result = subprocess.run(["ruff", "format", path, *ruff_args])
     if result.returncode != 0:
         sys.exit(result.returncode)
@@ -193,15 +175,9 @@ def fix(ctx: click.Context, path: str, unsafe_fixes: bool, add_noqa: bool) -> No
 
         if unsafe_fixes:
             args.append("--unsafe")
-            print_event(
-                click.style("Biome:", bold=True)
-                + click.style(" biome check --write --unsafe", dim=True)
-            )
+            print_event("biome check --write --unsafe...")
         else:
-            print_event(
-                click.style("Biome:", bold=True)
-                + click.style(" biome check --write", dim=True)
-            )
+            print_event("biome check --write...")
 
         result = biome.invoke(*args)
 

plain-dev/plain/dev/core.py

@@ -13,6 +13,7 @@
 from rich.console import Console
 from rich.text import Text
 
+from plain.cli.print import print_event
 from plain.runtime import APP_PATH, PLAIN_TEMP_PATH
 
 from .mkcert import MkcertManager
@@ -140,7 +141,7 @@ def run(self) -> int:
         self.generate_agents_md()
         self.modify_hosts_file()
 
-        click.secho("→ Running preflight checks... ", dim=True, nl=False)
+        print_event("Running preflight checks...", newline=False)
         self.run_preflight()
 
         # if ServicesProcess.running_pid():
@@ -150,20 +151,21 @@ def run(self) -> int:
         #     )
 
         if find_spec("plain.models"):
-            click.secho("→ Waiting for database... ", dim=True, nl=False)
+            print_event("Waiting for database...", newline=False)
             subprocess.run(
                 [sys.executable, "-m", "plain", "db", "wait"],
                 env=self.plain_env,
                 check=True,
             )
-            click.secho("→ Running migrations...", dim=True)
+            print_event("Running migrations...")
             subprocess.run(
                 [sys.executable, "-m", "plain", "migrate", "--backup"],
                 env=self.plain_env,
                 check=True,
             )
 
-        click.secho("\n→ Starting app...", dim=True)
+        click.echo()
+        print_event("Starting app...")
 
         # Manually start the status bar now so it isn't bungled by
         # another thread checking db stuff...

plain-dev/plain/dev/precommit/cli.py

@@ -58,77 +58,36 @@ def run_checks() -> None:
             .get("run", {})
         ).items():
             cmd = data["cmd"]
-            print_event(
-                click.style(f"Custom[{name}]:", bold=True)
-                + click.style(f" {cmd}", dim=True),
-                newline=False,
-            )
+            print_event(f"Custom: {cmd}")
             result = subprocess.run(cmd, shell=True)
             if result.returncode != 0:
                 sys.exit(result.returncode)
 
     # Run this first since it's probably the most likely to fail
     if find_spec("plain.code"):
-        check_short(
-            click.style("Code:", bold=True)
-            + click.style(" plain code check", dim=True),
-            "plain",
-            "code",
-            "check",
-        )
+        check_short("plain code check", "plain", "code", "check")
 
     if Path("uv.lock").exists():
-        check_short(
-            click.style("Dependencies:", bold=True)
-            + click.style(" uv lock --check", dim=True),
-            "uv",
-            "lock",
-            "--check",
-        )
+        check_short("uv lock --check", "uv", "lock", "--check")
 
     if plain_db_connected():
+        check_short("plain preflight", "plain", "preflight", "--quiet")
+        check_short("plain migrate --check", "plain", "migrate", "--check")
         check_short(
-            click.style("Preflight:", bold=True)
-            + click.style(" plain preflight", dim=True),
-            "plain",
-            "preflight",
-            "--quiet",
-        )
-        check_short(
-            click.style("Migrate:", bold=True)
-            + click.style(" plain migrate --check", dim=True),
-            "plain",
-            "migrate",
-            "--check",
-        )
-        check_short(
-            click.style("Migrations:", bold=True)
-            + click.style(" plain makemigrations --dry-run --check", dim=True),
+            "plain makemigrations --dry-run --check",
             "plain",
             "makemigrations",
             "--dry-run",
             "--check",
         )
     else:
-        check_short(
-            click.style("Preflight:", bold=True)
-            + click.style(" plain preflight", dim=True),
-            "plain",
-            "preflight",
-            "--quiet",
-        )
+        check_short("plain preflight", "plain", "preflight", "--quiet")
         click.secho("--> Skipping migration checks", bold=True, fg="yellow")
 
-    check_short(
-        click.style("Build:", bold=True) + click.style(" plain build", dim=True),
-        "plain",
-        "build",
-    )
+    check_short("plain build", "plain", "build")
 
     if find_spec("plain.pytest"):
-        print_event(
-            click.style("Test:", bold=True) + click.style(" plain test", dim=True)
-        )
+        print_event("plain test")
         result = subprocess.run(["plain", "test"])
         if result.returncode != 0:
             sys.exit(result.returncode)

plain/plain/cli/build.py

@@ -9,6 +9,7 @@
 
 import plain.runtime
 from plain.assets.compile import compile_assets, get_compiled_path
+from plain.cli.print import print_event
 
 
 @click.command()
@@ -54,18 +55,16 @@ def build(keep_original: bool, fingerprint: bool, compress: bool) -> None:
             .get("run", {})
             .items()
         ):
-            click.secho(f"Running {name} from pyproject.toml", bold=True)
+            print_event(f"{name}...")
             result = subprocess.run(data["cmd"], shell=True)
-            print()
             if result.returncode:
                 click.secho(f"Error in {name} (exit {result.returncode})", fg="red")
                 sys.exit(result.returncode)
 
     # Then run installed package build steps (like tailwind, typically should run last...)
     for entry_point in entry_points(group="plain.build"):
-        click.secho(f"Running {entry_point.name}", bold=True)
-        result = entry_point.load()()
-        print()
+        print_event(f"{entry_point.name}...")
+        entry_point.load()()
 
     # Compile our assets
     target_dir = get_compiled_path()

plain/plain/cli/print.py

@@ -2,8 +2,8 @@
 
 
 def print_event(msg: str, newline: bool = True) -> None:
-    arrow = click.style("-->", fg=214, bold=True)
-    message = str(msg)
+    arrow = click.style("-->", fg=214, bold=True, dim=True)
+    message = click.style(msg, dim=True)
     if not newline:
         message += " "
-    click.secho(f"{arrow} {message}", nl=newline)
+    click.echo(f"{arrow} {message}", nl=newline)