crapkit 0.7.4__tar.gz → 0.7.5__tar.gz

{crapkit-0.7.4/src/crapkit.egg-info → crapkit-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crapkit
-Version: 0.7.4
+Version: 0.7.5
 Summary: Scores every function on complexity times uncovered risk, ranks the worst, and blocks commits that add more.
 Author: Jean-Francois Gagne
 License: MIT
@@ -199,7 +199,7 @@ files. Review those commands before running Crapkit in a repository you do not t
 
 ```
 $ crapkit --version
-crapkit 0.7.4
+crapkit 0.7.5
 ```
 
 `python -m crapkit` works identically to the console script and is what to use from a
@@ -455,7 +455,7 @@ crapkit ships a `.pre-commit-hooks.yaml` declaring `id: crapkit-gate`. In your
 repos:
   - repo: https://github.com/JeanFrancoisGagne/crapkit
     # crapkit's release step rewrites this line to the tag it just cut
-    rev: v0.7.4
+    rev: v0.7.5
     hooks:
       - id: crapkit-gate
 ```
@@ -563,7 +563,7 @@ to a workflow, and every input has a default:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: JeanFrancoisGagne/crapkit@v0.7.4
+      - uses: JeanFrancoisGagne/crapkit@v0.7.5
 ```
 
 The whole job those four lines sit in:
@@ -583,7 +583,7 @@ jobs:
         with:
           python-version: "3.12"       # the interpreter the install below lands in
       - run: pip install -e ".[dev]"   # whatever your lanes need to run
-      - uses: JeanFrancoisGagne/crapkit@v0.7.4
+      - uses: JeanFrancoisGagne/crapkit@v0.7.5
         with:
           gate: "false"
 ```

{crapkit-0.7.4 → crapkit-0.7.5}/README.md

@@ -158,7 +158,7 @@ files. Review those commands before running Crapkit in a repository you do not t
 
 ```
 $ crapkit --version
-crapkit 0.7.4
+crapkit 0.7.5
 ```
 
 `python -m crapkit` works identically to the console script and is what to use from a
@@ -414,7 +414,7 @@ crapkit ships a `.pre-commit-hooks.yaml` declaring `id: crapkit-gate`. In your
 repos:
   - repo: https://github.com/JeanFrancoisGagne/crapkit
     # crapkit's release step rewrites this line to the tag it just cut
-    rev: v0.7.4
+    rev: v0.7.5
     hooks:
       - id: crapkit-gate
 ```
@@ -522,7 +522,7 @@ to a workflow, and every input has a default:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: JeanFrancoisGagne/crapkit@v0.7.4
+      - uses: JeanFrancoisGagne/crapkit@v0.7.5
 ```
 
 The whole job those four lines sit in:
@@ -542,7 +542,7 @@ jobs:
         with:
           python-version: "3.12"       # the interpreter the install below lands in
       - run: pip install -e ".[dev]"   # whatever your lanes need to run
-      - uses: JeanFrancoisGagne/crapkit@v0.7.4
+      - uses: JeanFrancoisGagne/crapkit@v0.7.5
         with:
           gate: "false"
 ```

{crapkit-0.7.4 → crapkit-0.7.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "crapkit"
-version = "0.7.4"
+version = "0.7.5"
 description = "Scores every function on complexity times uncovered risk, ranks the worst, and blocks commits that add more."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { text = "MIT" }

{crapkit-0.7.4 → crapkit-0.7.5}/src/crapkit/__init__.py

@@ -1,2 +1,2 @@
 """crapkit: deterministic CRAP-score framework."""
-__version__ = "0.7.4"
+__version__ = "0.7.5"

{crapkit-0.7.4 → crapkit-0.7.5}/src/crapkit/cli/scoring.py

@@ -281,7 +281,7 @@ def _scored_run(root: Path, cfg, lanes, *, reuse_artifacts: bool, reuse_unchange
     `git` is the caller's GitFacts when it already has one — verify asks for the
     dirty set before this runs, and that answer is the one the lanes must see too.
     """
-    from ..score import score_rows
+    from ..score import SharedSpanFold, score_rows
 
     git = git or GitFacts(root)
     commit, rows, corpus, cache_hits, tool_versions = _build_inventory(root, cfg, git)
@@ -294,14 +294,55 @@ def _scored_run(root: Path, cfg, lanes, *, reuse_artifacts: bool, reuse_unchange
     # Only scopes a SUCCESSFUL lane covers count as measured; a failed lane's
     # scopes fall back to no-lane flags rather than reading as untested code.
     lane_scopes = {s for lane in succeeded for s in lane.scopes}
+    shared_spans = SharedSpanFold()
     scored = score_rows(rows, coverage_by_path, lane_scopes=lane_scopes, target=cfg.target,
                         scope_targets=cfg.scope_targets,
-                        cc_only_scopes=cfg.coverage_optional_scopes)
+                        cc_only_scopes=cfg.coverage_optional_scopes,
+                        shared_spans=shared_spans)
+    _note_shared_spans(shared_spans, cfg)
     test_failures = {f for prov in provenance.values() for f in prov.get("failures", ())}
     return _ScoredRun(commit, scored, provenance, lane_errors, test_failures, tool_versions,
                       corpus, cache_hits, dead_lines)
 
 
+_SPANS_NAMED = 3
+
+
+def _over_target_at_zero(members, cfg):
+    """The worst function on each shared span that its ceiling can fail.
+
+    Every function on a shared span scores as uncovered, and a function of
+    complexity 2 scores 6 at zero coverage, so no ceiling of 6 can fail it.
+    The count carries those; the named lines are the ones worth splitting.
+    """
+    from ..score import crap
+
+    for span in members:
+        worst = max(span, key=lambda row: row.ccn)
+        if crap(worst.ccn, 0.0) > cfg.ceiling_of(worst.scope):
+            yield worst
+
+
+def _note_shared_spans(fold, cfg) -> None:
+    """Name the source line spans more than one function declares.
+
+    Loud but not fatal, the shape `_note_unanalyzable` settled for unreadable
+    files: the join cannot tell whose coverage is whose on such a span, and
+    ending the run over it left the consumer repo with no coverage run at all.
+    """
+    if not fold.sites:
+        return
+    over = sorted(_over_target_at_zero(fold.sites, cfg), key=lambda row: (-row.ccn, row.path))
+    tail = f"; {len(over)} of them hold a function over its target:" if over else ""
+    print(f"crapkit: {len(fold.sites)} source line span(s) hold more than one function; "
+          "coverage cannot say whose is whose, so those functions score as uncovered, and "
+          f"splitting the definitions onto separate lines measures them{tail}", file=sys.stderr)
+    for row in over[:_SPANS_NAMED]:
+        print(f"crapkit:   {row.path}:{row.start} (complexity {row.ccn})", file=sys.stderr)
+    if len(over) > _SPANS_NAMED:
+        print(f"crapkit:   ... and {len(over) - _SPANS_NAMED} more", file=sys.stderr)
+
+
 def _run_kind(lanes, cfg, failures) -> str:
     """A --lane subset or a run with failed lanes must never serve as the
     verify baseline: its lane set differs from what verify runs, so every

{crapkit-0.7.4 → crapkit-0.7.5}/src/crapkit/score.py

@@ -285,27 +285,71 @@ def overlay_stale_coverage(
     return scored
 
 
+class SharedSpanFold:
+    """The source line spans more than one function declares in one run.
+
+    The join cannot tell whose coverage is whose there, so each such function
+    scores as uncovered and the run names the spans instead of ending. Filled
+    while scoring; the caller reports it once.
+    """
+
+    def __init__(self) -> None:
+        self.sites: list[list[InventoryRow]] = []
+
+    def add(self, members: list[InventoryRow]) -> None:
+        self.sites.append(members)
+
+
+def _identity(row) -> tuple:
+    """What separates two functions on one span: the name, and the occurrence
+    that tells sibling callbacks on a line apart."""
+    return row.long_name, row.occurrence
+
+
+def _join_member(members: list, row) -> None:
+    """A third function on the span joins its members; another copy of one that
+    is already there (the same function in a second scope) does not."""
+    if all(_identity(member) != _identity(row) for member in members):
+        members.append(row)
+
+
 def _shared_source_spans(rows, lane_scopes: set, cc_only_scopes) -> dict:
-    seen, collisions = {}, {}
+    """span -> the distinct functions declaring it, for spans more than one does."""
+    first, collisions = {}, {}
     for row in rows:
         if _cov_without_join(row, lane_scopes, cc_only_scopes) is not None:
             continue
         span = row.path, row.start, row.end
-        identity = row.long_name, row.occurrence
-        if seen.setdefault(span, identity) != identity:
-            collisions[span] = row
+        seen = first.setdefault(span, row)
+        if _identity(seen) != _identity(row):
+            _join_member(collisions.setdefault(span, [seen]), row)
     return collisions
 
 
-def _check_coverage_spans(rows, coverage_by_path: dict, start_index: dict,
-                         lane_scopes: set, cc_only_scopes) -> None:
-    for row in _shared_source_spans(rows, lane_scopes, cc_only_scopes).values():
-        _, flag = _span_join_cov(row, coverage_by_path, start_index)
-        if flag == "measured":
-            raise ToolError(
-                f"coverage for {row.path}:{row.start} cannot distinguish functions "
-                "with the same line span; split their definitions onto separate "
-                "lines and regenerate coverage")
+def _ambiguous_spans(rows, coverage_by_path: dict, start_index: dict,
+                     lane_scopes: set, cc_only_scopes) -> dict:
+    """The shared spans a measurement would speak about, so the join would hand
+    every function on the span one function's number.
+
+    Through 0.7.4 this raised and ended the run. One consumer repo holds 591
+    shared spans, 459 of them measured, so a run died on the first one it met
+    and the repo never finished a coverage run at all. Refusing the ambiguous
+    number is the specified behaviour; ending the run over it was not, the
+    shape _note_unanalyzable settled for unreadable files.
+    """
+    ambiguous = {}
+    for span, members in _shared_source_spans(rows, lane_scopes, cc_only_scopes).items():
+        if _span_join_cov(members[0], coverage_by_path, start_index)[1] == "measured":
+            ambiguous[span] = members
+    return ambiguous
+
+
+def _ambiguous_cov(row, ambiguous: dict) -> tuple[float, str] | None:
+    """Uncovered, never the neighbour's number: the honest floor for a function
+    whose measurement cannot be told from another's."""
+    if (row.path, row.start, row.end) in ambiguous:
+        return 0.0, "untested"
+    return None
 
 
 def score_rows(
@@ -316,12 +360,17 @@ def score_rows(
     target: int = 6,
     scope_targets: dict[str, int] | None = None,
     cc_only_scopes: frozenset[str] = frozenset(),
+    shared_spans: SharedSpanFold | None = None,
 ) -> list[ScoredRow]:
     start_index = _start_index(coverage_by_path)
-    _check_coverage_spans(rows, coverage_by_path, start_index, lane_scopes, cc_only_scopes)
+    ambiguous = _ambiguous_spans(rows, coverage_by_path, start_index, lane_scopes, cc_only_scopes)
+    for members in ambiguous.values():
+        if shared_spans is not None:
+            shared_spans.add(members)
     scored = []
     for r in rows:
         cov, flag = (_cov_without_join(r, lane_scopes, cc_only_scopes)
+                     or _ambiguous_cov(r, ambiguous)
                      or _span_join_cov(r, coverage_by_path, start_index))
         scored.append(_finish(r, cov, flag, target=target, scope_targets=scope_targets))
     return scored

{crapkit-0.7.4 → crapkit-0.7.5/src/crapkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crapkit
-Version: 0.7.4
+Version: 0.7.5
 Summary: Scores every function on complexity times uncovered risk, ranks the worst, and blocks commits that add more.
 Author: Jean-Francois Gagne
 License: MIT
@@ -199,7 +199,7 @@ files. Review those commands before running Crapkit in a repository you do not t
 
 ```
 $ crapkit --version
-crapkit 0.7.4
+crapkit 0.7.5
 ```
 
 `python -m crapkit` works identically to the console script and is what to use from a
@@ -455,7 +455,7 @@ crapkit ships a `.pre-commit-hooks.yaml` declaring `id: crapkit-gate`. In your
 repos:
   - repo: https://github.com/JeanFrancoisGagne/crapkit
     # crapkit's release step rewrites this line to the tag it just cut
-    rev: v0.7.4
+    rev: v0.7.5
     hooks:
       - id: crapkit-gate
 ```
@@ -563,7 +563,7 @@ to a workflow, and every input has a default:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: JeanFrancoisGagne/crapkit@v0.7.4
+      - uses: JeanFrancoisGagne/crapkit@v0.7.5
 ```
 
 The whole job those four lines sit in:
@@ -583,7 +583,7 @@ jobs:
         with:
           python-version: "3.12"       # the interpreter the install below lands in
       - run: pip install -e ".[dev]"   # whatever your lanes need to run
-      - uses: JeanFrancoisGagne/crapkit@v0.7.4
+      - uses: JeanFrancoisGagne/crapkit@v0.7.5
         with:
           gate: "false"
 ```