ndev-stack 0.3.4__tar.gz → 0.3.5__tar.gz

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.4
+Version: 0.3.5
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/ndev/__init__.py

@@ -1,7 +1,7 @@
 """
 ndev: Fast, cross-platform PHP developer environment for Windows and Linux.
 """
-__version__ = "0.3.4"
+__version__ = "0.3.5"
 
 from . import common as common
 from .common.logger import logger as logger

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/ndev/common/utils.py

@@ -94,3 +94,38 @@ def get_version_or_prompt(version: str = None, prompt_message: str = "PHP versio
             
     return typer.prompt(prompt_message).strip()
 
+def which_binary(cmd: str) -> str | None:
+    """
+    Find executable in PATH plus standard system admin/daemon directories
+    (/usr/sbin, /sbin, /usr/local/sbin, ~/.local/bin, ~/.ndev/bin).
+    Essential on Linux where daemons (e.g. nginx, mysqld) are in /usr/sbin,
+    which is not in standard non-root user PATH.
+    """
+    if not cmd:
+        return None
+    import shutil
+    import os
+    from pathlib import Path
+    from ndev.common.constants import NDEV_DIR
+
+    found = shutil.which(cmd)
+    if found:
+        return found
+
+    p = Path(cmd)
+    if p.is_file() and os.access(p, os.X_OK):
+        return str(p.resolve())
+
+    extra_dirs = [
+        "/usr/sbin",
+        "/sbin",
+        "/usr/local/sbin",
+        "/usr/bin",
+        "/bin",
+        "/usr/local/bin",
+        str(Path.home() / ".local" / "bin"),
+        str(NDEV_DIR / "bin"),
+    ]
+    path_env = os.environ.get("PATH", "")
+    extended_path = ":".join([path_env] + extra_dirs) if path_env else ":".join(extra_dirs)
+    return shutil.which(cmd, path=extended_path)

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/ndev/linux/commands/doctor.py

@@ -4,6 +4,7 @@ from rich.console import Console
 from rich.table import Table
 from ndev.common.constants import NDEV_DIR, CONFIG_FILE
 from ndev.common.distro import get_distro_summary, get_pkg_manager
+from ndev.common.utils import which_binary
 
 console = Console()
 
@@ -27,47 +28,47 @@ def doctor_cmd():
         build_install_cmd = "sudo apt install -y bubblewrap build-essential pkg-config"
         stack_install_cmd = "sudo apt install -y mariadb-server nginx curl"
 
-    bwrap_path = shutil.which("bwrap")
+    bwrap_path = which_binary("bwrap")
     if bwrap_path:
         try:
-            res = subprocess.run(["bwrap", "--version"], capture_output=True, text=True)
+            res = subprocess.run([bwrap_path, "--version"], capture_output=True, text=True)
             table.add_row("Bubblewrap (bwrap)", "[green]OK[/green]", f"Found at {bwrap_path} ({res.stdout.strip()})")
         except Exception as e:
             table.add_row("Bubblewrap (bwrap)", "[red]FAILED[/red]", f"Found at {bwrap_path} but failed to run: {e}")
     else:
         table.add_row("Bubblewrap (bwrap)", "[red]MISSING[/red]", f"Required for PHP sandbox. Install via: {build_install_cmd}")
         
-    gcc_path = shutil.which("gcc")
+    gcc_path = which_binary("gcc")
     if gcc_path:
         table.add_row("GCC Compiler", "[green]OK[/green]", f"Found at {gcc_path}")
     else:
         table.add_row("GCC Compiler", "[red]MISSING[/red]", f"gcc is required to compile PHP. Install via: {build_install_cmd}")
         
-    make_path = shutil.which("make")
+    make_path = which_binary("make")
     if make_path:
         table.add_row("Make Utility", "[green]OK[/green]", f"Found at {make_path}")
     else:
         table.add_row("Make Utility", "[red]MISSING[/red]", f"make is required to build PHP. Install via: {build_install_cmd}")
         
-    pkgconfig_path = shutil.which("pkg-config")
+    pkgconfig_path = which_binary("pkg-config")
     if pkgconfig_path:
         table.add_row("Pkg-Config Utility", "[green]OK[/green]", f"Found at {pkgconfig_path}")
     else:
         table.add_row("Pkg-Config Utility", "[red]MISSING[/red]", f"pkg-config is required to find libraries. Install via: {build_install_cmd}")
         
-    nginx_path = shutil.which("nginx")
+    nginx_path = which_binary("nginx")
     if nginx_path:
         table.add_row("Nginx Web Server", "[green]OK[/green]", f"Found at {nginx_path}")
     else:
         table.add_row("Nginx Web Server", "[yellow]NOT INSTALLED[/yellow]", f"Run 'ndev setup' or: {stack_install_cmd}")
 
-    db_path = shutil.which("mariadb") or shutil.which("mysql") or shutil.which("mysqld")
+    db_path = which_binary("mariadb") or which_binary("mysql") or which_binary("mysqld")
     if db_path:
         table.add_row("MariaDB / MySQL", "[green]OK[/green]", f"Found at {db_path}")
     else:
         table.add_row("MariaDB / MySQL", "[yellow]NOT INSTALLED[/yellow]", f"Run 'ndev setup' or: {stack_install_cmd}")
 
-    mkcert_path = shutil.which("mkcert")
+    mkcert_path = which_binary("mkcert")
     if mkcert_path:
         table.add_row("mkcert Local SSL", "[green]OK[/green]", f"Found at {mkcert_path}")
     else:

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/ndev/linux/commands/setup.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from rich.console import Console
 from ndev.common.constants import CURRENT_LINK
 from ndev.common.logger import logger
+from ndev.common.utils import which_binary
 
 console = Console()
 
@@ -55,6 +56,15 @@ def setup_cmd():
             packages = ["mariadb", "mariadb-client", "nginx", "curl", "bubblewrap"]
             subprocess.run(["sudo", "zypper", "--non-interactive", "install", "-y"] + packages, check=True)
 
+            # Optional mkcert package
+            try:
+                subprocess.run(["sudo", "zypper", "--non-interactive", "install", "-y", "mkcert"], check=False, capture_output=True)
+                mkcert_bin = which_binary("mkcert")
+                if mkcert_bin:
+                    subprocess.run([mkcert_bin, "-install"], check=False, capture_output=True)
+            except Exception:
+                pass
+
             try:
                 subprocess.run(["sudo", "systemctl", "enable", "--now", "mariadb"], check=False, capture_output=True)
                 subprocess.run(["sudo", "systemctl", "enable", "--now", "nginx"], check=False, capture_output=True)
@@ -70,6 +80,16 @@ def setup_cmd():
             # 2. Install MariaDB and Nginx
             console.print("\n[bold yellow]Installing MariaDB and Nginx (sudo apt-get install)...[/bold yellow]")
             subprocess.run(["sudo", "apt-get", "install", "-y", "mariadb-server", "nginx", "curl"], check=True)
+
+            # Optional mkcert package
+            try:
+                subprocess.run(["sudo", "apt-get", "install", "-y", "mkcert"], check=False, capture_output=True)
+                mkcert_bin = which_binary("mkcert")
+                if mkcert_bin:
+                    subprocess.run([mkcert_bin, "-install"], check=False, capture_output=True)
+            except Exception:
+                pass
+
             console.print("[bold green]MariaDB and Nginx installed successfully![/bold green]\n")
         
         # 3. Install Composer

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/ndev/linux/runtime/services.py

@@ -14,6 +14,7 @@ from typing import Optional, Dict, Any, List, Tuple
 from ndev.common.constants import PHP_DIR, CURRENT_LINK
 from ndev.common.logger import logger
 from ndev.common.modules import get_module_manager
+from ndev.common.utils import which_binary
 
 
 def resolve_system_service_name(service: str) -> str:
@@ -52,8 +53,13 @@ def system_service_exists(service: str) -> bool:
     resolved = resolve_system_service_name(service)
     if shutil.which("systemctl"):
         res = subprocess.run(["systemctl", "list-unit-files", f"{resolved}.service"], capture_output=True, text=True)
-        return resolved in res.stdout
-    return Path(f"/etc/init.d/{resolved}").exists() or bool(shutil.which(resolved))
+        if resolved in res.stdout:
+            return True
+    return (
+        Path(f"/etc/init.d/{resolved}").exists()
+        or bool(which_binary(resolved))
+        or (resolved == "mariadb" and bool(which_binary("mariadbd") or which_binary("mysqld")))
+    )
 
 
 def system_service_status(service: str) -> Dict[str, Any]:
@@ -85,9 +91,10 @@ def execute_system_service_action(service: str, action: str) -> Tuple[bool, str]
     resolved = resolve_system_service_name(service)
 
     # For Nginx reload/restart, validate configuration first
+    nginx_bin = which_binary("nginx")
     if resolved == "nginx" and action in ["reload", "restart"]:
-        if shutil.which("nginx"):
-            t_res = subprocess.run(["nginx", "-t"], capture_output=True, text=True)
+        if nginx_bin:
+            t_res = subprocess.run([nginx_bin, "-t"], capture_output=True, text=True)
             if t_res.returncode != 0:
                 err = t_res.stderr.strip() or t_res.stdout.strip()
                 return False, f"Nginx configuration test failed:\n{err}"

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/ndev/linux/runtime/upgrade.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 import json
 import re
 import shutil
+import platform
 import subprocess
 import urllib.request
 from dataclasses import dataclass
@@ -14,6 +15,7 @@ from pathlib import Path
 from typing import Optional
 
 from ndev.common.constants import NDEV_DIR
+from ndev.common.utils import which_binary
 from ndev.linux.runtime import mailpit as mailpit_rt, pma as pma_rt
 
 USER_AGENT = "ndev/0.1.0"
@@ -80,14 +82,14 @@ def _upgrade_system_packages(packages: list[str]) -> tuple[bool, str]:
     """Upgrade system packages using zypper or apt."""
     if shutil.which("zypper"):
         try:
-            subprocess.run(["sudo", "zypper", "--non-interactive", "update", "-y"] + packages, check=True)
+            subprocess.run(["sudo", "zypper", "--non-interactive", "install", "-y"] + packages, check=True)
             return True, "Packages upgraded successfully via zypper."
         except Exception as e:
             return False, f"zypper upgrade failed: {e}"
     elif shutil.which("apt") or shutil.which("apt-get"):
         try:
             subprocess.run(["sudo", "apt-get", "update"], check=True)
-            subprocess.run(["sudo", "apt-get", "--only-upgrade", "install", "-y"] + packages, check=True)
+            subprocess.run(["sudo", "apt-get", "install", "-y"] + packages, check=True)
             return True, "Packages upgraded successfully via apt."
         except Exception as e:
             return False, f"apt upgrade failed: {e}"
@@ -96,14 +98,15 @@ def _upgrade_system_packages(packages: list[str]) -> tuple[bool, str]:
 
 # 1. NGINX
 def get_nginx_info() -> ComponentInfo:
-    installed = bool(shutil.which("nginx"))
+    nginx_bin = which_binary("nginx")
+    installed = bool(nginx_bin)
     curr_ver = None
     latest_ver = None
     err = None
 
     if installed:
         try:
-            res = subprocess.run(["nginx", "-v"], capture_output=True, text=True, timeout=5)
+            res = subprocess.run([nginx_bin, "-v"], capture_output=True, text=True, timeout=5)
             out = res.stderr or res.stdout
             m = re.search(r"nginx/(\d+\.\d+\.\d+)", out)
             if m:
@@ -200,14 +203,17 @@ def upgrade_mailpit() -> tuple[bool, str]:
 
 # 3. MARIADB
 def get_mariadb_info() -> ComponentInfo:
-    installed = bool(shutil.which("mariadb") or shutil.which("mysql") or shutil.which("mysqld"))
+    installed_exe = (
+        which_binary("mariadb") or which_binary("mariadbd") or which_binary("mysql") or which_binary("mysqld")
+    )
+    installed = bool(installed_exe)
     curr_ver = None
     latest_ver = None
     err = None
 
     if installed:
         try:
-            exe = shutil.which("mariadbd") or shutil.which("mysqld") or shutil.which("mysql")
+            exe = installed_exe
             if exe:
                 res = subprocess.run([exe, "--version"], capture_output=True, text=True, timeout=5)
                 m = re.search(r"(\d+\.\d+\.\d+)", res.stdout or res.stderr)
@@ -317,14 +323,15 @@ def upgrade_pma() -> tuple[bool, str]:
 
 # 5. MKCERT
 def get_mkcert_info() -> ComponentInfo:
-    installed = bool(shutil.which("mkcert"))
+    mkcert_bin = which_binary("mkcert")
+    installed = bool(mkcert_bin)
     curr_ver = None
     latest_ver = None
     err = None
 
     if installed:
         try:
-            res = subprocess.run(["mkcert", "-version"], capture_output=True, text=True, timeout=5)
+            res = subprocess.run([mkcert_bin, "-version"], capture_output=True, text=True, timeout=5)
             curr_ver = res.stdout.strip() or res.stderr.strip()
         except Exception as e:
             err = str(e)
@@ -357,44 +364,73 @@ def _download_latest_mkcert() -> tuple[bool, str]:
         target_ver = f"v{target_ver}"
     dest = Path.home() / ".local" / "bin" / "mkcert"
     dest.parent.mkdir(parents=True, exist_ok=True)
-    url = f"https://github.com/FiloSottile/mkcert/releases/download/{target_ver}/mkcert-{target_ver}-linux-amd64"
+
+    m_arch = platform.machine().lower()
+    if m_arch in ["x86_64", "amd64"]:
+        arch_suffix = "amd64"
+    elif m_arch in ["aarch64", "arm64"]:
+        arch_suffix = "arm64"
+    elif "arm" in m_arch:
+        arch_suffix = "arm"
+    else:
+        arch_suffix = "amd64"
+
+    url = f"https://github.com/FiloSottile/mkcert/releases/download/{target_ver}/mkcert-{target_ver}-linux-{arch_suffix}"
     try:
         req = urllib.request.Request(url, headers={"User-Agent": USER_AGENT})
         with urllib.request.urlopen(req, timeout=120) as resp, open(dest, "wb") as f:
             f.write(resp.read())
         dest.chmod(0o755)
-        subprocess.run([str(dest), "-install"], check=True)
+
+        # Also link to ~/.ndev/bin/mkcert
+        ndev_bin = NDEV_DIR / "bin" / "mkcert"
+        try:
+            ndev_bin.parent.mkdir(parents=True, exist_ok=True)
+            if ndev_bin.exists() or ndev_bin.is_symlink():
+                ndev_bin.unlink()
+            ndev_bin.symlink_to(dest)
+        except Exception:
+            pass
+
+        try:
+            subprocess.run([str(dest), "-install"], check=False, capture_output=True)
+        except Exception:
+            pass
+
         info = get_mkcert_info()
-        return True, f"mkcert upgraded successfully ({info.current_version})."
+        return True, f"mkcert upgraded successfully ({info.current_version or target_ver})."
     except Exception as e:
         return False, f"mkcert binary download failed: {e}"
 
 
 def upgrade_mkcert() -> tuple[bool, str]:
+    # 1. Try system package manager first
     if shutil.which("zypper") or shutil.which("apt") or shutil.which("apt-get"):
-        ok, _msg = _upgrade_system_packages(["mkcert"])
-        if ok:
+        _upgrade_system_packages(["mkcert"])
+        mkcert_bin = which_binary("mkcert")
+        if mkcert_bin:
             try:
-                subprocess.run(["mkcert", "-install"], check=True)
+                subprocess.run([mkcert_bin, "-install"], check=False)
             except Exception:
                 pass
             info = get_mkcert_info()
             return True, f"mkcert upgraded successfully ({info.current_version})."
 
-    # Fallback to direct download
+    # 2. Fallback to direct prebuilt binary download
     return _download_latest_mkcert()
 
 
 # 6. COMPOSER
 def get_composer_info() -> ComponentInfo:
-    installed = bool(shutil.which("composer"))
+    composer_bin = which_binary("composer")
+    installed = bool(composer_bin)
     curr_ver = None
     latest_ver = None
     err = None
 
     if installed:
         try:
-            res = subprocess.run(["composer", "--version"], capture_output=True, text=True, timeout=10)
+            res = subprocess.run([composer_bin, "--version"], capture_output=True, text=True, timeout=10)
             m = re.search(r"Composer (?:version )?(\d+\.\d+\.\d+)", res.stdout or res.stderr)
             if m:
                 curr_ver = m.group(1)
@@ -425,8 +461,9 @@ def get_composer_info() -> ComponentInfo:
 
 def upgrade_composer() -> tuple[bool, str]:
     try:
-        if shutil.which("composer"):
-            res = subprocess.run(["composer", "self-update"], capture_output=True, text=True, timeout=60)
+        composer_bin = which_binary("composer")
+        if composer_bin:
+            res = subprocess.run([composer_bin, "self-update"], capture_output=True, text=True, timeout=60)
             if res.returncode == 0:
                 info = get_composer_info()
                 return True, f"Composer upgraded successfully ({info.current_version})."

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/ndev/linux/tui.py

@@ -35,6 +35,7 @@ from textual.widgets import (
 )
 
 from ndev.common.constants import NDEV_DIR, PHP_DIR, CURRENT_LINK, LOGS_DIR
+from ndev.common.utils import which_binary
 from ndev.linux.runtime.fpm import get_fpm_status, start_fpm, stop_fpm, restart_fpm
 from ndev.linux.runtime.pma import get_pma_status, start_pma, stop_pma, restart_pma, setup_pma
 from ndev.linux.runtime.mailpit import get_mailpit_status, start_mailpit, stop_mailpit, restart_mailpit, is_installed as is_mailpit_installed, setup_mailpit
@@ -570,7 +571,7 @@ class NdevDashboard(App):
             results = []
 
             # 1. Nginx
-            ng_installed = bool(shutil.which("nginx"))
+            ng_installed = bool(which_binary("nginx"))
             ng_running = False
             if ng_installed:
                 if shutil.which("systemctl"):
@@ -591,7 +592,7 @@ class NdevDashboard(App):
             })
 
             # 2. MariaDB / MySQL
-            db_installed = bool(shutil.which("mariadb") or shutil.which("mysql"))
+            db_installed = bool(which_binary("mariadb") or which_binary("mysql") or which_binary("mariadbd") or which_binary("mysqld"))
             db_running = False
             if db_installed:
                 if shutil.which("systemctl"):

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/ndev_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.4
+Version: 0.3.5
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ndev-stack"
-version = "0.3.4"
+version = "0.3.5"
 description = "Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows"
 readme = "README.md"
 requires-python = ">=3.10"

{ndev_stack-0.3.4 → ndev_stack-0.3.5}/tests/test_opensuse_compat.py

@@ -10,7 +10,7 @@ from pathlib import Path
 import tempfile
 import shutil
 
-from ndev.common import distro
+from ndev.common import distro, utils
 from ndev.linux.runtime import nginx_helper
 from ndev.linux.runtime import services
 from ndev.linux.runtime import process
@@ -230,6 +230,17 @@ class TestSocketsAndProcess(unittest.TestCase):
             mock_kill.side_effect = ProcessLookupError("No such process")
             self.assertFalse(process.is_pid_running(5678))
 
+    def test_which_binary_finds_sbin(self):
+        with patch.dict(os.environ, {"PATH": "/usr/bin:/bin"}):
+            with patch("shutil.which") as mock_which:
+                def fake_which(cmd, path=None):
+                    if path and "/usr/sbin" in path and cmd == "nginx":
+                        return "/usr/sbin/nginx"
+                    return None
+                mock_which.side_effect = fake_which
+                found = utils.which_binary("nginx")
+                self.assertEqual(found, "/usr/sbin/nginx")
+
 
 class TestServiceManager(unittest.TestCase):
     def test_resolve_service_name(self):