invoke-toolkit 0.0.66__tar.gz → 0.0.69__tar.gz

{invoke_toolkit-0.0.66 → invoke_toolkit-0.0.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: invoke-toolkit
-Version: 0.0.66
+Version: 0.0.69
 Summary: Extended APIs for PyInvoke: composable task plugins, typed CLI args, Rich output, shell completion, and PEP 723 script support
 Project-URL: Documentation, https://github.com/D3f0/invoke-toolkit#readme
 Project-URL: Issues, https://github.com/D3f0/invoke-toolkit/issues

{invoke_toolkit-0.0.66 → invoke_toolkit-0.0.69}/src/invoke_toolkit/collections.py

@@ -250,6 +250,13 @@ class ToolkitCollection(Collection):
         if not local_tasks_file.exists():
             debug(f"No local_tasks.py found at {local_tasks_file}")
             return
+        if "local" in self.tasks:
+            logger.warning(
+                "Skipping local_tasks.py at %s because tasks.py already defines "
+                "the 'local' task namespace",
+                local_tasks_file,
+            )
+            return
 
         debug(f"Loading local tasks from {local_tasks_file}")
 

{invoke_toolkit-0.0.66 → invoke_toolkit-0.0.69}/src/invoke_toolkit/runners/rich.py

@@ -3,15 +3,24 @@ Config object used for invoke attribute resolution
 in tasks.
 """
 
+import array
+import errno
 import sys
-from typing import TYPE_CHECKING
+from typing import IO, TYPE_CHECKING
 
-from invoke.runners import Local
-from invoke.util import debug
+from invoke.runners import Local, ready_for_reading
+from invoke.util import debug, has_fileno, isatty
 from rich.syntax import Syntax
 
 from invoke_toolkit.output import get_console
 
+if sys.platform != "win32":
+    import fcntl
+    import termios
+else:
+    fcntl = None  # pylint: disable=invalid-name
+    termios = None  # pylint: disable=invalid-name
+
 if TYPE_CHECKING:
     from invoke_toolkit.config.status_helper import StatusHelper
 
@@ -96,9 +105,31 @@ class OutputCapturingStream:
 
 
 class NoStdoutRunner(Local):
-    """Invoke runner that prints to stderr when invoke is used with -e/--echo
-    and redacts secrets from subprocess output when redaction is enabled.
-    """
+    """Invoke runner with output handling and safe POSIX stdin probing."""
+
+    def read_our_stdin(self, input_: IO) -> str | None:
+        """Read stdin without Invoke's undersized POSIX ioctl buffer."""
+        if not ready_for_reading(input_):
+            return None
+
+        bytes_to_read = 1
+        if sys.platform != "win32" and isatty(input_) and has_fileno(input_):
+            buffer = array.array("i", [0])
+            try:
+                fcntl.ioctl(input_, termios.FIONREAD, buffer, True)
+                bytes_to_read = max(buffer[0], 1)
+            except OSError:
+                pass
+
+        try:
+            bytes_ = input_.read(bytes_to_read)
+        except OSError as e:
+            if e.errno != errno.EBADF:
+                raise
+            bytes_ = None
+        if bytes_ and isinstance(bytes_, bytes):
+            bytes_ = self.decode(bytes_)
+        return bytes_
 
     def echo(self, command):
         if hasattr(self.context, "print"):

{invoke_toolkit-0.0.66 → invoke_toolkit-0.0.69}/tests/test_collection.py

@@ -1,10 +1,13 @@
 import ast
+import logging
 import os
 import subprocess
 import sys
 from pathlib import Path
 from textwrap import dedent
+from typing import Any, cast
 
+from invoke_toolkit import Task, task
 from invoke_toolkit.collections import ToolkitCollection
 
 
@@ -216,6 +219,27 @@ def test_load_local_tasks_without_main_tasks(tmp_path: Path):
     assert "standalone-task" in local_col.tasks
 
 
+def test_load_local_tasks_preserves_conflicting_main_task(tmp_path: Path, caplog):
+    """A main task named local takes precedence over local_tasks.py."""
+
+    def main_task(ctx):
+        pass
+
+    decorated_main_task = cast(Task[Any], task()(main_task))
+    ns = ToolkitCollection()
+    ns.add_task(decorated_main_task, aliases=("local",))
+    (tmp_path / "local_tasks.py").write_text(
+        "from invoke_toolkit import task\n\n@task()\ndef local_task(ctx):\n    pass\n"
+    )
+
+    with caplog.at_level(logging.WARNING, logger="invoke"):
+        ns.load_local_tasks(search_path=tmp_path)
+
+    assert ns.tasks["local"] is decorated_main_task
+    assert "local" not in ns.collections
+    assert "Skipping local_tasks.py" in caplog.text
+
+
 def test_load_local_tasks_from_multiple_directories_without_module_collision(
     tmp_path: Path,
 ):

invoke_toolkit-0.0.69/tests/test_pty_stdin.py

@@ -0,0 +1,24 @@
+import os
+import tty
+from contextlib import closing
+
+import pytest
+
+from invoke_toolkit import Context
+from invoke_toolkit.runners.rich import NoStdoutRunner
+
+
+@pytest.mark.skipif(os.name == "nt", reason="PTYs are POSIX-only")
+def test_read_our_stdin_handles_escape_sequence_from_pty():
+    master_fd, slave_fd = os.openpty()
+    try:
+        tty.setcbreak(slave_fd)
+        os.write(master_fd, b"\x1b[A")
+        stream = os.fdopen(slave_fd, "rb", closefd=False)
+        with closing(stream):
+            runner = NoStdoutRunner(Context())
+            runner.encoding = "utf-8"
+            assert runner.read_our_stdin(stream) == "\x1b[A"
+    finally:
+        os.close(master_fd)
+        os.close(slave_fd)

invoke_toolkit-0.0.69/tests/test_release_guard.py

@@ -0,0 +1,85 @@
+import os
+import subprocess
+from pathlib import Path
+
+import pytest
+
+
+REPOSITORY_ROOT = Path(__file__).parents[1]
+GUARD = REPOSITORY_ROOT / "scripts" / "validate-release-tag.sh"
+
+
+def run(command: list[str], cwd: Path) -> subprocess.CompletedProcess[str]:
+    return subprocess.run(command, cwd=cwd, check=True, capture_output=True, text=True)
+
+
+@pytest.fixture
+def release_repository(tmp_path: Path) -> Path:
+    remote = tmp_path / "remote.git"
+    repository = tmp_path / "repository"
+
+    run(["git", "init", "--bare", str(remote)], tmp_path)
+    run(["git", "clone", str(remote), str(repository)], tmp_path)
+    run(["git", "config", "user.email", "test@example.com"], repository)
+    run(["git", "config", "user.name", "Test User"], repository)
+    (repository / "README").write_text("initial\n")
+    run(["git", "add", "README"], repository)
+    run(["git", "commit", "-m", "initial"], repository)
+    run(["git", "branch", "-M", "main"], repository)
+    run(["git", "push", "-u", "origin", "main"], repository)
+    return repository
+
+
+def guard(tag_name: str, repository: Path) -> subprocess.CompletedProcess[str]:
+    output = repository / "github-output"
+    return subprocess.run(
+        [str(GUARD)],
+        cwd=repository,
+        env={**os.environ, "TAG_NAME": tag_name, "GITHUB_OUTPUT": str(output)},
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+
+
+def test_accepts_canonical_tag_at_origin_main(release_repository: Path) -> None:
+    run(["git", "tag", "v0.0.67"], release_repository)
+    run(["git", "push", "origin", "v0.0.67"], release_repository)
+
+    result = guard("v0.0.67", release_repository)
+
+    assert result.returncode == 0
+
+
+def test_rejects_noncanonical_uppercase_tag(release_repository: Path) -> None:
+    run(["git", "tag", "V0.0.67"], release_repository)
+    run(["git", "push", "origin", "V0.0.67"], release_repository)
+
+    result = guard("V0.0.67", release_repository)
+
+    assert result.returncode != 0
+    assert "canonical lowercase tag" in result.stderr
+
+
+def test_rejects_tag_behind_updated_origin_main(
+    release_repository: Path, tmp_path: Path
+) -> None:
+    run(["git", "tag", "v0.0.67"], release_repository)
+    run(["git", "push", "origin", "v0.0.67"], release_repository)
+
+    updater = tmp_path / "updater"
+    run(
+        ["git", "clone", str(release_repository.parent / "remote.git"), str(updater)],
+        tmp_path,
+    )
+    run(["git", "config", "user.email", "test@example.com"], updater)
+    run(["git", "config", "user.name", "Test User"], updater)
+    run(["git", "checkout", "main"], updater)
+    (updater / "README").write_text("updated\n")
+    run(["git", "commit", "-am", "advance main"], updater)
+    run(["git", "push"], updater)
+
+    result = guard("v0.0.67", release_repository)
+
+    assert result.returncode != 0
+    assert "does not point to origin/main" in result.stderr