wasm-cli 1.6.3__tar.gz → 1.6.4__tar.gz

{wasm_cli-1.6.3/src/wasm_cli.egg-info → wasm_cli-1.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 1.6.3
+Version: 1.6.4
 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.6.3 → wasm_cli-1.6.4}/pyproject.toml

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

{wasm_cli-1.6.3 → wasm_cli-1.6.4}/setup.py

@@ -9,7 +9,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wasm-cli",
-    version="1.6.3",
+    version="1.6.4",
     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.6.3 → wasm_cli-1.6.4}/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.6.3"
+_FALLBACK_VERSION = "1.6.4"
 
 try:
     __version__ = _installed_version("wasm-cli")

{wasm_cli-1.6.3 → wasm_cli-1.6.4}/src/wasm/deployers/base.py

@@ -360,7 +360,7 @@ class BaseDeployer(AppDeployer):
         Returns:
             Install command as list.
         """
-        return self._pm_helper.get_install_command(self.package_manager)
+        return self._pm_helper.get_install_command(self.package_manager, self.app_path)
 
     def _get_pm_run_command(self, script: str) -> list[str]:
         """

{wasm_cli-1.6.3 → wasm_cli-1.6.4}/src/wasm/deployers/helpers/package_manager.py

@@ -170,16 +170,27 @@ class PackageManagerHelper:
                 available.append(pm)
         return available
 
-    def get_install_command(self, package_manager: str) -> list[str]:
+    def get_install_command(self, package_manager: str, path: Path | None = None) -> list[str]:
         """
         Get the install command for the package manager.
 
         Args:
             package_manager: Package manager name.
+            path: The project directory. With npm and no lockfile in it the
+                command is ``npm install``: ``npm ci`` refuses to run without
+                one and fails with a usage error that says nothing useful.
 
         Returns:
             Install command as list.
         """
+        if (
+            package_manager == "npm"
+            and path is not None
+            and not (path / "package-lock.json").exists()
+            and not (path / "npm-shrinkwrap.json").exists()
+        ):
+            return ["npm", "install"]
+
         commands = {
             "pnpm": ["pnpm", "install", "--frozen-lockfile"],
             "bun": ["bun", "install", "--frozen-lockfile"],

{wasm_cli-1.6.3 → wasm_cli-1.6.4}/src/wasm/deployers/lifecycle.py

@@ -17,8 +17,9 @@ so the three surfaces cannot drift apart again.
 The sequence, and why it is in this order:
 
 1. A backup, so ``wasm rollback`` has somewhere to return to.
-2. A non-destructive ``git pull``. Only an explicit new source replaces the
-   tree, and then the ``.env`` is carried across it.
+2. A non-destructive ``git pull``, or, for a tree that is not a git checkout
+   or an explicit new source, a fetch that never deletes anything already in
+   the tree. The ``.env`` is carried across it.
 3. The type recorded at deploy time, not a fresh detection over a tree that
    now contains build output.
 4. The deployer's own ``update()``: install, build, and hand the tree back to
@@ -48,6 +49,7 @@ from wasm.managers.backup_manager import RollbackManager
 from wasm.managers.service_manager import ServiceManager
 from wasm.managers.source_manager import SourceManager
 from wasm.validators.domain import validate_domain
+from wasm.validators.source import validate_source
 
 #: Called as each phase begins, with its position, the total and a description.
 PhaseReporter = Callable[[int, int, str], None]
@@ -157,13 +159,13 @@ def update_app(
     if source:
         phase(2, PHASES, "Fetching from new source")
         log.substep(f"Source: {source}")
-        _fetch_keeping_env(source_manager, source, app_path, branch)
+        _refetch_without_deleting(source_manager, source, app_path, branch)
     elif not (app_path / ".git").exists() and recorded_source:
         # An archive or a local directory has nothing to pull from; the only
         # way to update it is to fetch it again.
         phase(2, PHASES, "Fetching the recorded source again")
         log.substep(f"Source: {recorded_source}")
-        _fetch_keeping_env(source_manager, recorded_source, app_path, branch)
+        _refetch_without_deleting(source_manager, recorded_source, app_path, branch)
     else:
         phase(2, PHASES, "Pulling latest changes")
         source_manager.pull(app_path, branch=branch)
@@ -208,24 +210,35 @@ def update_app(
     )
 
 
-def _fetch_keeping_env(
+def _refetch_without_deleting(
     source_manager: SourceManager, source: str, app_path: Path, branch: str | None
 ) -> None:
     """
-    Replace the tree with a new source, carrying the ``.env`` file across.
+    Bring the tree up to date with a source without deleting anything in it.
+
+    An update must never remove what the application wrote into its own tree:
+    uploaded images, generated files, anything outside version control. A git
+    checkout updated from a git source is reset to the new commit, which only
+    touches tracked files. Any other combination is copied over the existing
+    tree, so a file dropped from the source stays behind until a redeploy
+    instead of taking the application's data with it.
 
     Args:
         source_manager: Manager the fetch goes through.
-        source: The new source.
+        source: The source to fetch.
         app_path: The application's directory.
         branch: Git branch to fetch.
     """
-    # A forced fetch wipes the tree, and the environment file is the one thing
-    # in it that is not in version control.
+    # Carried across either way: a source that ships its own .env (a local
+    # development directory usually does) must not replace production's.
     env_file = app_path / ".env"
     env_backup = env_file.read_text() if env_file.is_file() else None
 
-    source_manager.fetch(source, app_path, branch=branch, force=True)
+    source_type, _ = validate_source(source)
+    if source_type == "git" and (app_path / ".git").exists():
+        source_manager.fetch(source, app_path, branch=branch, force=True)
+    else:
+        source_manager.fetch(source, app_path, branch=branch, clean=False)
 
     if env_backup is not None:
         fs = get_fs()

{wasm_cli-1.6.3 → wasm_cli-1.6.4}/src/wasm/managers/source_manager.py

@@ -1177,7 +1177,7 @@ class SourceManager(BaseManager):
         """
         Force update a Git repository by fetching and resetting.
 
-        Preserves untracked files like .env.
+        Untracked files, ignored or not, are left exactly where they are.
 
         Args:
             url: Git repository URL.
@@ -1222,14 +1222,14 @@ class SourceManager(BaseManager):
             else:
                 target_ref = "origin/main"  # Fallback
 
-        # Reset to target (preserves untracked files)
+        # reset --hard rewrites tracked files only. There is deliberately no
+        # `git clean` after it: that deletes every untracked file that is not
+        # ignored, which in a deployed application is its uploads and whatever
+        # else it wrote into its own tree.
         result = self._git(["reset", "--hard", target_ref], cwd=destination)
         if not result.success:
             raise SourceError("Git reset failed", details=result.stderr)
 
-        # Clean tracked files only
-        self._git(["clean", "-fd"], cwd=destination)
-
         return True
 
     def clone_git(

{wasm_cli-1.6.3 → wasm_cli-1.6.4/src/wasm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 1.6.3
+Version: 1.6.4
 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>