bytecii
73f5bd7c21
Closes the two remaining small items of Block E. Both were largely recon: much of what they filed had already been fixed, and the part that had not turned up a real GNU divergence. Item 31 (T3-7), rule/doc reconciliation --------------------------------------- The `object`-parameter half is already done: #825's mypy inversion took the package from the filed 28 down to 7, of which 3 are docstring prose and the remaining 4 are protocol methods (`__contains__`, `pop`) whose signatures typeshed dictates, all already listed in the no-object gate. `utils/errors.py` reads `str | PathSpec` today, and `builders/sed.py` no longer holds flag values at all -- item 22 moved that to the generic. That left the nested-function rule, which the plan asked to decide before gating. Measured: 39 nested defs, and **every one of them closes over its enclosing scope** -- 38 by free variable, and `sed_helper._repl` by binding through parameter defaults, the loop-variable idiom, with a comment saying so. A flat "do not nest" is a rule the architecture cannot keep (op factories, provision builders, the read-through cache, every decorator's wrapper), so gating it as written would have meant 39 standing violations. So the rule now says what it was reaching for: a nested def must capture the scope around it, or it belongs at module level. That is mechanical and enforceable -- `tests/test_nested_functions_are_closures.py` reads free variables from `symtable` and parameter defaults from the AST. It passes on the tree as-is and fires on a helper that reads only its own arguments. Layout: the eight test-only TS directories are flattened (`ram/{cat,cut,grep,head,ls,tail,wc}/`, `ssh/ls/`), `awk_helper.ts` moves up beside its nine siblings, and the `provision.ts` / `_provision.ts` split is settled on Python's convention -- `_provision` for a backend's own, bare `provision` for the shared ones (cli, generic_bind). That last one was not cosmetic: Python already had `_provision.py` for github, gmail, redis and email, so renaming **closed 4 real parity divergences** (layout baseline 296 -> 292). The `findEval`/`findParse` line was already done in #827. Item 32 (T3-8), test/CI tidiness -------------------------------- The two asymmetric `ls` conformance matrices are raised to symmetry, and they pass: python `[ram,disk,redis]` vs typescript `[ram]` was stale caution, not a divergence. Both runners now reject an asymmetric matrix at load time unless the case carries a `divergence` key explaining why -- a case is a parity claim, and narrowing one side reads as coverage while the side that still lists the backend goes green. Loading the corpus under the new assertion proves no other case was asymmetric. The README documented the override as "not yet needed"; it exists now. Adds the `ts-audit` job, mirroring `test_python.yml`'s exactly (same `continue-on-error`, same out-of-gate placement). Nothing ran `pnpm audit` for the TS tree while `typescript/package.json` carried 27 hand-written CVE overrides that only a person remembering to check kept current. Integ facets for `ls`: `-A`, `-d`, `-r`, `-S`, `-h`, all pinned against GNU coreutils 9.7 in docker. `-S` uses regular files only, because GNU sorts a directory by its inode size while mirage counts it as 0 -- a divergence CLAUDE.md documents deliberately. The `-h` facet found a real bug ------------------------------- `ls -h` disagreed with GNU three ways, and because the flag had zero cross-backend coverage nothing caught it. GNU prints a count below one unit with no suffix (`24`); mirage printed `24B`. GNU rounds *up* to the precision shown (1025 bytes is `1.1K`); mirage gave `1.0K`. GNU drops the decimal once the value reaches ten (`10K`); mirage gave `10.0K`. One shared engine replaces both formatters in both languages -- GNU runs `-h` and `-H` through one `human_readable`, and so do we now. Rounding up can carry past the base (1048575 ceils to 1024K, which GNU shows as `1.0M`), so the unit is re-chosen after rounding rather than once up front. 21 GNU-read points are pinned as a table in each language. Blast radius, all re-pinned: five integ cases that had recorded the `B` suffix (du, discord, langfuse, email, gmail), and the du fan-out tests. Those last ones needed care rather than a new number: they exist to prove the total is humanized once instead of twice, and their 1500+1500 stops discriminating under correct rounding, since 3000 bytes and two `1.5K` readings both render `3.0K`. They now use 1025+1025, where single-rounding gives `2.1K` and double-rounding would give `2.2K`. Verified: pre-commit clean, integ 8054/0 on ram+disk+redis in both languages, conformance green in both, and the layout, spec, barrel, docs, case-target and PathSpec gates all pass. Not covered, still open on item 32: integ facets for `ls -t` (mtime order is not stable across backends without a seeded fixture), mktemp, gzip, the checksum `--check` companions, `df -H/-k/-a`, and `cmp -n/-b/-i`; and the T2-7 helper unit-suite mirroring. Item 31 leaves the provision *presence* sets unreconciled (Python has lancedb/qdrant, TS has trello) -- that is a question about which backends should provision at all, not about naming. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
73 lines
2.8 KiB
Python
73 lines
2.8 KiB
Python
# ========= Copyright 2026 @ Strukto.AI All Rights Reserved. =========
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
# ========= Copyright 2026 @ Strukto.AI All Rights Reserved. =========
|
|
|
|
from mirage.commands.builtin.generic.crossmount.fanout.du import (
|
|
du_total, merge_du_totals)
|
|
from mirage.commands.builtin.generic.crossmount.types import OperandRun
|
|
from mirage.io import IOResult
|
|
from mirage.types import PathSpec
|
|
|
|
|
|
def _scope(virtual: str) -> PathSpec:
|
|
return PathSpec(virtual=virtual,
|
|
directory=virtual[:virtual.rfind("/") + 1],
|
|
resource_path="",
|
|
resolved=True)
|
|
|
|
|
|
def _op(data: bytes, exit_code: int = 0) -> OperandRun:
|
|
return OperandRun(_scope("/a/x"), data, IOResult(exit_code=exit_code))
|
|
|
|
|
|
def testdu_total_strips_per_run_totals_and_sums():
|
|
runs = [
|
|
_op(b"5\t/a/sub\n5\ttotal\n"),
|
|
_op(b"3\t/b/c.txt\n3\ttotal\n"),
|
|
]
|
|
out = du_total(runs, human=False).decode()
|
|
assert out == "5\t/a/sub\n3\t/b/c.txt\n8\ttotal\n"
|
|
|
|
|
|
def testdu_total_humanizes_from_exact_bytes_without_rounding_twice():
|
|
# run_fanout forces -h off on the native runs, so the rows arrive in
|
|
# bytes: 1025 + 1025 is 2.1K, not the 2.2K that summing two "1.1K"
|
|
# readings back through parse_size would give. 1500 would not show
|
|
# the difference -- GNU rounds up, so 3000 bytes and two 1.5K
|
|
# readings both render 3.0K.
|
|
runs = [
|
|
_op(b"1025\t/a/x\n1025\ttotal\n"),
|
|
_op(b"1025\t/b/z\n1025\ttotal\n"),
|
|
]
|
|
out = du_total(runs, human=True).decode()
|
|
assert out == "1.1K\t/a/x\n1.1K\t/b/z\n2.1K\ttotal\n"
|
|
|
|
|
|
def testdu_total_leaves_a_row_without_a_tab_alone():
|
|
out = du_total([_op(b"odd-row\n0\ttotal\n")], human=True).decode()
|
|
assert out == "odd-row\n0\ttotal\n"
|
|
|
|
|
|
def testmerge_du_totals_takes_rendered_blocks():
|
|
# The mount fan-out has no OperandRun to hand over: its blocks are one
|
|
# per mount, not one per operand.
|
|
out = merge_du_totals(
|
|
[b"10\t/base\n10\ttotal\n", b"7\t/base/inner\n7\ttotal\n"],
|
|
human=False).decode()
|
|
assert out == "10\t/base\n7\t/base/inner\n17\ttotal\n"
|
|
|
|
|
|
def testmerge_du_totals_still_totals_with_no_blocks():
|
|
# GNU prints "0 total" even when every operand failed.
|
|
assert merge_du_totals([], human=False).decode() == "0\ttotal\n"
|