code-puppy-core-plugins 0.0.47__tar.gz → 0.0.48__tar.gz

{code_puppy_core_plugins-0.0.47 → code_puppy_core_plugins-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: code-puppy-core-plugins
-Version: 0.0.47
+Version: 0.0.48
 Summary: Official plugin bundle for Code Puppy
 Project-URL: Repository, https://github.com/mpfaffenberger/code_puppy_core_plugins
 Project-URL: Homepage, https://github.com/mpfaffenberger/code_puppy_core_plugins

{code_puppy_core_plugins-0.0.47 → code_puppy_core_plugins-0.0.48}/code_puppy_core_plugins/force_push_guard/detector.py

@@ -5,6 +5,7 @@ ways git lets you wreck a remote branch.
 """
 
 import re
+from collections.abc import Iterator
 from dataclasses import dataclass
 
 
@@ -16,11 +17,10 @@ class ForcePushMatch:
     description: str
 
 
-# Matches shell operators that precede a new command in a pipeline/chain.
-# E.g. "cd foo && git push --force" or "true || git push -f"
-_SHELL_OPERATOR_RE = re.compile(r"(?:^|&&|\|\||;|\|)\s*git\s+push\b", re.MULTILINE)
+# Each input has already been split at unquoted shell operators.
+_GIT_PUSH_RE = re.compile(r"^\s*git\s+push\b")
 
-# Ordered by specificity — first match wins.
+# Ordered by specificity, first match wins.
 # Each tuple: (compiled regex, human-readable name, what it catches)
 _FORCE_PUSH_PATTERNS: list[tuple[re.Pattern, str, str]] = [
     (
@@ -60,8 +60,8 @@ _FORCE_PUSH_PATTERNS: list[tuple[re.Pattern, str, str]] = [
 def _is_git_push_a_command(command: str) -> bool:
     """Check that 'git push' is an actual command, not a string argument.
 
-    Handles compound commands like "cd foo && git push --force" while
-    avoiding false positives like "echo 'git push --force'".
+    Expects one command from the quote-aware boundary scan, avoiding
+    false positives like "echo 'git push --force'".
 
     Args:
         command: The shell command string to inspect.
@@ -69,7 +69,45 @@ def _is_git_push_a_command(command: str) -> bool:
     Returns:
         True if 'git push' appears as an actual command invocation.
     """
-    return bool(_SHELL_OPERATOR_RE.search(command))
+    return bool(_GIT_PUSH_RE.search(command))
+
+
+def _shell_commands(command: str) -> Iterator[str]:
+    """Split at unquoted shell operators, preserving quotes and escapes.
+
+    This is a lexical boundary scan, not a full shell interpreter. In
+    particular, quoted arguments must not introduce command boundaries.
+    """
+    start = 0
+    quote: str | None = None
+    escaped = False
+    comment = False
+    for index, char in enumerate(command):
+        if comment:
+            if char == "\n":
+                comment = False
+                start = index + 1
+            continue
+        if escaped:
+            escaped = False
+            continue
+        if char == "\\" and quote != "'":
+            escaped = True
+            continue
+        if quote:
+            if char == quote:
+                quote = None
+            continue
+        if char in "\"'":
+            quote = char
+        elif char == "#" and (index == start or command[index - 1].isspace()):
+            yield command[start:index]
+            comment = True
+        elif char in ";&|\n()":
+            yield command[start:index]
+            start = index + 1
+    if not comment:
+        yield command[start:]
 
 
 def detect_force_push(command: str) -> ForcePushMatch | None:
@@ -85,12 +123,12 @@ def detect_force_push(command: str) -> ForcePushMatch | None:
     if "push" not in command:
         return None
 
-    # Ensure 'git push' is an actual command, not a string argument
-    if not _is_git_push_a_command(command):
-        return None
-
-    for pattern, name, description in _FORCE_PUSH_PATTERNS:
-        if pattern.search(command):
-            return ForcePushMatch(pattern_name=name, description=description)
+    for shell_command in _shell_commands(command):
+        # Flags belonging to a later command must not affect this push.
+        if not _is_git_push_a_command(shell_command):
+            continue
+        for pattern, name, description in _FORCE_PUSH_PATTERNS:
+            if pattern.search(shell_command):
+                return ForcePushMatch(pattern_name=name, description=description)
 
     return None

{code_puppy_core_plugins-0.0.47 → code_puppy_core_plugins-0.0.48}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy-core-plugins"
-version = "0.0.47"
+version = "0.0.48"
 description = "Official plugin bundle for Code Puppy"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"