secretshield 0.7.0__tar.gz → 0.7.1__tar.gz

{secretshield-0.7.0/secretshield.egg-info → secretshield-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secretshield
-Version: 0.7.0
+Version: 0.7.1
 Summary: Stop secrets before they leak -- runtime redaction, multi-language scanning, auto-fix, Git hooks, and CI, all in one CLI.
 Author: Samarth Chugh (Sam3360)
 License-Expression: MIT
@@ -32,7 +32,7 @@ Dynamic: license-file
 
 [![PyPI version](https://img.shields.io/pypi/v/secretshield?color=blue)](https://pypi.org/project/secretshield/)
 [![Python versions](https://img.shields.io/pypi/pyversions/secretshield)](https://pypi.org/project/secretshield/)
-[![PyPI downloads](https://img.shields.io/pypi/dm/secretshield)](https://pypi.org/project/secretshield/)
+[![PyPI Downloads](https://api.pepy.tech/badge/secretshield/month)](https://pypi.org/project/secretshield/)
 [![License: MIT](https://img.shields.io/pypi/l/secretshield)](LICENSE)
 
 [Install](#install) · [Demo](#demo) · [Try it](#try-it) · [Full usage guide →](https://github.com/Sam3360/secretshield/blob/main/USAGE.md)

{secretshield-0.7.0 → secretshield-0.7.1}/README.md

@@ -6,7 +6,7 @@
 
 [![PyPI version](https://img.shields.io/pypi/v/secretshield?color=blue)](https://pypi.org/project/secretshield/)
 [![Python versions](https://img.shields.io/pypi/pyversions/secretshield)](https://pypi.org/project/secretshield/)
-[![PyPI downloads](https://img.shields.io/pypi/dm/secretshield)](https://pypi.org/project/secretshield/)
+[![PyPI Downloads](https://api.pepy.tech/badge/secretshield/month)](https://pypi.org/project/secretshield/)
 [![License: MIT](https://img.shields.io/pypi/l/secretshield)](LICENSE)
 
 [Install](#install) · [Demo](#demo) · [Try it](#try-it) · [Full usage guide →](https://github.com/Sam3360/secretshield/blob/main/USAGE.md)

{secretshield-0.7.0 → secretshield-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "secretshield"
-version = "0.7.0"
+version = "0.7.1"
 description = "Stop secrets before they leak -- runtime redaction, multi-language scanning, auto-fix, Git hooks, and CI, all in one CLI."
 readme = "README.md"
 license = "MIT"

{secretshield-0.7.0 → secretshield-0.7.1}/secretshield/__init__.py

@@ -23,7 +23,7 @@ from .detector import Match, detect
 from .guardian import disable, enable, is_enabled
 from .redactor import redact
 
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 
 __all__ = [
     "__version__",

{secretshield-0.7.0 → secretshield-0.7.1}/secretshield/cli.py

@@ -168,6 +168,12 @@ _KIND_DISPLAY: dict[str, tuple[str, str]] = {
 }
 
 
+def _plural(count: int, word: str) -> str:
+    """`f"{count} {word}"`, pluralized properly -- "1 rule" / "2 rules" --
+    instead of the awkward literal "rule(s)" regardless of count."""
+    return f"{count} {word}" if count == 1 else f"{count} {word}s"
+
+
 def _kind_display(kind: str) -> tuple[str, str]:
     return _KIND_DISPLAY.get(kind, (kind, "possible secret"))
 
@@ -437,8 +443,8 @@ def _run_scan(args: argparse.Namespace) -> int:
     custom_rules, custom_rule_errors = load_custom_rules(Path.cwd())
     if custom_rule_errors:
         print(
-            f"secretshield: warning: {len(custom_rule_errors)} invalid custom "
-            f"rule(s) in .secretshield-rules.toml -- run `secretshield rules "
+            f"secretshield: warning: {_plural(len(custom_rule_errors), 'invalid custom rule')} "
+            f"in .secretshield-rules.toml -- run `secretshield rules "
             f"check` for details.",
             file=sys.stderr,
         )
@@ -787,7 +793,7 @@ def _cmd_rules_check(args: argparse.Namespace) -> int:
         return 1
 
     print(f"{green(chr(0x2713), use_color)} {path.name}")
-    print(f"{green(chr(0x2713), use_color)} {len(rules)} rule(s) loaded")
+    print(f"{green(chr(0x2713), use_color)} {_plural(len(rules), 'rule')} loaded")
     print(f"{green(chr(0x2713), use_color)} All patterns are valid")
     return 0
 
@@ -815,7 +821,7 @@ def _cmd_rules_list(args: argparse.Namespace) -> int:
     if errors:
         use_color = supports_color(sys.stdout)
         print(
-            f"\n{red(chr(0x2717), use_color)} {len(errors)} rule(s) failed to load "
+            f"\n{red(chr(0x2717), use_color)} {_plural(len(errors), 'rule')} failed to load "
             f"-- run `secretshield rules check` for details."
         )
     return 0

{secretshield-0.7.0 → secretshield-0.7.1/secretshield.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secretshield
-Version: 0.7.0
+Version: 0.7.1
 Summary: Stop secrets before they leak -- runtime redaction, multi-language scanning, auto-fix, Git hooks, and CI, all in one CLI.
 Author: Samarth Chugh (Sam3360)
 License-Expression: MIT
@@ -32,7 +32,7 @@ Dynamic: license-file
 
 [![PyPI version](https://img.shields.io/pypi/v/secretshield?color=blue)](https://pypi.org/project/secretshield/)
 [![Python versions](https://img.shields.io/pypi/pyversions/secretshield)](https://pypi.org/project/secretshield/)
-[![PyPI downloads](https://img.shields.io/pypi/dm/secretshield)](https://pypi.org/project/secretshield/)
+[![PyPI Downloads](https://api.pepy.tech/badge/secretshield/month)](https://pypi.org/project/secretshield/)
 [![License: MIT](https://img.shields.io/pypi/l/secretshield)](LICENSE)
 
 [Install](#install) · [Demo](#demo) · [Try it](#try-it) · [Full usage guide →](https://github.com/Sam3360/secretshield/blob/main/USAGE.md)

{secretshield-0.7.0 → secretshield-0.7.1}/tests/test_custom_rules_cli_integration.py

@@ -129,10 +129,63 @@ def test_rules_check_success(tmp_path, monkeypatch, capsys):
     exit_code = main(["rules", "check"])
     assert exit_code == 0
     out = capsys.readouterr().out
-    assert "2 rule(s) loaded" in out
+    assert "2 rules loaded" in out
     assert "All patterns are valid" in out
 
 
+# --- Regression tests: singular/plural grammar in rule-count output --------
+# (0.7.1: these counts used to always print the literal "rule(s)"
+# regardless of count, e.g. "1 rule(s) loaded" -- fixed to pluralize
+# properly.)
+
+
+def test_rules_check_singular_grammar(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / ".secretshield-rules.toml").write_text(
+        '[[rules]]\nname = "Only One"\npattern = "ONE_[0-9]{4}"\n'
+    )
+    main(["rules", "check"])
+    out = capsys.readouterr().out
+    assert "1 rule loaded" in out
+    assert "rule(s)" not in out
+
+
+def test_rules_check_plural_grammar(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / ".secretshield-rules.toml").write_text(
+        '[[rules]]\nname = "A"\npattern = "AAA_[0-9]{4}"\n'
+        '[[rules]]\nname = "B"\npattern = "BBB_[0-9]{4}"\n'
+        '[[rules]]\nname = "C"\npattern = "CCC_[0-9]{4}"\n'
+    )
+    main(["rules", "check"])
+    out = capsys.readouterr().out
+    assert "3 rules loaded" in out
+    assert "rule(s)" not in out
+
+
+def test_rules_list_singular_error_grammar(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / ".secretshield-rules.toml").write_text(
+        '[[rules]]\nname = "Broken"\npattern = "["\n'
+    )
+    main(["rules"])
+    out = capsys.readouterr().out
+    assert "1 rule failed to load" in out
+    assert "rule(s)" not in out
+
+
+def test_scan_warning_singular_grammar(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / ".secretshield-rules.toml").write_text(
+        '[[rules]]\nname = "Broken"\npattern = "["\n'
+    )
+    (tmp_path / "clean.py").write_text("print('hello')\n")
+    main(["scan", "."])
+    err = capsys.readouterr().err
+    assert "1 invalid custom rule in" in err
+    assert "rule(s)" not in err
+
+
 def test_rules_check_reports_errors(tmp_path, monkeypatch, capsys):
     monkeypatch.chdir(tmp_path)
     (tmp_path / ".secretshield-rules.toml").write_text(