leftblock 0.3.4__tar.gz → 0.3.5__tar.gz

{leftblock-0.3.4 → leftblock-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leftblock
-Version: 0.3.4
+Version: 0.3.5
 Summary: LeftBlock: a pluggable inspection gate for Git commits
 License: MIT License
         
@@ -124,7 +124,7 @@ configures the integration; it does not install scanner binaries.
 In the intended Python environment:
 
 ```bash
-python -m pip install leftblock==0.3.4
+python -m pip install leftblock==0.3.5
 python -m leftblock.cli --help
 ```
 

{leftblock-0.3.4 → leftblock-0.3.5}/README.md

@@ -91,7 +91,7 @@ configures the integration; it does not install scanner binaries.
 In the intended Python environment:
 
 ```bash
-python -m pip install leftblock==0.3.4
+python -m pip install leftblock==0.3.5
 python -m leftblock.cli --help
 ```
 

{leftblock-0.3.4 → leftblock-0.3.5}/leftblock/cli.py

@@ -5,6 +5,7 @@ import json
 import subprocess
 import getpass
 import shlex
+import shutil
 import yaml
 from datetime import datetime, timezone
 from leftblock.merge import (
@@ -193,12 +194,45 @@ def _run_configured_checks(repo_root, config_path=None):
             os.remove(scoped_index)
 
 
+def _plain(text):
+    """Printable ASCII as-is; anything else JSON-escaped so it cannot drive the terminal."""
+    text = str(text)
+    if text.isascii() and text.isprintable():
+        return text
+    return json.dumps(text, ensure_ascii=True)
+
+
+def command_prefix():
+    """How to invoke this LeftBlock in printed advice, without leaking a home path.
+
+    Uses `leftblock` when that name on PATH runs this same installation;
+    otherwise this interpreter with the home directory shortened to `~`.
+    """
+    here = os.path.dirname(os.path.abspath(sys.executable))
+    found = shutil.which("leftblock")
+    if found and os.path.dirname(os.path.realpath(found)) in (here, os.path.realpath(here)):
+        return "leftblock"
+    return shell_path(sys.executable) + " -I -B -m leftblock.cli"
+
+
+def shell_path(path):
+    """A shell-quoted path with the home directory shown as `~`."""
+    path = os.path.abspath(path)
+    home = os.path.expanduser("~")
+    if home and path.startswith(home + os.sep):
+        return "~/" + shlex.quote(path[len(home) + 1:])
+    return shlex.quote(path)
+
+
 def print_failures(failures):
     for result in failures:
         print_warn(f"Checker {json.dumps(str(result.name))} did not pass.")
         if isinstance(result.findings, list):
             for finding in result.findings:
-                print("      " + json.dumps(finding, ensure_ascii=True), file=sys.stderr)
+                line = f"{_plain(finding.get('File', 'unknown file'))}: {_plain(finding.get('RuleID', 'finding'))}"
+                if finding.get("id"):
+                    line += f" [id {finding['id']}]"
+                print("      " + line, file=sys.stderr)
         else:
             print_warn(str(result.findings))
 
@@ -248,10 +282,10 @@ def print_override_instructions(failures, repo_root, config_path):
     if findings:
         steps.append("remove the flagged content")
     if ids:
-        command = f"{shlex.quote(sys.executable)} -I -B -m leftblock.cli allow {' '.join(dict.fromkeys(ids))}"
+        command = f"{command_prefix()} allow {' '.join(dict.fromkeys(ids))}"
         default = default_local_policy(repo_root) or os.path.join(repo_root, ".leftblock.yml")
         if config_path and os.path.abspath(config_path) != os.path.abspath(default):
-            command += f" --config {shlex.quote(config_path)}"
+            command += f" --config {shell_path(config_path)}"
         command += ' --reason "<why this is not sensitive>"'
         print_info(
             "An override adds the finding to .leftblock-allow.yml and stages it, so it "

{leftblock-0.3.4 → leftblock-0.3.5}/leftblock.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leftblock
-Version: 0.3.4
+Version: 0.3.5
 Summary: LeftBlock: a pluggable inspection gate for Git commits
 License: MIT License
         
@@ -124,7 +124,7 @@ configures the integration; it does not install scanner binaries.
 In the intended Python environment:
 
 ```bash
-python -m pip install leftblock==0.3.4
+python -m pip install leftblock==0.3.5
 python -m leftblock.cli --help
 ```
 

{leftblock-0.3.4 → leftblock-0.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "leftblock"
-version = "0.3.4"
+version = "0.3.5"
 description = "LeftBlock: a pluggable inspection gate for Git commits"
 readme = "README.md"
 license = {file = "LICENSE"}

{leftblock-0.3.4 → leftblock-0.3.5}/tests/test_branding.py

@@ -196,7 +196,7 @@ class DistributionOwnershipTests(unittest.TestCase):
 
     def test_distribution_owns_only_leftblock_command(self):
         self.assertIn("\nName: leftblock\n", "\n" + self.metadata)
-        self.assertIn("\nVersion: 0.3.4\n", "\n" + self.metadata)
+        self.assertIn("\nVersion: 0.3.5\n", "\n" + self.metadata)
         self.assertIn("\nLicense-File: LICENSE\n", "\n" + self.metadata)
         self.assertEqual(dict(self.entry_points["console_scripts"]), {"leftblock": "leftblock.cli:main"})
 
@@ -208,7 +208,7 @@ class DistributionOwnershipTests(unittest.TestCase):
             self.assertIn(name, self.names)
         self.assertEqual(
             {name.split("/")[0] for name in self.names},
-            {"leftblock", "leftblock-0.3.4.dist-info"},
+            {"leftblock", "leftblock-0.3.5.dist-info"},
         )
         self.assertEqual(self.rules, (PROJECT_ROOT / "leftblock/data/gitleaks.toml").read_bytes())
         self.assertEqual(self.license, (PROJECT_ROOT / "LICENSE").read_bytes())

{leftblock-0.3.4 → leftblock-0.3.5}/tests/test_recorded_overrides.py

@@ -31,7 +31,8 @@ class RecordedOverrideTests(RepositoryFixture):
         return self.leftblock("check", "--config", str(policy))
 
     def ids(self, proc):
-        return re.findall(r'"id": "([0-9a-f]{16})"', proc.stderr)
+        # Per-finding detail lines (the final summary line repeats the ids).
+        return re.findall(r"^      .*\[id ([0-9a-f]{16})\]$", proc.stderr, re.MULTILINE)
 
     def blocked_id(self, text=None):
         self.write_stage(text or f"a\nContact: {EMAIL}\n")
@@ -251,3 +252,12 @@ class OverrideNeverCoversErrorsTests(RepositoryFixture):
 
 if __name__ == "__main__":
     unittest.main()
+
+
+class CommandPrefixTests(unittest.TestCase):
+    def test_printed_command_never_contains_the_home_directory(self):
+        import os
+        from leftblock import cli
+        home = os.path.expanduser("~")
+        for prefix in (cli.command_prefix(), cli.shell_path(os.path.join(home, "x", "policy.json"))):
+            self.assertNotIn(home + os.sep, prefix)