wasm-cli 0.15.0__tar.gz → 0.15.2__tar.gz

{wasm_cli-0.15.0/src/wasm_cli.egg-info → wasm_cli-0.15.2}/PKG-INFO

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

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

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/setup.py

@@ -9,7 +9,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wasm-cli",
-    version="0.15.0",
+    version="0.15.2",
     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",
@@ -24,10 +24,33 @@ setup(
     ],
     extras_require={
         "interactive": ["inquirer>=3.1.0"],
+        "web": [
+            "fastapi>=0.109.0",
+            "uvicorn[standard]>=0.27.0",
+            "python-jose[cryptography]>=3.3.0",
+            "passlib[bcrypt]>=1.7.4",
+            "psutil>=5.9.0",
+            "aiofiles>=23.0.0",
+        ],
+        "monitor": [
+            "psutil>=5.9.0",
+            "httpx>=0.25.0",
+        ],
+        "all": [
+            "inquirer>=3.1.0",
+            "rich>=13.0",
+            "psutil>=5.9.0",
+            "httpx>=0.25.0",
+            "fastapi>=0.109.0",
+            "uvicorn[standard]>=0.27.0",
+            "python-jose[cryptography]>=3.3.0",
+            "passlib[bcrypt]>=1.7.4",
+            "aiofiles>=23.0.0",
+        ],
     },
     entry_points={
         "console_scripts": [
-            "wasm=wasm.main:main",
+            "wasm=wasm.main:cli",
         ],
     },
     data_files=[

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/__init__.py

@@ -8,7 +8,7 @@ WASM - Web App System Management
 A robust CLI tool for deploying and managing web applications on Linux servers.
 """
 
-__version__ = "0.15.0"
+__version__ = "0.15.2"
 __author__ = "Yago López Prado"
 __license__ = "WASM-NCSAL"
 

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/cli/commands/webapp.py

@@ -616,12 +616,19 @@ def _handle_update(args: Namespace) -> int:
     
     # Step 3: Detect app type and configure deployer
     logger.step(3, total_steps, "Detecting application type")
-    app_type = detect_app_type(app_path, verbose=args.verbose)
-    if not app_type:
-        app_type = "nodejs"
-        logger.substep(f"Using default: {app_type}")
-    else:
+
+    # Prefer stored app type from database (initial deploy already determined it correctly)
+    stored_type = app.app_type if app else None
+    if stored_type and stored_type != "unknown":
+        app_type = stored_type
         logger.substep(f"Detected: {app_type}")
+    else:
+        app_type = detect_app_type(app_path, verbose=args.verbose)
+        if not app_type:
+            app_type = "nodejs"
+            logger.substep(f"Using default: {app_type}")
+        else:
+            logger.substep(f"Detected: {app_type}")
     
     # Handle monorepo updates with dedicated flow
     if app_type == "monorepo":

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/core/logger.py

@@ -187,16 +187,34 @@ class Logger:
     def debug(self, message: str) -> None:
         """
         Log a debug message (only shown in verbose mode).
-        
+
         Args:
             message: Debug message.
         """
         if not self.verbose:
             return
-        
+
         prefix = self._colorize("[DEBUG]", Colors.GRAY)
         msg = self._colorize(message, Colors.GRAY)
         self._write(f"      {prefix} {msg}")
+
+    def command_output(self, stdout: str, stderr: str) -> None:
+        """
+        Log command stdout/stderr (only shown in verbose mode).
+
+        Args:
+            stdout: Command standard output.
+            stderr: Command standard error output.
+        """
+        if not self.verbose:
+            return
+
+        for stream in (stdout, stderr):
+            if not stream or not stream.strip():
+                continue
+            for line in stream.rstrip("\n").split("\n"):
+                text = self._colorize(f"        {line}", Colors.GRAY)
+                self._write(text)
     
     def info(self, message: str) -> None:
         """

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/deployers/base.py

@@ -160,18 +160,20 @@ class BaseDeployer(ABC):
     ):
         """Run a command and return result."""
         self.logger.debug(f"Running: {' '.join(command)}")
-        
+
         # Merge environment variables
         run_env = self.env_vars.copy()
         if env:
             run_env.update(env)
-        
-        return run_command(
+
+        result = run_command(
             command,
             cwd=cwd or self.app_path,
             env=run_env if run_env else None,
             timeout=timeout,
         )
+        self.logger.command_output(result.stdout, result.stderr)
+        return result
     
     def _detect_package_manager(self) -> str:
         """

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/deployers/docker_compose.py

@@ -105,6 +105,27 @@ class DockerComposeDeployer:
         self.services: List[DockerComposeService] = []
         self.compose_path = None
 
+    # Framework config files that indicate docker-compose.yml is likely
+    # just for local development (databases, caches, etc.)
+    FRAMEWORK_CONFIG_FILES = [
+        # Next.js
+        "next.config.js", "next.config.mjs", "next.config.ts",
+        # Vite
+        "vite.config.js", "vite.config.ts", "vite.config.mjs",
+        # Angular
+        "angular.json",
+        # Nuxt
+        "nuxt.config.js", "nuxt.config.ts",
+        # Svelte
+        "svelte.config.js",
+        # Astro
+        "astro.config.mjs", "astro.config.ts",
+        # Remix
+        "remix.config.js", "remix.config.ts",
+        # Django
+        "manage.py",
+    ]
+
     @classmethod
     def detect(cls, path: Path) -> bool:
         """
@@ -113,7 +134,8 @@ class DockerComposeDeployer:
         Detection priority:
         - If docker-compose.prod.yml exists -> True (strong signal)
         - If only docker-compose.yml exists AND monorepo signals -> False
-        - If only docker-compose.yml exists without monorepo -> True
+        - If only docker-compose.yml exists AND framework config files -> False
+        - If only docker-compose.yml exists without other signals -> True
 
         Args:
             path: Path to check.
@@ -146,6 +168,14 @@ class DockerComposeDeployer:
                 if app_count >= 2:
                     return False
 
+        # Check for framework config files - if present, docker-compose.yml
+        # is likely just for local development (databases, caches, etc.)
+        has_framework = any(
+            (path / f).exists() for f in cls.FRAMEWORK_CONFIG_FILES
+        )
+        if has_framework:
+            return False
+
         return True
 
     def configure(

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/deployers/python.py

@@ -2,6 +2,7 @@
 Python deployer for WASM.
 """
 
+import os
 from pathlib import Path
 from typing import Dict, List
 import re
@@ -80,7 +81,8 @@ class PythonDeployer(BaseDeployer):
         # Check for common patterns
         if self.framework == "django":
             # Look for wsgi.py or asgi.py
-            for root, dirs, files in (self.app_path).walk():
+            for root, dirs, files in os.walk(self.app_path):
+                root = Path(root)
                 if "wsgi.py" in files:
                     # Get module path
                     rel_path = root.relative_to(self.app_path)
@@ -90,7 +92,6 @@ class PythonDeployer(BaseDeployer):
                     rel_path = root.relative_to(self.app_path)
                     module = str(rel_path).replace("/", ".")
                     asgi_app = f"{module}.asgi:application"
-                break
         
         elif self.framework == "flask":
             # Check for app.py, main.py, or __init__.py

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/managers/base_manager.py

@@ -57,10 +57,8 @@ class BaseManager(ABC):
         """
         self.logger.debug(f"Running: {' '.join(command)}")
         result = run_command(command, cwd=cwd, env=env, timeout=timeout)
-        
-        if not result.success:
-            self.logger.debug(f"Command failed: {result.stderr}")
-        
+        self.logger.command_output(result.stdout, result.stderr)
+
         return result
     
     def _run_sudo(
@@ -84,10 +82,8 @@ class BaseManager(ABC):
         """
         self.logger.debug(f"Running (sudo): {' '.join(command)}")
         result = run_command_sudo(command, cwd=cwd, env=env, timeout=timeout)
-        
-        if not result.success:
-            self.logger.debug(f"Command failed: {result.stderr}")
-        
+        self.logger.command_output(result.stdout, result.stderr)
+
         return result
     
     @abstractmethod

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/web/jobs.py

@@ -17,6 +17,13 @@ from enum import Enum
 from typing import Dict, List, Optional, Callable, Any
 from pathlib import Path
 
+from wasm.core.exceptions import (
+    BackupError,
+    CertificateError,
+    DeploymentError,
+    RollbackError,
+)
+
 
 class JobStatus(str, Enum):
     """Job execution status."""
@@ -477,12 +484,12 @@ def deploy_app_job(
         
         if job_context.is_cancelled:
             process.terminate()
-            raise Exception("Job cancelled by user")
-    
+            raise DeploymentError("Job cancelled by user")
+
     process.wait()
-    
+
     if process.returncode != 0:
-        raise Exception(f"Deployment failed with exit code {process.returncode}")
+        raise DeploymentError(f"Deployment failed with exit code {process.returncode}")
     
     job_context.update("Deployment complete", 100)
     
@@ -523,10 +530,10 @@ def update_app_job(
     process.wait()
     
     if process.returncode != 0:
-        raise Exception(f"Update failed with exit code {process.returncode}")
-    
+        raise DeploymentError(f"Update failed with exit code {process.returncode}")
+
     job_context.update("Update complete", 100)
-    
+
     return {"domain": domain, "status": "updated"}
 
 
@@ -566,10 +573,10 @@ def delete_app_job(
     process.wait()
     
     if process.returncode != 0:
-        raise Exception(f"Deletion failed with exit code {process.returncode}")
-    
+        raise DeploymentError(f"Deletion failed with exit code {process.returncode}")
+
     job_context.update("Deletion complete", 100)
-    
+
     return {"domain": domain, "status": "deleted"}
 
 
@@ -605,10 +612,10 @@ def backup_app_job(
     process.wait()
     
     if process.returncode != 0:
-        raise Exception(f"Backup failed with exit code {process.returncode}")
-    
+        raise BackupError(f"Backup failed with exit code {process.returncode}")
+
     job_context.update("Backup complete", 100)
-    
+
     return {"domain": domain, "status": "backup_created", "path": backup_path}
 
 
@@ -644,10 +651,10 @@ def rollback_app_job(
     process.wait()
     
     if process.returncode != 0:
-        raise Exception(f"Rollback failed with exit code {process.returncode}")
-    
+        raise RollbackError(f"Rollback failed with exit code {process.returncode}")
+
     job_context.update("Rollback complete", 100)
-    
+
     return {"domain": domain, "status": "rolled_back"}
 
 
@@ -683,8 +690,8 @@ def cert_create_job(
     process.wait()
     
     if process.returncode != 0:
-        raise Exception(f"Certificate creation failed with exit code {process.returncode}")
-    
+        raise CertificateError(f"Certificate creation failed with exit code {process.returncode}")
+
     job_context.update("Certificate created", 100)
-    
+
     return {"domain": domain, "status": "certificate_created"}

{wasm_cli-0.15.0 → wasm_cli-0.15.2}/src/wasm/web/server.py

@@ -6,6 +6,7 @@ API routing, and static file serving.
 """
 
 import asyncio
+import logging
 import os
 import signal
 import socket
@@ -13,6 +14,8 @@ from contextlib import asynccontextmanager
 from pathlib import Path
 from typing import Optional
 
+logger = logging.getLogger(__name__)
+
 from fastapi import FastAPI, Request, Response, HTTPException, Depends
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import HTMLResponse, JSONResponse, FileResponse
@@ -417,18 +420,16 @@ def run_server(
     
     if show_token:
         local_ip = get_local_ip() if host == "0.0.0.0" else host
-        print("\n" + "=" * 60)
-        print("🌐 WASM Web Interface")
+        print()
         print("=" * 60)
-        print(f"\n🔐 Access Token: {master_token}")
-        print(f"\n📡 Server: http://{local_ip}:{port}")
-        print(f"🔗 Quick Login: http://{local_ip}:{port}/login?token={master_token}")
-        print("\n⚠️  Keep this token secure! It grants full access to WASM.")
-        print("=" * 60 + "\n")
-    
-    # Flush stdout to ensure token is displayed before uvicorn starts
-    import sys
-    sys.stdout.flush()
+        print("WASM Web Interface")
+        print("=" * 60)
+        print(f"Access Token: {master_token}")
+        print(f"Server: http://{local_ip}:{port}")
+        print(f"Quick Login: http://{local_ip}:{port}/login?token={master_token}")
+        print("Keep this token secure! It grants full access to WASM.")
+        print("=" * 60)
+        print(flush=True)
     
     # Run server
     uvicorn.run(

{wasm_cli-0.15.0 → wasm_cli-0.15.2/src/wasm_cli.egg-info}/PKG-INFO

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