devstuff 2.2.0__tar.gz → 2.2.1__tar.gz

{devstuff-2.2.0 → devstuff-2.2.1}/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.2.1 (2026-08-05)
+
+### Bug Fixes
+
+- repair the two failing builtin install integration tests (#40)
+
 ## v2.2.0 (2026-08-05)
 
 ### Features

{devstuff-2.2.0 → devstuff-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devstuff
-Version: 2.2.0
+Version: 2.2.1
 Summary: Development environment setup CLI for Linux
 Project-URL: Repository, https://github.com/thesawdawg/dev-setup-py
 Author-email: Sawyer <sawyerksu@gmail.com>

{devstuff-2.2.0 → devstuff-2.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devstuff"
-version = "2.2.0"
+version = "2.2.1"
 description = "Development environment setup CLI for Linux"
 readme = "README.md"
 requires-python = ">=3.11"

{devstuff-2.2.0 → devstuff-2.2.1}/src/dev_setup/generic.py

@@ -730,7 +730,13 @@ def _check_cmd_installed(cmd: str, *, install_type: str = "") -> bool:
             ).returncode == 0
         except Exception:
             return False
+    # Same nvm sourcing as the simple-command branch above. `bash -lc` reads ~/.profile,
+    # whose sourcing of ~/.bashrc (where nvm's init lives) returns early when the shell
+    # is non-interactive — so an nvm-installed binary is never on PATH here. Without
+    # this, any npm-type tool with a multi-word check_cmd reports "not installed"
+    # immediately after installing successfully.
+    prefix = f"{_npm_init()} && " if install_type == "npm" else ""
     try:
-        return _probe(["bash", "-lc", cmd], capture_output=True).returncode == 0
+        return _probe(["bash", "-lc", f"{prefix}{cmd}"], capture_output=True).returncode == 0
     except Exception:
         return False

{devstuff-2.2.0 → devstuff-2.2.1}/src/dev_setup/tools.yaml

@@ -706,7 +706,11 @@ tools:
     category: ai-tools
     type: npm
     npm_name: llm-checker
-    check_cmd: llm-checker hw-detect
+    # Multi-word on purpose: a "complex" check_cmd is what makes get_version() fall
+    # through to the nvm-sourcing probe, which is the only way to read the version of
+    # an nvm-installed binary. `hw-detect` also answered "is it installed", but did a
+    # full hardware scan (shelling out to lspci) on every `devstuff list` to do it.
+    check_cmd: llm-checker --version
     help_cmd: llm-checker --help
     docs_url: https://github.com/signerless/llm-checker
     requires:
@@ -722,6 +726,14 @@ tools:
     docs_url: https://lmstudio.ai/docs/cli
     install_script: |
       set -euo pipefail
+      # LM Studio's installer hard-fails on a system without libatomic: it prints the
+      # apt line to run and exits 1 rather than installing it. That is the state of a
+      # minimal Ubuntu (including this repo's CI image), so install it here — every
+      # other prerequisite the installer needs is already present on a base system.
+      if ! ldconfig -p 2>/dev/null | grep -q 'libatomic\.so'; then
+        sudo apt-get update -q
+        sudo apt-get install -y libatomic1
+      fi
       curl -fsSL https://lmstudio.ai/install.sh | bash
     remove_script: |
       set -euo pipefail

{devstuff-2.2.0 → devstuff-2.2.1}/tests/test_generic.py

@@ -159,3 +159,35 @@ def test_download_script_skips_check_when_no_sha256():
 )
 def test_is_simple_command(cmd, expected):
     assert _is_simple_command(cmd) is expected
+
+
+# -- check_cmd probing ---------------------------------------------------------------
+
+
+def _probed_script(run_mock) -> str:
+    """The shell text passed to `bash -lc` by the last _check_cmd_installed probe."""
+    return run_mock.call_args[0][0][2]
+
+
+@pytest.mark.parametrize("cmd", ["llm-checker --version", "llm-checker"])
+def test_npm_check_cmd_sources_nvm_whether_simple_or_complex(cmd):
+    """`bash -lc` never loads nvm on its own: it reads ~/.profile, whose sourcing of
+    ~/.bashrc returns early for a non-interactive shell. Without the explicit source,
+    an npm-type tool reports "not installed" right after installing successfully."""
+    with mock.patch("dev_setup.generic.shutil.which", return_value=None), \
+         mock.patch("subprocess.run") as run:
+        run.return_value.returncode = 0
+        assert generic._check_cmd_installed(cmd, install_type="npm")
+    assert ".nvm/nvm.sh" in _probed_script(run)
+
+
+def test_non_npm_check_cmd_does_not_pay_for_nvm():
+    with mock.patch("dev_setup.generic.shutil.which", return_value=None), \
+         mock.patch("subprocess.run") as run:
+        run.return_value.returncode = 0
+        generic._check_cmd_installed("test -d ~/.somewhere", install_type="bash")
+    assert ".nvm/nvm.sh" not in _probed_script(run)
+
+
+def test_complex_check_cmd_still_reports_a_failing_command_as_not_installed():
+    assert not generic._check_cmd_installed("false --version", install_type="npm")

{devstuff-2.2.0 → devstuff-2.2.1}/uv.lock

@@ -167,7 +167,7 @@ wheels = [
 
 [[package]]
 name = "devstuff"
-version = "2.2.0"
+version = "2.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "click" },