rlmgrep 0.1.12__tar.gz → 0.1.14__tar.gz

{rlmgrep-0.1.12 → rlmgrep-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rlmgrep
-Version: 0.1.12
+Version: 0.1.14
 Summary: Grep-shaped CLI search powered by DSPy RLM
 Author: rlmgrep
 License: MIT
@@ -13,7 +13,7 @@ Requires-Dist: pypdf>=4.0.0
 
 # rlmgrep
 
-Grep-shaped search powered by DSPy RLM. It accepts a natural-language query, scans the files you point at, and prints matching lines in a grep-like format.
+Grep-shaped search powered by DSPy RLM. It accepts a natural-language query, scans the files you point at, and prints matching lines in a grep-like format. Use `--answer` to get a narrative response grounded in the selected files/directories.
 
 ## Quickstart
 
@@ -128,7 +128,7 @@ rg -l "token" . | rlmgrep --files-from-stdin --answer "What does this token cont
 ## Input selection
 
 - Directories are searched recursively by default. Use `--no-recursive` to stop recursion.
-- Hidden files and `.gitignore` rules are respected by default. Use `--hidden` or `--no-ignore` to include them.
+- Hidden files and ignore files (`.gitignore`, `.ignore`, `.rgignore`) are respected by default. Use `--hidden` or `--no-ignore` to include them.
 - `--type` uses built-in type mappings (e.g., `py`, `js`, `md`); unknown values are treated as file extensions.
 - `-g/--glob` matches path globs against normalized paths (forward slashes).
 - Paths are printed relative to the current working directory when possible.

{rlmgrep-0.1.12 → rlmgrep-0.1.14}/README.md

@@ -1,6 +1,6 @@
 # rlmgrep
 
-Grep-shaped search powered by DSPy RLM. It accepts a natural-language query, scans the files you point at, and prints matching lines in a grep-like format.
+Grep-shaped search powered by DSPy RLM. It accepts a natural-language query, scans the files you point at, and prints matching lines in a grep-like format. Use `--answer` to get a narrative response grounded in the selected files/directories.
 
 ## Quickstart
 
@@ -115,7 +115,7 @@ rg -l "token" . | rlmgrep --files-from-stdin --answer "What does this token cont
 ## Input selection
 
 - Directories are searched recursively by default. Use `--no-recursive` to stop recursion.
-- Hidden files and `.gitignore` rules are respected by default. Use `--hidden` or `--no-ignore` to include them.
+- Hidden files and ignore files (`.gitignore`, `.ignore`, `.rgignore`) are respected by default. Use `--hidden` or `--no-ignore` to include them.
 - `--type` uses built-in type mappings (e.g., `py`, `js`, `md`); unknown values are treated as file extensions.
 - `-g/--glob` matches path globs against normalized paths (forward slashes).
 - Paths are printed relative to the current working directory when possible.

{rlmgrep-0.1.12 → rlmgrep-0.1.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rlmgrep"
-version = "0.1.12"
+version = "0.1.14"
 description = "Grep-shaped CLI search powered by DSPy RLM"
 readme = "README.md"
 requires-python = ">=3.11"

{rlmgrep-0.1.12 → rlmgrep-0.1.14}/rlmgrep/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.1.12"
+__version__ = "0.1.14"

{rlmgrep-0.1.12 → rlmgrep-0.1.14}/rlmgrep/cli.py

@@ -11,7 +11,7 @@ from .config import ensure_default_config, load_config
 from .file_map import build_file_map
 from .ingest import (
     FileRecord,
-    build_gitignore_spec,
+    build_ignore_spec,
     collect_candidates,
     load_files,
     resolve_type_exts,
@@ -88,7 +88,12 @@ def _parse_args(argv: list[str]) -> argparse.Namespace:
     parser.add_argument("-m", dest="max_count", type=int, default=None, help="Max matching lines per file")
     parser.add_argument("-a", "--text", dest="binary_as_text", action="store_true", help="Search binary files as text")
     parser.add_argument("--hidden", action="store_true", help="Include hidden files and directories")
-    parser.add_argument("--no-ignore", dest="no_ignore", action="store_true", help="Do not respect .gitignore")
+    parser.add_argument(
+        "--no-ignore",
+        dest="no_ignore",
+        action="store_true",
+        help="Do not respect ignore files (.gitignore/.ignore/.rgignore)",
+    )
     parser.add_argument("--answer", action="store_true", help="Print a narrative answer before grep output")
     parser.add_argument("-y", "--yes", action="store_true", help="Skip file count confirmation")
     parser.add_argument(
@@ -147,11 +152,24 @@ def _pick(cli_value, config: dict, key: str, default=None):
     return default
 
 
-def _find_git_root(start: Path) -> Path | None:
+def _find_git_root(start: Path) -> tuple[Path | None, Path | None]:
     for p in [start, *start.parents]:
-        if (p / ".git").is_dir():
-            return p
-    return None
+        git_path = p / ".git"
+        if git_path.is_dir():
+            return p, git_path
+        if git_path.is_file():
+            try:
+                raw = git_path.read_text(encoding="utf-8", errors="ignore").strip()
+            except Exception:
+                raw = ""
+            if raw.startswith("gitdir:"):
+                git_dir = raw.split(":", 1)[1].strip()
+                git_dir_path = Path(git_dir)
+                if not git_dir_path.is_absolute():
+                    git_dir_path = (p / git_dir_path).resolve()
+                return p, git_dir_path
+            return p, None
+    return None, None
 
 
 def _env_value(name: str) -> str | None:
@@ -442,8 +460,12 @@ def main(argv: list[str] | None = None) -> int:
         ignore_spec = None
         ignore_root = None
         if not args.no_ignore:
-            ignore_root = _find_git_root(cwd) or cwd
-            ignore_spec = build_gitignore_spec(ignore_root)
+            git_root, git_dir = _find_git_root(cwd)
+            ignore_root = git_root or cwd
+            extra_ignores: list[Path] = []
+            if git_dir is not None:
+                extra_ignores.append(git_dir / "info" / "exclude")
+            ignore_spec = build_ignore_spec(ignore_root, extra_paths=extra_ignores)
 
         candidates = collect_candidates(
             input_paths,

{rlmgrep-0.1.12 → rlmgrep-0.1.14}/rlmgrep/ingest.py

@@ -6,10 +6,7 @@ import os
 from pathlib import Path, PurePosixPath
 from typing import Any, Callable, Iterable
 
-try:
-    import pathspec
-except Exception:  # pragma: no cover - optional at import time
-    pathspec = None
+import pathspec
 
 from pypdf import PdfReader
 
@@ -167,18 +164,28 @@ def collect_files(paths: Iterable[str], recursive: bool = True) -> list[Path]:
     return files
 
 
-def build_gitignore_spec(root: Path) -> "pathspec.PathSpec | None":
-    if pathspec is None:
-        return None
+IGNORE_FILENAMES = {".gitignore", ".ignore", ".rgignore"}
+
+
+def build_ignore_spec(
+    root: Path, extra_paths: Iterable[Path] | None = None
+) -> "pathspec.PathSpec | None":
     root = root.resolve()
-    gitignore_paths: list[Path] = []
+    ignore_paths: list[Path] = []
+    extra_paths = list(extra_paths or [])
+
     for dirpath, dirnames, filenames in os.walk(root):
         if ".git" in dirnames:
             dirnames.remove(".git")
-        if ".gitignore" in filenames:
-            gitignore_paths.append(Path(dirpath) / ".gitignore")
+        for name in filenames:
+            if name in IGNORE_FILENAMES:
+                ignore_paths.append(Path(dirpath) / name)
 
-    if not gitignore_paths:
+    for extra in extra_paths:
+        if extra.exists():
+            ignore_paths.append(extra)
+
+    if not ignore_paths:
         return None
 
     def _sort_key(p: Path) -> tuple[int, str]:
@@ -189,10 +196,10 @@ def build_gitignore_spec(root: Path) -> "pathspec.PathSpec | None":
         except ValueError:
             return 0, p.as_posix()
 
-    gitignore_paths.sort(key=_sort_key)
+    ignore_paths.sort(key=_sort_key)
 
     patterns: list[str] = []
-    for gi in gitignore_paths:
+    for gi in ignore_paths:
         try:
             rel_dir = gi.parent.relative_to(root).as_posix()
         except ValueError:
@@ -205,13 +212,18 @@ def build_gitignore_spec(root: Path) -> "pathspec.PathSpec | None":
             line = raw.rstrip("\n")
             if not line:
                 continue
+            escaped = False
             if line.startswith("\\#") or line.startswith("\\!"):
                 line = line[1:]
-            elif line.startswith("#"):
+                escaped = True
+            if not escaped and line.startswith("#"):
                 continue
-            negated = line.startswith("!")
-            if negated:
+            negated = False
+            if not escaped and line.startswith("!"):
+                negated = True
                 line = line[1:]
+            if not line:
+                continue
             if line.startswith("/"):
                 line = line[1:]
             if rel_dir:

{rlmgrep-0.1.12 → rlmgrep-0.1.14}/rlmgrep.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rlmgrep
-Version: 0.1.12
+Version: 0.1.14
 Summary: Grep-shaped CLI search powered by DSPy RLM
 Author: rlmgrep
 License: MIT
@@ -13,7 +13,7 @@ Requires-Dist: pypdf>=4.0.0
 
 # rlmgrep
 
-Grep-shaped search powered by DSPy RLM. It accepts a natural-language query, scans the files you point at, and prints matching lines in a grep-like format.
+Grep-shaped search powered by DSPy RLM. It accepts a natural-language query, scans the files you point at, and prints matching lines in a grep-like format. Use `--answer` to get a narrative response grounded in the selected files/directories.
 
 ## Quickstart
 
@@ -128,7 +128,7 @@ rg -l "token" . | rlmgrep --files-from-stdin --answer "What does this token cont
 ## Input selection
 
 - Directories are searched recursively by default. Use `--no-recursive` to stop recursion.
-- Hidden files and `.gitignore` rules are respected by default. Use `--hidden` or `--no-ignore` to include them.
+- Hidden files and ignore files (`.gitignore`, `.ignore`, `.rgignore`) are respected by default. Use `--hidden` or `--no-ignore` to include them.
 - `--type` uses built-in type mappings (e.g., `py`, `js`, `md`); unknown values are treated as file extensions.
 - `-g/--glob` matches path globs against normalized paths (forward slashes).
 - Paths are printed relative to the current working directory when possible.