wasm-cli 1.0.0__tar.gz → 1.0.1__tar.gz

{wasm_cli-1.0.0/src/wasm_cli.egg-info → wasm_cli-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 1.0.0
+Version: 1.0.1
 Summary: Web App System Management - Deploy and manage web applications on Linux servers
 Author: Yago López Prado
 Author-email: Yago López Prado <yago.lopez.adeje@gmail.com>

{wasm_cli-1.0.0 → wasm_cli-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wasm-cli"
-version = "1.0.0"
+version = "1.0.1"
 description = "Web App System Management - Deploy and manage web applications on Linux servers"
 readme = "README.md"
 license = { text = "WASM-NCSAL" }

{wasm_cli-1.0.0 → wasm_cli-1.0.1}/setup.py

@@ -9,7 +9,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wasm-cli",
-    version="1.0.0",
+    version="1.0.1",
     description="Web App System Management - Deploy and manage web applications on Linux servers",
     author="Yago López Prado",
     author_email="yago.lopez.adeje@gmail.com",

{wasm_cli-1.0.0 → wasm_cli-1.0.1}/src/wasm/__init__.py

@@ -15,7 +15,7 @@ from importlib.metadata import version as _installed_version
 #: as an OBS build directory. The single source of truth is the ``version``
 #: field of pyproject.toml; ``scripts/release.py`` keeps this literal and the
 #: distribution packaging files in step with it.
-_FALLBACK_VERSION = "1.0.0"
+_FALLBACK_VERSION = "1.0.1"
 
 try:
     __version__ = _installed_version("wasm-cli")

{wasm_cli-1.0.0 → wasm_cli-1.0.1}/src/wasm/deployers/base.py

@@ -120,7 +120,7 @@ class BaseDeployer(AppDeployer):
         self._registrar: StoreRegistrar | None = None
 
         # Helpers
-        self._pm_helper = PackageManagerHelper(logger=self.logger)
+        self._pm_helper = PackageManagerHelper(logger=self.logger, runner=self.runner)
         self._path_resolver = PathResolver(logger=self.logger)
         self._prisma_helper: PrismaHelper | None = None  # Initialized after app_path is set
 

{wasm_cli-1.0.0 → wasm_cli-1.0.1}/src/wasm/deployers/helpers/package_manager.py

@@ -7,14 +7,21 @@ Package manager helper for deployers.
 
 Handles detection, verification, and command generation for
 Node.js package managers (npm, pnpm, yarn, bun).
+
+Availability is asked of the injected :class:`~wasm.core.runner.CommandRunner`,
+not of the process PATH. Reading the PATH directly made the answer depend on
+whichever machine happened to run the code, which is untestable and, worse,
+meant a deploy could silently substitute one package manager for another.
 """
 
+from __future__ import annotations
+
 from pathlib import Path
 from typing import Literal
 
 from wasm.core.exceptions import DeploymentError
 from wasm.core.logger import Logger
-from wasm.core.utils import command_exists
+from wasm.core.runner import CommandRunner, get_runner
 
 PackageManager = Literal["npm", "pnpm", "bun", "yarn", "auto"]
 
@@ -27,14 +34,30 @@ class PackageManagerHelper:
     Node.js package managers.
     """
 
-    def __init__(self, logger: Logger | None = None):
+    #: Lock files, in the order that decides which manager a project uses.
+    LOCK_FILES: tuple[tuple[str, str], ...] = (
+        ("pnpm-lock.yaml", "pnpm"),
+        ("pnpm-workspace.yaml", "pnpm"),
+        ("bun.lockb", "bun"),
+        ("yarn.lock", "yarn"),
+    )
+
+    def __init__(self, logger: Logger | None = None, runner: CommandRunner | None = None):
         """
         Initialize package manager helper.
 
         Args:
             logger: Logger instance for output.
+            runner: Runner used to ask whether a program is installed. Defaults
+                to the process-wide one.
         """
         self.logger = logger or Logger()
+        self._runner = runner
+
+    @property
+    def runner(self) -> CommandRunner:
+        """The runner availability is asked of."""
+        return self._runner if self._runner is not None else get_runner()
 
     def detect(self, app_path: Path, requested: PackageManager = "auto") -> str:
         """
@@ -63,23 +86,25 @@ class PackageManagerHelper:
 
         return "npm"
 
-    def verify(self, package_manager: str) -> str:
+    def verify(self, package_manager: str, *, negotiable: bool = True) -> str:
         """
-        Verify the package manager is installed and available.
-
-        Falls back to an available package manager if the requested
-        one is not installed.
+        Check the package manager is installed, or explain what to do.
 
         Args:
-            package_manager: Requested package manager.
+            package_manager: The manager the project needs.
+            negotiable: Whether another manager would do. False for a workspace
+                that only one manager can install, where substituting produces
+                a broken tree rather than a different one.
 
         Returns:
-            Available package manager (may differ from requested).
+            The manager to use. Differs from the request only when the request
+            was negotiable and unavailable.
 
         Raises:
-            DeploymentError: If no package manager is available.
+            DeploymentError: When the manager is missing and no substitute is
+                acceptable, or when none is installed at all.
         """
-        if command_exists(package_manager):
+        if self.runner.exists(package_manager):
             return package_manager
 
         # Requested PM not available, check what is available
@@ -98,13 +123,38 @@ class PackageManagerHelper:
                 ),
             )
 
-        # Fall back to first available package manager
+        # Falling back is only safe when nothing in the project asked for a
+        # particular manager. A repository carrying pnpm-lock.yaml installed
+        # with npm resolves a different dependency tree than the one that was
+        # tested, and the failure shows up at runtime as something unrelated.
         fallback = available[0]
+        if not negotiable:
+            raise DeploymentError(
+                f"This project needs {package_manager}, which is not installed",
+                details=(
+                    f"Its workspace layout is {package_manager}'s and no other package "
+                    f"manager can install it: the dependency links it declares only "
+                    f"resolve under {package_manager}.\n\n"
+                    f"Install it:\n  npm install -g {package_manager}"
+                ),
+            )
+
+        if package_manager != "npm":
+            raise DeploymentError(
+                f"This project needs {package_manager}, which is not installed",
+                details=(
+                    f"Its lock file is {package_manager}'s, and installing it with "
+                    f"{fallback} resolves a different dependency tree than the one the "
+                    f"project was tested with.\n\n"
+                    f"Install it:\n  npm install -g {package_manager}\n\n"
+                    f"Or pass --pm {fallback} to accept the substitution."
+                ),
+            )
+
         self.logger.warning(
             f"Package manager '{package_manager}' not installed. Using '{fallback}' instead."
         )
         self.logger.info(f"Available package managers: {', '.join(available)}")
-
         return fallback
 
     def get_available(self) -> list[str]:
@@ -116,7 +166,7 @@ class PackageManagerHelper:
         """
         available = []
         for pm in ["npm", "pnpm", "yarn", "bun"]:
-            if command_exists(pm):
+            if self.runner.exists(pm):
                 available.append(pm)
         return available
 

{wasm_cli-1.0.0 → wasm_cli-1.0.1}/src/wasm/deployers/monorepo.py

@@ -138,7 +138,7 @@ class MonorepoDeployer(AppDeployer):
         self._cert_manager: CertManager | None = None
 
         # Helpers
-        self._pm_helper = PackageManagerHelper(logger=self.logger)
+        self._pm_helper = PackageManagerHelper(logger=self.logger, runner=self.runner)
         self._path_resolver = PathResolver(logger=self.logger)
         self._workspace_helper = WorkspaceHelper(logger=self.logger)
         self._turbo_helper = TurboHelper(logger=self.logger)
@@ -848,7 +848,10 @@ class MonorepoDeployer(AppDeployer):
     def _install_dependencies(self) -> None:
         """Install dependencies using pnpm."""
         # Verify pnpm
-        self.package_manager = self._pm_helper.verify("pnpm")
+        # Not negotiable: a turbo/pnpm workspace declares its internal
+        # dependencies with pnpm's workspace protocol, which npm cannot
+        # resolve at all.
+        self.package_manager = self._pm_helper.verify("pnpm", negotiable=False)
 
         result = self._run(
             ["pnpm", "install", "--frozen-lockfile"],

{wasm_cli-1.0.0 → wasm_cli-1.0.1/src/wasm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 1.0.0
+Version: 1.0.1
 Summary: Web App System Management - Deploy and manage web applications on Linux servers
 Author: Yago López Prado
 Author-email: Yago López Prado <yago.lopez.adeje@gmail.com>