dirsql 0.3.13__tar.gz → 0.3.15__tar.gz

{dirsql-0.3.13 → dirsql-0.3.15}/Cargo.lock

@@ -499,7 +499,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.3.13"
+version = "0.3.15"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.3.13 → dirsql-0.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.3.13
+Version: 0.3.15
 Requires-Dist: pytest>=8 ; extra == 'dev'
 Requires-Dist: pytest-describe>=2 ; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.23 ; extra == 'dev'

{dirsql-0.3.13/dirsql/_cli → dirsql-0.3.15/dirsql/cli}/__init__.py

@@ -1,6 +1,6 @@
 """CLI launcher package.
 
 The ``dirsql`` console-script entry resolves to
-``dirsql._cli.main:main``. See each submodule for the individual
+``dirsql.cli.main:main``. See each submodule for the individual
 functions: :mod:`is_windows`, :mod:`binary_path`, :mod:`main`.
 """

{dirsql-0.3.13/dirsql/_cli → dirsql-0.3.15/dirsql/cli}/binary_path.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from importlib.resources import files
 
-from dirsql._cli.is_windows import is_windows
+from dirsql.cli.is_windows import is_windows
 
 
 def binary_path() -> str:

dirsql-0.3.15/dirsql/cli/binary_path_test.py

@@ -0,0 +1,51 @@
+"""Unit tests for `binary_path`."""
+
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from dirsql.cli import binary_path as bp_module
+from dirsql.cli.binary_path import binary_path
+
+
+def _stage_binary(root: Path, name: str) -> Path:
+    binary_dir = root / "_binary"
+    binary_dir.mkdir()
+    target = binary_dir / name
+    target.write_text("")
+    return target
+
+
+def describe_binary_path():
+    def it_returns_the_dirsql_path_on_posix(tmp_path: Path):
+        target = _stage_binary(tmp_path, "dirsql")
+        with (
+            patch.object(bp_module, "is_windows", return_value=False),
+            patch.object(bp_module, "files", return_value=tmp_path),
+        ):
+            assert binary_path() == str(target)
+
+    def it_returns_the_dirsql_exe_path_on_windows(tmp_path: Path):
+        target = _stage_binary(tmp_path, "dirsql.exe")
+        with (
+            patch.object(bp_module, "is_windows", return_value=True),
+            patch.object(bp_module, "files", return_value=tmp_path),
+        ):
+            assert binary_path() == str(target)
+
+    def it_raises_file_not_found_when_the_posix_binary_is_missing(tmp_path: Path):
+        with (
+            patch.object(bp_module, "is_windows", return_value=False),
+            patch.object(bp_module, "files", return_value=tmp_path),
+            pytest.raises(FileNotFoundError, match="bundled `dirsql` not found"),
+        ):
+            binary_path()
+
+    def it_raises_file_not_found_when_the_windows_binary_is_missing(tmp_path: Path):
+        with (
+            patch.object(bp_module, "is_windows", return_value=True),
+            patch.object(bp_module, "files", return_value=tmp_path),
+            pytest.raises(FileNotFoundError, match="bundled `dirsql.exe` not found"),
+        ):
+            binary_path()

dirsql-0.3.15/dirsql/cli/is_windows.py

@@ -0,0 +1,9 @@
+"""Platform check used by the launcher."""
+
+from __future__ import annotations
+
+import os
+
+
+def is_windows() -> bool:
+    return os.name == "nt"

dirsql-0.3.15/dirsql/cli/is_windows_test.py

@@ -0,0 +1,20 @@
+"""Unit tests for `is_windows`."""
+
+import os
+from unittest.mock import patch
+
+from dirsql.cli.is_windows import is_windows
+
+
+def describe_is_windows():
+    def it_returns_true_when_os_name_is_nt():
+        with patch.object(os, "name", "nt"):
+            assert is_windows() is True
+
+    def it_returns_false_when_os_name_is_posix():
+        with patch.object(os, "name", "posix"):
+            assert is_windows() is False
+
+    def it_returns_false_when_os_name_is_anything_else():
+        with patch.object(os, "name", "java"):
+            assert is_windows() is False

{dirsql-0.3.13/dirsql/_cli → dirsql-0.3.15/dirsql/cli}/main.py

@@ -7,8 +7,8 @@ import os
 import subprocess
 import sys
 
-from dirsql._cli.binary_path import binary_path
-from dirsql._cli.is_windows import is_windows
+from dirsql.cli.binary_path import binary_path
+from dirsql.cli.is_windows import is_windows
 
 
 def main(argv: list[str] | None = None) -> int:
@@ -24,4 +24,4 @@ def main(argv: list[str] | None = None) -> int:
         completed = subprocess.run([binary, *argv])
         return completed.returncode
     os.execv(binary, [binary, *argv])
-    return 0  # unreachable
+    return 0

dirsql-0.3.15/dirsql/cli/main_test.py

@@ -0,0 +1,87 @@
+"""Unit tests for the launcher's `main`."""
+
+import io
+import os
+import subprocess
+import sys
+from unittest.mock import patch
+
+from dirsql.cli import main as main_module
+from dirsql.cli.main import main
+
+
+class _Completed:
+    def __init__(self, returncode: int):
+        self.returncode = returncode
+
+
+def describe_main():
+    def describe_when_binary_path_raises_file_not_found():
+        def it_returns_1_and_writes_a_dirsql_prefixed_message_to_stderr():
+            fake_stderr = io.StringIO()
+            with (
+                patch.object(
+                    main_module,
+                    "binary_path",
+                    side_effect=FileNotFoundError("bundled `dirsql` missing"),
+                ),
+                patch.object(sys, "stderr", fake_stderr),
+            ):
+                assert main([]) == 1
+            assert fake_stderr.getvalue() == "dirsql: bundled `dirsql` missing\n"
+
+    def describe_on_windows():
+        def it_runs_the_binary_via_subprocess_and_returns_its_returncode():
+            with (
+                patch.object(main_module, "binary_path", return_value="C:/dirsql.exe"),
+                patch.object(main_module, "is_windows", return_value=True),
+                patch.object(subprocess, "run", return_value=_Completed(7)) as run,
+            ):
+                assert main(["--version"]) == 7
+            run.assert_called_once_with(["C:/dirsql.exe", "--version"])
+
+        def it_does_not_invoke_execv():
+            with (
+                patch.object(main_module, "binary_path", return_value="C:/dirsql.exe"),
+                patch.object(main_module, "is_windows", return_value=True),
+                patch.object(subprocess, "run", return_value=_Completed(0)),
+                patch.object(os, "execv") as execv,
+            ):
+                main([])
+            execv.assert_not_called()
+
+    def describe_on_posix():
+        def it_hands_off_to_execv_with_the_binary_argv_pair():
+            with (
+                patch.object(
+                    main_module, "binary_path", return_value="/usr/local/bin/dirsql"
+                ),
+                patch.object(main_module, "is_windows", return_value=False),
+                patch.object(os, "execv") as execv,
+            ):
+                main(["query", "select 1"])
+            execv.assert_called_once_with(
+                "/usr/local/bin/dirsql",
+                ["/usr/local/bin/dirsql", "query", "select 1"],
+            )
+
+        def it_returns_0_when_execv_returns():
+            # In production `os.execv` never returns. The mock returns,
+            # so `main` falls through to `return 0`.
+            with (
+                patch.object(main_module, "binary_path", return_value="/bin/dirsql"),
+                patch.object(main_module, "is_windows", return_value=False),
+                patch.object(os, "execv"),
+            ):
+                assert main([]) == 0
+
+    def describe_when_argv_is_none():
+        def it_pulls_from_sys_argv_skipping_the_program_name():
+            with (
+                patch.object(sys, "argv", ["dirsql", "--help"]),
+                patch.object(main_module, "binary_path", return_value="C:/dirsql.exe"),
+                patch.object(main_module, "is_windows", return_value=True),
+                patch.object(subprocess, "run", return_value=_Completed(0)) as run,
+            ):
+                main(argv=None)
+            run.assert_called_once_with(["C:/dirsql.exe", "--help"])

{dirsql-0.3.13 → dirsql-0.3.15}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.3.13"
+version = "0.3.15"
 edition.workspace = true
 publish = false
 readme = "README.md"

{dirsql-0.3.13 → dirsql-0.3.15}/packages/python/conftest.py

@@ -1,6 +1,6 @@
 """Stub the compiled `_dirsql` extension for unit tests that don't need it.
 
-`_cli_test.py` exercises the pure-Python launcher; it must be runnable
+`cli_test.py` exercises the pure-Python launcher; it must be runnable
 without `maturin develop` having built the PyO3 extension. We stub the
 missing module here (rather than in the test file) so the stub is in
 place before pytest imports `dirsql.__init__`, which transitively

{dirsql-0.3.13 → dirsql-0.3.15}/pyproject.toml

@@ -30,7 +30,7 @@ dev = [
 ]
 
 [project.scripts]
-dirsql = "dirsql._cli.main:main"
+dirsql = "dirsql.cli.main:main"
 
 [tool.maturin]
 features = ["extension-module"]
@@ -57,22 +57,14 @@ include = [
 ]
 manifest-path = "packages/python/Cargo.toml"
 
-# CLI launcher shims (`_cli/main.py`, `_cli/binary_path.py`,
-# `_cli/is_windows.py`) that locate and exec the bundled Rust binary --
-# the Python analogue of the excluded `src/bin/` Rust launcher. The
-# AGENTS.md test-boundary rules forbid monkeypatch unit tests on
-# production module attributes (`os.execv`, `binary_path`, etc.) -- the
-# load-bearing line is the `os.execv` hand-off, whose only meaningful
-# coverage is end-to-end (real wheel install + `dirsql --version`),
-# verified by putitoutthere's wheel-content guard post-build. Omitting
-# these files keeps the 100% coverage floor honest about library code.
 [tool.coverage.run]
 omit = [
-    "dirsql/_cli/*",
     # Colocated unit tests live alongside the package source; instrumenting
     # them lets a test double's own branches pad the metric (e.g. a fake's
     # empty-list return). Exclude test files so the floor reflects only
     # library code.
     "dirsql/test_*.py",
     "dirsql/*_test.py",
+    "dirsql/cli/test_*.py",
+    "dirsql/cli/*_test.py",
 ]

dirsql-0.3.13/dirsql/_cli/is_windows.py

@@ -1,10 +0,0 @@
-"""Platform check used by the launcher. Isolated so tests can override it
-without mutating the ``os.name`` global (which upsets pathlib)."""
-
-from __future__ import annotations
-
-import os
-
-
-def is_windows() -> bool:
-    return os.name == "nt"