ndev-stack 0.3.16__tar.gz → 0.3.17__tar.gz

{ndev_stack-0.3.16 → ndev_stack-0.3.17}/PKG-INFO

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

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

{ndev_stack-0.3.16 → ndev_stack-0.3.17}/ndev/linux/commands/db.py

@@ -47,13 +47,20 @@ def run_wizard():
     console.print("  1) Create Database")
     console.print("  2) Drop Database")
     console.print("  3) Export Database (mysqldump)")
-    console.print("  4) Create User")
-    console.print("  5) Drop User")
-    op_choice = typer.prompt("Choice [1-5]", default=1, type=int)
+    console.print("  4) Import Database (.sql file)")
+    console.print("  5) Create User")
+    console.print("  6) Drop User")
+    op_choice = typer.prompt("Choice [1-6]", default=1, type=int)
     
-    action_map = {1: "create-db", 2: "drop-db", 3: "export-db", 4: "create-user", 5: "drop-user"}
+    action_map = {1: "create-db", 2: "drop-db", 3: "export-db", 4: "import-db", 5: "create-user", 6: "drop-user"}
     action = action_map.get(op_choice, "create-db")
     
+    if action == "import-db":
+        sql_file = typer.prompt("Path to .sql file to import").strip()
+        target_db = typer.prompt("Database name (optional, press Enter to skip)", default="")
+        execute_import_db(host, port, admin_user, admin_password, sql_file, target_db or None)
+        return
+
     target_name = typer.prompt("Database/Username")
     if not target_name:
         logger.error("Target name is required.")
@@ -163,6 +170,66 @@ def execute_export_db(
             raise typer.Exit(code=1)
         sys.stdout.write(res.stdout)
 
+def execute_import_db(
+    host: str,
+    port: int,
+    user: str,
+    password: Optional[str],
+    sql_file: str,
+    database: Optional[str] = None,
+):
+    sql_path = Path(sql_file).expanduser().resolve()
+    if not sql_path.exists():
+        logger.error(f"SQL file not found: {sql_path}")
+        raise typer.Exit(code=1)
+
+    client = which_binary("mariadb") or which_binary("mysql") or "mysql"
+    if not shutil.which(client):
+        logger.error(f"MySQL / MariaDB client ({client}) not found in PATH.")
+        raise typer.Exit(code=1)
+
+    # Resolve password if not provided
+    if password is None and user == "root":
+        res = subprocess.run([client, "-h", host, "-P", str(port), "-u", "root", "--password=root", "-e", "SELECT 1;"], capture_output=True)
+        if res.returncode == 0:
+            password = "root"
+        else:
+            res_blank = subprocess.run([client, "-h", host, "-P", str(port), "-u", "root", "-e", "SELECT 1;"], capture_output=True)
+            if res_blank.returncode == 0:
+                password = ""
+            else:
+                password = "root"
+
+    # If target database specified, ensure it exists
+    if database:
+        create_sql = f"CREATE DATABASE IF NOT EXISTS `{database}`;"
+        res_create = execute_sql_mysql(host, port, user, password, create_sql)
+        if res_create.returncode != 0:
+            logger.error(f"Failed to ensure database '{database}' exists: {res_create.stderr}")
+            raise typer.Exit(code=1)
+
+    cmd = [client, "-h", host, "-P", str(port), "-u", user]
+    if password:
+        cmd.append(f"--password={password}")
+    if database:
+        cmd.append(database)
+
+    target_desc = f"database '{database}'" if database else "MariaDB / MySQL"
+    console.print(f"[bold yellow]Importing '{sql_path.name}' ({sql_path.stat().st_size:,} bytes) into {target_desc}...[/bold yellow]")
+
+    try:
+        with open(sql_path, "r", encoding="utf-8", errors="ignore") as f:
+            res = subprocess.run(cmd, stdin=f, capture_output=True, text=True)
+    except Exception as e:
+        logger.error(f"Failed to read SQL file '{sql_path}': {e}")
+        raise typer.Exit(code=1)
+
+    if res.returncode != 0:
+        logger.error(f"MySQL Import Error:\n{res.stderr.strip()}")
+        raise typer.Exit(code=1)
+
+    console.print(f"[bold green]✓ Successfully imported '{sql_path.name}' into {target_desc}![/bold green]")
+
 def execute_create_user(host: str, port: int, user: str, password: Optional[str], new_user: str, new_pass: str, grant_db: Optional[str], user_host: str):
     logger.info(f"Creating user '{new_user}' on MySQL...")
     if not shutil.which("mysql"):
@@ -276,6 +343,49 @@ def export_db_cmd(
         triggers=triggers
     )
 
+@db_app.command("import")
+@db_app.command("import-db")
+def import_db_cmd(
+    target: Optional[str] = typer.Argument(None, help="Path to .sql file OR database name"),
+    file_or_db: Optional[str] = typer.Argument(None, help="Path to .sql file if database name was specified first, or database name"),
+    database: Optional[str] = typer.Option(None, "--database", "-d", "--name", "-n", help="Target database name (optional if SQL dump contains CREATE DATABASE / USE)"),
+    host: str = typer.Option("localhost", "--host", "-h", help="Database host"),
+    port: int = typer.Option(3306, "--port", "-P", help="Database port"),
+    user: str = typer.Option("root", "--user", "-u", help="Admin username"),
+    password: Optional[str] = typer.Option(None, "--password", "-p", help="Admin password (default: root)"),
+):
+    """Import a SQL dump file into MariaDB/MySQL."""
+    sql_file = None
+    target_db = database
+
+    if target:
+        p_target = Path(target).expanduser()
+        if p_target.exists() or target.endswith(".sql"):
+            sql_file = str(p_target)
+            if file_or_db and not target_db:
+                target_db = file_or_db
+        else:
+            target_db = target
+            if file_or_db:
+                sql_file = str(Path(file_or_db).expanduser())
+    elif file_or_db:
+        sql_file = str(Path(file_or_db).expanduser())
+
+    if not sql_file:
+        sql_file = typer.prompt("Path to .sql file").strip()
+    if not sql_file:
+        logger.error("SQL file path is required.")
+        raise typer.Exit(code=1)
+
+    execute_import_db(
+        host=host,
+        port=port,
+        user=user,
+        password=password,
+        sql_file=sql_file,
+        database=target_db,
+    )
+
 @db_app.command("create-user")
 def create_user_cmd(
     username: str = typer.Argument(None, help="Username"),

{ndev_stack-0.3.16 → ndev_stack-0.3.17}/ndev_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.16
+Version: 0.3.17
 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.16 → ndev_stack-0.3.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ndev-stack"
-version = "0.3.16"
+version = "0.3.17"
 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.16 → ndev_stack-0.3.17}/tests/test_opensuse_compat.py

@@ -573,6 +573,20 @@ class TestDatabaseCommands(unittest.TestCase):
                 self.assertIn("sudo", mock_run.call_args[0][0])
                 self.assertIn("set-root-password", mock_run.call_args[0][0])
 
+    def test_import_db_cmd(self):
+        import tempfile
+        from ndev.linux.commands.db import import_db_cmd
+        with tempfile.NamedTemporaryFile(suffix=".sql") as tf:
+            tf.write(b"SELECT 1;\n")
+            tf.flush()
+            with patch("subprocess.run") as mock_run:
+                mock_run.return_value = subprocess.CompletedProcess(args=[], returncode=0)
+                import_db_cmd(target=tf.name, database="testdb", user="root", password="root")
+                # Ensure subprocess.run was invoked with mysql/mariadb and the target database
+                cmd_args = mock_run.call_args[0][0]
+                self.assertIn("testdb", cmd_args)
+                self.assertIn("--password=root", cmd_args)
+
 
 class TestTuiEnsureSudo(unittest.TestCase):
     def test_ensure_sudo_when_not_needed(self):