mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-09 12:17:13 +00:00
Extends ``[tool.ruff.lint].select`` with six additional rule families:
``RUF`` (ruff-specific), ``SIM`` (flake8-simplify), ``C4``
(flake8-comprehensions), ``PERF`` (perflint), ``RET`` (flake8-return),
``PIE`` (flake8-pie). Adds ``RUF001/002/003`` to ``ignore`` because
those exist for homoglyph-attack detection, not English typography —
the project uses em/en-dashes and ``ℹ`` as a UI-hint glyph in CLI help
output deliberately.
Auto-fixed (~225, mechanical & behavior-preserving)
====================================================
- RUF005: ``a + [b]`` → ``[*a, b]``
- C408: ``dict(k=v)`` → ``{"k": v}``
- C420: ``dict.fromkeys(seq)`` shape simplifications
- SIM103/SIM110/SIM118: truthy-return / dict-key / dict-method
idiom simplifications
- RET504/RET505: drop unneeded final assigns / ``else`` after
``return``
- PIE810: combine ``str.startswith(a) or .startswith(b)``
into one call with a tuple
- RUF010: ``f"{str(x)}"`` → ``f"{x\!s}"``
- RUF100: removed unused ``# noqa`` directives that
became stale (mostly old ``# noqa: E402``
markers that ruff's smart E402 implementation
no longer flags after ``sys.path`` shims)
- RUF015 / RUF013 / RUF022 / RUF046 / RUF059: misc small wins
- I001: re-sorted import blocks where the new
imports above shifted them
Hand-fixed (~140, scripted where mechanical)
============================================
PERF401 (42): scripted AST rewrite of
``for x in iter: target.append(expr)`` (with optional ``if`` guard)
→ ``target.extend(expr for x in iter [if cond])``.
``list.extend(genexp)`` consumes the generator immediately, so the
rewrite is semantically equivalent to the original eager loop.
SIM117 (41): scripted AST combiner for nested ``with`` blocks where
the inner is the only statement of the outer (38 sites). The remaining
3 multi-line ``patch.object(...)`` chains were combined by hand using
the parenthesised ``with (\\n A,\\n B,\\n):`` form.
SIM102 (14): scripted AST combiner for nested ``if`` (10 sites). The
remaining 4 carry an inline ``# noqa: SIM102`` with rationale —
combining would either change semantics (the outer body has siblings
beyond the inner ``if``, e.g. ``cli/encrypt/inventory/__main__.py``
where ``encrypted_value = …`` runs regardless of ``ask_confirmation``)
or hurt readability (long literal whitelists).
RUF012 (9): annotated mutable class attributes with ``ClassVar[…]``
and added ``from typing import ClassVar``.
SIM105 (6): ``try/except: pass`` → ``with contextlib.suppress(…):``
with the necessary ``import contextlib`` added. Verified on
``utils/templating.py`` (3 occurrences in a ``finally`` block) —
cleanup behaviour is identical.
SIM115 (4): wrapped ``tempfile.NamedTemporaryFile(..., delete=False)``
call patterns in a ``with`` block; ``delete=False`` keeps the file
on disk after the block, so callers' ``return f.name`` still works.
PERF402, PERF403, B007, SIM108, SIM103: 5 misc fixes (loop→list-copy,
loop→dict-comprehension, unused-loop-var rename, ternary, return
expression).
Verification
============
- ``ruff check .`` → All checks passed
- ``ruff format --check .`` → 894 files already formatted
- 1621 unit tests → all pass
- Integration suite: 44 baseline failures, 1 skipped (unchanged)
- Sample-audited PERF401 rewrites in ``resolver.py``, ``inventory.py``,
``cache/files.py``, ``ressources/__main__.py``; SIM117 in
``test_main.py``; SIM105 in ``utils/templating.py``; SIM102 noqa
rationales in ``cli/encrypt/inventory/__main__.py``.
182 files changed, +993 / −960. With this and the prior strict-rule
commit the branch satisfies 11 ruff rule families end-to-end.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
166 lines
5.2 KiB
Python
166 lines
5.2 KiB
Python
from __future__ import annotations
|
|
|
|
import argparse
|
|
import os
|
|
import unittest
|
|
import unittest.mock
|
|
|
|
from cli.deploy.development import exec as exec_cmd
|
|
|
|
|
|
def _args(
|
|
*,
|
|
distro: str = "debian",
|
|
cmd: list[str] | None = None,
|
|
env: list[str] | None = None,
|
|
) -> argparse.Namespace:
|
|
return argparse.Namespace(
|
|
distro=distro,
|
|
cmd=cmd if cmd is not None else [],
|
|
env=env if env is not None else [],
|
|
)
|
|
|
|
|
|
class TestDevelopmentExec(unittest.TestCase):
|
|
def test_handler_forwards_services_disabled(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(
|
|
os.environ, {"SERVICES_DISABLED": "email"}, clear=False
|
|
),
|
|
):
|
|
rc = exec_cmd.handler(_args(cmd=["--", "sh", "-lc", "true"]))
|
|
|
|
self.assertEqual(rc, 0)
|
|
compose.exec.assert_called_once_with(
|
|
["sh", "-lc", "true"],
|
|
check=False,
|
|
extra_env={"SERVICES_DISABLED": "email"},
|
|
)
|
|
|
|
def test_handler_omits_extra_env_when_services_disabled_unset(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
env = {k: v for k, v in os.environ.items() if k != "SERVICES_DISABLED"}
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(os.environ, env, clear=True),
|
|
):
|
|
rc = exec_cmd.handler(_args(cmd=["echo", "hi"]))
|
|
|
|
self.assertEqual(rc, 0)
|
|
compose.exec.assert_called_once_with(
|
|
["echo", "hi"], check=False, extra_env=None
|
|
)
|
|
|
|
def test_handler_requires_command(self):
|
|
with self.assertRaises(SystemExit):
|
|
exec_cmd.handler(_args(cmd=[]))
|
|
|
|
def test_env_pairs_are_injected_into_extra_env(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
env = {k: v for k, v in os.environ.items() if k != "SERVICES_DISABLED"}
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(os.environ, env, clear=True),
|
|
):
|
|
rc = exec_cmd.handler(
|
|
_args(
|
|
cmd=["bash", "/opt/helper.sh"],
|
|
env=["INVENTORY_FILE=/srv/inv/devices.yml", "APPS=web-app-foo"],
|
|
)
|
|
)
|
|
|
|
self.assertEqual(rc, 0)
|
|
compose.exec.assert_called_once_with(
|
|
["bash", "/opt/helper.sh"],
|
|
check=False,
|
|
extra_env={
|
|
"INVENTORY_FILE": "/srv/inv/devices.yml",
|
|
"APPS": "web-app-foo",
|
|
},
|
|
)
|
|
|
|
def test_env_pair_with_equals_in_value_is_preserved(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
env = {k: v for k, v in os.environ.items() if k != "SERVICES_DISABLED"}
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(os.environ, env, clear=True),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["EXTRA_VARS=a=1 b=2"]))
|
|
|
|
# Only the first '=' splits key from value; everything after stays intact.
|
|
compose.exec.assert_called_once_with(
|
|
["true"],
|
|
check=False,
|
|
extra_env={"EXTRA_VARS": "a=1 b=2"},
|
|
)
|
|
|
|
def test_env_pair_overrides_implicit_services_disabled(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(
|
|
os.environ, {"SERVICES_DISABLED": "from-env"}, clear=False
|
|
),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["SERVICES_DISABLED=from-cli"]))
|
|
|
|
compose.exec.assert_called_once_with(
|
|
["true"],
|
|
check=False,
|
|
extra_env={"SERVICES_DISABLED": "from-cli"},
|
|
)
|
|
|
|
def test_env_pair_without_equals_is_rejected(self):
|
|
compose = unittest.mock.Mock()
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
self.assertRaisesRegex(SystemExit, "expects KEY=VALUE"),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["BARE"]))
|
|
|
|
def test_env_pair_with_empty_key_is_rejected(self):
|
|
compose = unittest.mock.Mock()
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
self.assertRaisesRegex(SystemExit, "KEY is empty"),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["=value"]))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|