Change bolt code to check and fix, add to precommit, re-use print_event

Author: davegaeddert

bolt-code/bolt/code/cli.py

@@ -5,6 +5,8 @@
 
 import click
 
+from bolt.cli.print import print_event
+
 DEFAULT_RUFF_CONFIG = Path(__file__).parent / "ruff_defaults.toml"
 
 
@@ -16,35 +18,22 @@ def cli():
 
 @cli.command()
 @click.argument("path", default=".")
-@click.option("--fix/--no-fix", "do_fix", default=False)
-def lint(path, do_fix):
+def check(path):
+    """Check the given path for formatting or linting issues."""
     ruff_args = []
 
     if not user_has_ruff_config():
-        click.secho("Using default bolt.code ruff config", italic=True, bold=True)
+        click.secho("Using default bolt.code ruff config", italic=True)
         ruff_args.extend(["--config", str(DEFAULT_RUFF_CONFIG)])
 
-    if do_fix:
-        ruff_args.append("--fix")
-
-    click.secho("Ruff check", bold=True)
+    print_event("Ruff check")
     result = subprocess.run(["ruff", "check", path, *ruff_args])
 
     if result.returncode != 0:
         sys.exit(result.returncode)
 
-
-@cli.command()
-@click.argument("path", default=".")
-def format(path):
-    ruff_args = []
-
-    if not user_has_ruff_config():
-        click.secho("Using default bolt.code ruff config", italic=True, bold=True)
-        ruff_args.extend(["--config", str(DEFAULT_RUFF_CONFIG)])
-
-    click.secho("Ruff format", bold=True)
-    result = subprocess.run(["ruff", "format", path, *ruff_args])
+    print_event("Ruff format check")
+    result = subprocess.run(["ruff", "format", path, "--check", *ruff_args])
 
     if result.returncode != 0:
         sys.exit(result.returncode)
@@ -57,16 +46,16 @@ def fix(path):
     ruff_args = []
 
     if not user_has_ruff_config():
-        click.secho("Using default bolt.code ruff config", italic=True, bold=True)
+        click.secho("Using default bolt.code ruff config", italic=True)
         ruff_args.extend(["--config", str(DEFAULT_RUFF_CONFIG)])
 
-    click.secho("Ruff check", bold=True)
+    print_event("Ruff check")
     result = subprocess.run(["ruff", "check", path, "--fix", *ruff_args])
 
     if result.returncode != 0:
         sys.exit(result.returncode)
 
-    click.secho("Ruff format", bold=True)
+    print_event("Ruff format")
     result = subprocess.run(["ruff", "format", path, *ruff_args])
 
     if result.returncode != 0:

bolt-dev/bolt/dev/precommit/cli.py

@@ -4,6 +4,8 @@
 from importlib.util import find_spec
 from pathlib import Path
 
+from bolt.cli.print import print_event
+
 try:
     import tomllib
 except ModuleNotFoundError:
@@ -51,6 +53,11 @@ def cli(install):
             if result.returncode != 0:
                 sys.exit(result.returncode)
 
+    # Run this first since it's probably the most likely to fail
+    if find_spec("bolt.code"):
+        print_event("Running bolt code checks")
+        subprocess.check_call(["bolt", "code", "check"])
+
     check_short("Checking .env files for changes", "bolt", "env", "check")
 
     if Path("poetry.lock").exists():
@@ -99,14 +106,6 @@ def bolt_db_connected():
     return result.returncode == 0
 
 
-def print_event(msg, newline=True):
-    arrow = click.style("-->", fg=214, bold=True)
-    message = str(msg)
-    if not newline:
-        message += " "
-    click.secho(f"{arrow} {message}", nl=newline)
-
-
 def check_short(message, *args):
     print_event(message, newline=False)
     result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

bolt/cli/print.py

@@ -0,0 +1,9 @@
+import click
+
+
+def print_event(msg, newline=True):
+    arrow = click.style("-->", fg=214, bold=True)
+    message = str(msg)
+    if not newline:
+        message += " "
+    click.secho(f"{arrow} {message}", nl=newline)