ndev-stack 0.3.6__tar.gz → 0.3.8__tar.gz

{ndev_stack-0.3.6 → ndev_stack-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.6
+Version: 0.3.8
 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.6 → ndev_stack-0.3.8}/ndev/__init__.py

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

{ndev_stack-0.3.6 → ndev_stack-0.3.8}/ndev/common/utils.py

@@ -92,7 +92,31 @@ def get_version_or_prompt(version: str = None, prompt_message: str = "PHP versio
         except Exception:
             pass
             
-    return typer.prompt(prompt_message).strip()
+    return typer.prompt(prompt_message).strip()
+
+def resolve_installed_version(version: str | None) -> str | None:
+    """Resolve an installed PHP version, matching exact name or major.minor prefix."""
+    if not version:
+        return version
+    from ndev.common.constants import PHP_DIR
+    if not PHP_DIR.exists():
+        return version
+    direct_path = PHP_DIR / version
+    if direct_path.exists() and direct_path.is_dir():
+        return version
+    # Try prefix matching (e.g. '8.4' -> '8.4.27')
+    matches = [
+        d.name for d in PHP_DIR.iterdir()
+        if d.is_dir() and (d.name == version or d.name.startswith(f"{version}."))
+    ]
+    if matches:
+        from packaging.version import parse as parse_version
+        try:
+            matches.sort(key=parse_version, reverse=True)
+        except Exception:
+            matches.sort(reverse=True)
+        return matches[0]
+    return version
 
 def which_binary(cmd: str) -> str | None:
     """

{ndev_stack-0.3.6 → ndev_stack-0.3.8}/ndev/linux/chroot/packages.py

@@ -37,6 +37,33 @@ def install_host_packages(packages: list[str], show_logs: bool = False):
                 logger.debug(f"zypper download failed: {e}")
 
             rpm_files = list(tmp_dir.rglob("*.rpm"))
+            # Auto-detect if any downloaded package is a metapackage requiring another -devel package
+            if rpm_files and shutil.which("rpm"):
+                downloaded_names = {rpm.stem.split("-")[0] for rpm in rpm_files}
+                secondary_pkgs = set()
+                for rpm in rpm_files:
+                    try:
+                        dep_res = subprocess.run(
+                            ["rpm", "-qp", "--requires", str(rpm)],
+                            capture_output=True,
+                            text=True,
+                            timeout=5
+                        )
+                        if dep_res.returncode == 0:
+                            for line in dep_res.stdout.splitlines():
+                                req = line.strip().split()[0]
+                                if req.endswith("-devel") and not any(req.startswith(name) for name in downloaded_names):
+                                    secondary_pkgs.add(req)
+                    except Exception:
+                        pass
+                if secondary_pkgs:
+                    try:
+                        cmd2 = ["zypper", "--pkg-cache-dir", str(tmp_dir), "download"] + list(secondary_pkgs)
+                        subprocess.run(cmd2, cwd=tmp_dir, capture_output=True, text=True)
+                    except Exception as e:
+                        logger.debug(f"zypper secondary download notice: {e}")
+                rpm_files = list(tmp_dir.rglob("*.rpm"))
+
             if rpm_files and shutil.which("rpm2cpio") and shutil.which("cpio"):
                 for rpm in rpm_files:
                     extract_dest = tmp_dir / rpm.stem

{ndev_stack-0.3.6 → ndev_stack-0.3.8}/ndev/linux/commands/available.py

@@ -1,38 +1,38 @@
-import typer
-from rich.console import Console
-from rich.table import Table
-from ndev.common.github import fetch_releases
-from ndev.common.logger import logger
-
-console = Console()
-
-def available_cmd():
-    """List all available PHP versions from php.net."""
-    logger.info("Fetching available PHP versions from php.net...")
-    
-    releases_8 = fetch_releases(8)
-    releases_7 = fetch_releases(7)
-    
-    all_releases = {**releases_8, **releases_7}
-    
-    if not all_releases:
-        logger.error("Could not fetch available releases. Check your network connection.")
-        raise typer.Exit(code=1)
-        
-    from packaging.version import parse as parse_version
-    sorted_versions = sorted(all_releases.keys(), key=parse_version, reverse=True)
-    
-    table = Table(title="Available PHP Releases")
-    table.add_column("Version", style="bold cyan")
-    table.add_column("Release Date")
-    table.add_column("Security Release")
-    
-    for v in sorted_versions:
-        data = all_releases[v]
-        date = data.get("date", "N/A")
-        tags = data.get("tags", [])
-        is_security = "Yes" if "security" in tags else "No"
-        
-        table.add_row(v, date, is_security)
-        
-    console.print(table)
+import typer
+from rich.console import Console
+from rich.table import Table
+from ndev.common.github import fetch_releases
+from ndev.common.logger import logger
+
+console = Console()
+
+def available_cmd():
+    """List all available PHP versions from php.net."""
+    logger.info("Fetching available PHP versions from php.net...")
+    
+    releases_8 = fetch_releases(8)
+    releases_7 = fetch_releases(7)
+    
+    all_releases = {**releases_8, **releases_7}
+    
+    if not all_releases:
+        logger.error("Could not fetch available releases. Check your network connection.")
+        raise typer.Exit(code=1)
+        
+    from packaging.version import parse as parse_version
+    sorted_versions = sorted(all_releases.keys(), key=parse_version, reverse=True)
+    
+    table = Table(title="Available PHP Releases")
+    table.add_column("Version", style="bold cyan")
+    table.add_column("Release Date")
+    table.add_column("Security Release")
+    
+    for v in sorted_versions:
+        data = all_releases[v]
+        date = data.get("date", "N/A")
+        tags = data.get("tags", [])
+        is_security = "Yes" if "security" in tags else "No"
+        
+        table.add_row(v, date, is_security)
+        
+    console.print(table)

{ndev_stack-0.3.6 → ndev_stack-0.3.8}/ndev/linux/commands/ctl.py

@@ -42,12 +42,15 @@ def resolve_service_name(service: str) -> str:
         return "redis"
     return service
 
+from ndev.common.utils import resolve_installed_version
+
 def service_exists(service: str) -> bool:
     if service == "pma":
         return True
     if service.startswith("ndev-"):
         version = service[5:]
-        return (get_user_ndev_dir() / "php" / version).exists()
+        v = resolve_installed_version(version)
+        return (get_user_ndev_dir() / "php" / (v or version)).exists()
         
     resolved = resolve_service_name(service)
     if shutil.which("systemctl"):
@@ -71,7 +74,7 @@ def service_status(service: str) -> str:
             return "STOPPED"
 
     if service.startswith("ndev-"):
-        version = service[5:]
+        version = resolve_installed_version(service[5:]) or service[5:]
         script_path = sys.argv[0]
         res = subprocess.run([sys.executable, script_path, "status", version], capture_output=True, text=True)
         if "Running" in res.stdout:
@@ -105,7 +108,7 @@ def manage_service(service: str, action: str):
         elif action == "restart":
             restart_pma()
     elif service.startswith("ndev-"):
-        version = service[5:]
+        version = resolve_installed_version(service[5:]) or service[5:]
         script_path = sys.argv[0]
         subprocess.run([sys.executable, script_path, action, version])
     else:

{ndev_stack-0.3.6 → ndev_stack-0.3.8}/ndev/linux/commands/current.py

@@ -1,10 +1,10 @@
-from ndev.common.constants import CURRENT_LINK
-from ndev.common.logger import logger
-
-def current_cmd():
-    """Show the currently active PHP version."""
-    if CURRENT_LINK.exists() and CURRENT_LINK.is_symlink():
-        version = CURRENT_LINK.resolve().name
-        logger.info(f"Current active PHP version: {version}")
-    else:
-        logger.info("No active PHP version set. Use 'ndev use <version>' to set one.")
+from ndev.common.constants import CURRENT_LINK
+from ndev.common.logger import logger
+
+def current_cmd():
+    """Show the currently active PHP version."""
+    if CURRENT_LINK.exists() and CURRENT_LINK.is_symlink():
+        version = CURRENT_LINK.resolve().name
+        logger.info(f"Current active PHP version: {version}")
+    else:
+        logger.info("No active PHP version set. Use 'ndev use <version>' to set one.")