quickscale-cli 0.62.0__tar.gz → 0.65.0__tar.gz

{quickscale_cli-0.62.0 → quickscale_cli-0.65.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quickscale-cli
-Version: 0.62.0
+Version: 0.65.0
 Summary: Command-line interface for QuickScale Django project generator
 Home-page: https://github.com/Experto-AI/quickscale
 License: Apache-2.0
@@ -10,7 +10,6 @@ Author-email: victor@experto.ai
 Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -18,7 +17,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: click (>=8.1.0,<9.0.0)
-Requires-Dist: quickscale-core (>=0.62.0,<0.63.0)
+Requires-Dist: click (>=8.3.0,<9.0.0)
+Requires-Dist: quickscale-core (>=0.65.0,<0.66.0)
 Project-URL: Documentation, https://github.com/Experto-AI/quickscale/tree/main/docs
 Project-URL: Repository, https://github.com/Experto-AI/quickscale

{quickscale_cli-0.62.0 → quickscale_cli-0.65.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "quickscale-cli"
-version = "0.62.0"
+version = "0.65.0"
 description = "Command-line interface for QuickScale Django project generator"
 authors = ["Experto AI <victor@experto.ai>"]
 license = "Apache-2.0"
@@ -17,21 +17,18 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Framework :: Django",
-    "Framework :: Django :: 4.2",
     "Framework :: Django :: 5.0",
 ]
 packages = [{include = "quickscale_cli", from = "src"}]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-click = "^8.1.0"
-quickscale-core = "^0.62.0"
+click = "^8.3.0"
+quickscale-core = "^0.65.0"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.4.0"
-pytest-cov = "^4.1.0"
-ruff = "^0.6.0"
-mypy = "^1.8.0"
+# Dev dependencies centralized in root pyproject.toml
+# Use: poetry install from repository root
 
 [tool.poetry.scripts]
 quickscale = "quickscale_cli.main:cli"
@@ -53,60 +50,18 @@ addopts = [
     "--cov-report=html",
     "-m", "not e2e",  # Skip E2E tests by default (run with: pytest -m e2e)
 ]
-
-[tool.ruff]
-line-length = 100
-target-version = "py310"
-
-[tool.ruff.lint]
-select = [
-    "E",  # pycodestyle errors
-    "W",  # pycodestyle warnings
-    "F",  # pyflakes
-    "I",  # isort
-    "N",  # pep8-naming
-    "UP", # pyupgrade
-    "D",  # docstring rules
-]
-ignore = [
-    "D100",  # Missing docstring in public module
-    "D101",  # Missing docstring in public class
-    "D102",  # Missing docstring in public method
-    "D103",  # Missing docstring in public function
-    "D105",  # Missing docstring in magic method
-    "D107",  # Missing docstring in __init__
-    "D203",  # 1 blank line required before class docstring (incompatible with D211)
-    "D212",  # Multi-line docstring summary should start at the first line (incompatible with D213)
-    "D400",  # First line should end with a period
-    "D415",  # First line should end with a period, question mark, or exclamation point
+markers = [
+    "integration: integration tests (slower, require external dependencies)",
+    "slow: slow tests that take significant time to run",
+    "e2e: end-to-end tests",
 ]
 
+# Ruff and mypy configurations centralized in root ruff.toml and mypy.ini
+# Package-specific isort override
 [tool.ruff.lint.isort]
 known-first-party = ["quickscale_cli", "quickscale_core"]
 
-[tool.mypy]
-python_version = "3.10"
-warn_return_any = true
-warn_unused_configs = true
-disallow_untyped_defs = true
-disallow_incomplete_defs = true
-check_untyped_defs = true
-disallow_untyped_decorators = true
-no_implicit_optional = true
-warn_redundant_casts = true
-warn_unused_ignores = true
-warn_no_return = true
-warn_unreachable = true
-strict_equality = true
-show_error_codes = true
-
-[[tool.mypy.overrides]]
-module = "tests.*"
-disallow_untyped_defs = false
-check_untyped_defs = false
-
+# Package-specific mypy overrides
 [[tool.mypy.overrides]]
 module = "quickscale_core.*"
 ignore_missing_imports = true
-
-

{quickscale_cli-0.62.0 → quickscale_cli-0.65.0}/src/quickscale_cli/_version.py

@@ -1,2 +1,2 @@
 # Auto-generated by scripts/version_tool.sh
-__version__ = "0.62.0"
+__version__ = "0.65.0"

{quickscale_cli-0.62.0 → quickscale_cli-0.65.0}/src/quickscale_cli/commands/deployment_commands.py

@@ -37,7 +37,9 @@ def deploy() -> None:
 
 
 @deploy.command()
-@click.option("--project-name", help="Railway project name (auto-detected if not provided)")
+@click.option(
+    "--project-name", help="Railway project name (auto-detected if not provided)"
+)
 def railway(project_name: str | None) -> None:
     """
     Deploy project to Railway with automated setup.
@@ -106,7 +108,9 @@ def railway(project_name: str | None) -> None:
         click.secho(f"⚠️  Warning: {lock_message}", fg="yellow")
         if "not found" not in lock_message.lower():
             # Lock file exists but is inconsistent - offer to fix it
-            click.echo("💡 The lock file needs to be regenerated to match pyproject.toml")
+            click.echo(
+                "💡 The lock file needs to be regenerated to match pyproject.toml"
+            )
             if click.confirm("Run 'poetry lock --no-update' to fix?", default=True):
                 click.echo("🔄 Updating poetry.lock...")
                 success, fix_message = fix_poetry_lock()
@@ -114,7 +118,9 @@ def railway(project_name: str | None) -> None:
                     click.secho(f"✅ {fix_message}", fg="green")
                 else:
                     click.secho(f"❌ Error: {fix_message}", fg="red", err=True)
-                    click.echo("💡 Try running manually: poetry lock --no-update", err=True)
+                    click.echo(
+                        "💡 Try running manually: poetry lock --no-update", err=True
+                    )
                     if not click.confirm("Continue anyway?", default=False):
                         click.echo("Deployment cancelled")
                         sys.exit(0)
@@ -143,7 +149,9 @@ def railway(project_name: str | None) -> None:
             click.secho("❌ Error: npm is not installed", fg="red", err=True)
             click.echo("\n💡 Install Node.js and npm first:", err=True)
             click.echo("   https://nodejs.org/", err=True)
-            click.echo("\nThen run this command again to auto-install Railway CLI", err=True)
+            click.echo(
+                "\nThen run this command again to auto-install Railway CLI", err=True
+            )
             sys.exit(1)
 
         # Auto-install Railway CLI
@@ -178,10 +186,14 @@ def railway(project_name: str | None) -> None:
                     new_version = get_railway_cli_version()
                     click.secho(f"✅ Railway CLI upgraded to {new_version}", fg="green")
                 else:
-                    click.secho("⚠️  Warning: Failed to upgrade Railway CLI", fg="yellow")
+                    click.secho(
+                        "⚠️  Warning: Failed to upgrade Railway CLI", fg="yellow"
+                    )
                     click.echo("💡 Try upgrading manually:", err=True)
                     click.echo("   npm update -g @railway/cli", err=True)
-                    if not click.confirm("Continue with current version?", default=False):
+                    if not click.confirm(
+                        "Continue with current version?", default=False
+                    ):
                         sys.exit(1)
             else:
                 click.secho("✅ Railway CLI version is up to date", fg="green")
@@ -203,7 +215,8 @@ def railway(project_name: str | None) -> None:
             click.echo("\n💡 Try authenticating manually:", err=True)
             click.echo("   railway login                    (opens browser)", err=True)
             click.echo(
-                "   railway login --browserless      (for headless/remote systems)", err=True
+                "   railway login --browserless      (for headless/remote systems)",
+                err=True,
             )
             sys.exit(1)
     else:
@@ -219,7 +232,9 @@ def railway(project_name: str | None) -> None:
             result = run_railway_command(["init"], timeout=60, interactive=True)
 
             if result.returncode != 0:
-                click.secho("❌ Error: Failed to initialize Railway project", fg="red", err=True)
+                click.secho(
+                    "❌ Error: Failed to initialize Railway project", fg="red", err=True
+                )
                 sys.exit(1)
 
             click.secho("✅ Railway project initialized", fg="green")
@@ -268,7 +283,9 @@ def railway(project_name: str | None) -> None:
             )
 
             if result.returncode != 0:
-                click.secho(f"⚠️  Warning: Could not create service '{app_service}'", fg="yellow")
+                click.secho(
+                    f"⚠️  Warning: Could not create service '{app_service}'", fg="yellow"
+                )
                 click.echo("💡 Create manually: railway add --service", err=True)
             else:
                 click.secho(f"✅ Service '{app_service}' created", fg="green")
@@ -288,7 +305,9 @@ def railway(project_name: str | None) -> None:
             f'   railway variables --set "DATABASE_URL=${{{{Postgres.DATABASE_URL}}}}" '
             f"--service {app_service}"
         )
-        click.echo("   Or link via Railway dashboard > Variables > New Variable > Reference")
+        click.echo(
+            "   Or link via Railway dashboard > Variables > New Variable > Reference"
+        )
 
     # Step 7: Generate public domain first (before setting env vars)
     click.echo("\n🌐 Generating public domain...")
@@ -332,7 +351,9 @@ def railway(project_name: str | None) -> None:
                 click.echo(f"   • {key}={env_vars[key]}")
         click.echo("💡 This triggers ONE deployment with all variables set")
     else:
-        click.secho("⚠️  Warning: Some environment variables could not be set", fg="yellow")
+        click.secho(
+            "⚠️  Warning: Some environment variables could not be set", fg="yellow"
+        )
         if failed_keys:
             click.echo("Failed variables:")
             for key in failed_keys:
@@ -348,7 +369,9 @@ def railway(project_name: str | None) -> None:
     try:
         # Deploy to the specific app service
         # railway.json in project root configures the build and startCommand
-        result = run_railway_command(["up", "--service", app_service, "--detach"], timeout=60)
+        result = run_railway_command(
+            ["up", "--service", app_service, "--detach"], timeout=60
+        )
 
         if result.returncode != 0:
             click.secho("❌ Error: Deployment failed", fg="red", err=True)
@@ -358,7 +381,9 @@ def railway(project_name: str | None) -> None:
             click.echo("   - Verify railway.json exists in project root", err=True)
             click.echo("   - Verify Dockerfile is present", err=True)
             click.echo("   - Check pyproject.toml dependencies", err=True)
-            click.echo("   - Ensure DATABASE_URL is linked to PostgreSQL service", err=True)
+            click.echo(
+                "   - Ensure DATABASE_URL is linked to PostgreSQL service", err=True
+            )
             sys.exit(1)
 
         click.secho("✅ Deployment started", fg="green")

{quickscale_cli-0.62.0 → quickscale_cli-0.65.0}/src/quickscale_cli/commands/development_commands.py

@@ -1,5 +1,6 @@
 """Development lifecycle commands for QuickScale projects."""
 
+import re
 import subprocess
 import sys
 
@@ -7,10 +8,16 @@ import click
 
 from quickscale_cli.utils.docker_utils import (
     get_docker_compose_command,
+    get_port_from_env,
     is_docker_running,
     is_interactive,
+    is_port_available,
+    wait_for_port_release,
+)
+from quickscale_cli.utils.project_manager import (
+    get_web_container_name,
+    is_in_quickscale_project,
 )
-from quickscale_cli.utils.project_manager import get_web_container_name, is_in_quickscale_project
 
 
 @click.command()
@@ -20,7 +27,9 @@ def up(build: bool, no_cache: bool) -> None:
     """Start Docker services for development."""
     # Check if in QuickScale project
     if not is_in_quickscale_project():
-        click.secho("❌ Error: Not in a QuickScale project directory", fg="red", err=True)
+        click.secho(
+            "❌ Error: Not in a QuickScale project directory", fg="red", err=True
+        )
         click.echo(
             "💡 Tip: Navigate to a project directory or run 'quickscale init <name>' to create one",
             err=True,
@@ -33,6 +42,24 @@ def up(build: bool, no_cache: bool) -> None:
         click.echo("💡 Tip: Start Docker Desktop or the Docker daemon", err=True)
         sys.exit(1)
 
+    # Check if required port is available BEFORE calling docker-compose
+    port = get_port_from_env()
+    if not is_port_available(port):
+        click.secho(f"❌ Error: Port {port} is already in use", fg="red", err=True)
+        click.echo(
+            f"\n💡 To resolve this issue, try one of the following:\n"
+            f"   1. If you just ran 'quickscale down': Wait 5-10 seconds for docker-proxy to release the port\n"
+            f"   2. Stop and cleanup: quickscale down && sleep 5 && quickscale up\n"
+            f"   3. Check for other containers: docker ps -a | grep {port}\n"
+            f"   4. Find and kill the process using the port:\n"
+            f"      • Check what's using it: sudo netstat -tulpn | grep :{port}\n"
+            f"      • If it's docker-proxy: wait a few seconds and try again\n"
+            f"      • If it's another process: sudo lsof -ti:{port} | xargs kill -9\n"
+            f"   5. Change the port in .env file: PORT=8001",
+            err=True,
+        )
+        sys.exit(1)
+
     try:
         compose_cmd = get_docker_compose_command()
         cmd = compose_cmd + ["up", "-d"]
@@ -44,15 +71,52 @@ def up(build: bool, no_cache: bool) -> None:
             cmd.append("--no-cache")
 
         click.echo("🚀 Starting Docker services...")
-        subprocess.run(cmd, check=True)
+        subprocess.run(cmd, check=True, capture_output=True, text=True)
         click.secho("✅ Services started successfully!", fg="green", bold=True)
         click.echo("💡 Tip: Use 'quickscale logs' to view service logs")
 
     except subprocess.CalledProcessError as e:
-        click.secho(
-            f"❌ Error: Failed to start services (exit code: {e.returncode})", fg="red", err=True
+        # Check for port conflict in error output
+        # Docker error format: "Bind for 0.0.0.0:8000 failed: port is already allocated"
+        # Check both stdout and stderr since docker-compose may output to either
+        error_output = e.stderr if e.stderr else ""
+        stdout_output = e.stdout if e.stdout else ""
+        full_output = error_output + stdout_output
+
+        port_conflict_match = re.search(
+            r"Bind for [\d.]+:(\d+) failed: port is already allocated",
+            full_output,
+            re.IGNORECASE,
         )
-        click.echo("💡 Tip: Check Docker logs with 'quickscale logs' for details", err=True)
+
+        if port_conflict_match:
+            conflict_port = port_conflict_match.group(1)
+            click.secho(
+                f"❌ Error: Port {conflict_port} is already in use",
+                fg="red",
+                err=True,
+            )
+            click.echo(
+                f"\n💡 To resolve this issue, try one of the following:\n"
+                f"   1. Stop existing containers: quickscale down\n"
+                f"   2. Remove orphaned containers: docker-compose down --remove-orphans\n"
+                f"   3. Find and kill the process: lsof -ti:{conflict_port} | xargs kill -9\n"
+                f"   4. Find process details: sudo lsof -i:{conflict_port}\n"
+                f"   5. Or use: sudo fuser -k {conflict_port}/tcp",
+                err=True,
+            )
+        else:
+            click.secho(
+                f"❌ Error: Failed to start services (exit code: {e.returncode})",
+                fg="red",
+                err=True,
+            )
+            if full_output:
+                click.echo(f"\nError output:\n{full_output}", err=True)
+            click.echo(
+                "💡 Tip: Check Docker logs with 'quickscale logs' for details",
+                err=True,
+            )
         sys.exit(1)
     except KeyboardInterrupt:
         click.echo("\n⚠️  Interrupted by user")
@@ -64,7 +128,9 @@ def up(build: bool, no_cache: bool) -> None:
 def down(volumes: bool) -> None:
     """Stop Docker services."""
     if not is_in_quickscale_project():
-        click.secho("❌ Error: Not in a QuickScale project directory", fg="red", err=True)
+        click.secho(
+            "❌ Error: Not in a QuickScale project directory", fg="red", err=True
+        )
         click.echo("💡 Tip: Navigate to a project directory", err=True)
         sys.exit(1)
 
@@ -75,18 +141,34 @@ def down(volumes: bool) -> None:
 
     try:
         compose_cmd = get_docker_compose_command()
-        cmd = compose_cmd + ["down"]
+        cmd = compose_cmd + ["down", "--remove-orphans"]
 
         if volumes:
             cmd.append("--volumes")
 
         click.echo("🛑 Stopping Docker services...")
         subprocess.run(cmd, check=True)
+
+        # Wait for Docker's proxy process to fully release ports
+        # docker-proxy can take a few seconds to release ports after containers stop
+        port = get_port_from_env()
+        click.echo(f"⏳ Waiting for port {port} to be released...")
+        if not wait_for_port_release(port, timeout=5.0):
+            click.echo(
+                f"⚠️  Warning: Port {port} still in use after 5 seconds. "
+                f"Wait a moment before running 'quickscale up'.",
+                err=True,
+            )
+        else:
+            click.echo(f"✅ Port {port} released")
+
         click.secho("✅ Services stopped successfully!", fg="green")
 
     except subprocess.CalledProcessError as e:
         click.secho(
-            f"❌ Error: Failed to stop services (exit code: {e.returncode})", fg="red", err=True
+            f"❌ Error: Failed to stop services (exit code: {e.returncode})",
+            fg="red",
+            err=True,
         )
         sys.exit(1)
     except KeyboardInterrupt:
@@ -95,11 +177,15 @@ def down(volumes: bool) -> None:
 
 
 @click.command()
-@click.option("-c", "--command", "cmd", help="Run a single command instead of interactive shell")
+@click.option(
+    "-c", "--command", "cmd", help="Run a single command instead of interactive shell"
+)
 def shell(cmd: str | None) -> None:
     """Open an interactive bash shell in the web container."""
     if not is_in_quickscale_project():
-        click.secho("❌ Error: Not in a QuickScale project directory", fg="red", err=True)
+        click.secho(
+            "❌ Error: Not in a QuickScale project directory", fg="red", err=True
+        )
         click.echo("💡 Tip: Navigate to a project directory", err=True)
         sys.exit(1)
 
@@ -117,7 +203,9 @@ def shell(cmd: str | None) -> None:
             if is_interactive():
                 subprocess.run(docker_cmd, check=True)
             else:
-                result = subprocess.run(docker_cmd, capture_output=True, text=True, check=True)
+                result = subprocess.run(
+                    docker_cmd, capture_output=True, text=True, check=True
+                )
                 if result.stdout:
                     click.echo(result.stdout, nl=False)
                 if result.stderr:
@@ -135,7 +223,11 @@ def shell(cmd: str | None) -> None:
             click.secho("❌ Error: Container not running", fg="red", err=True)
             click.echo("💡 Tip: Start services with 'quickscale up' first", err=True)
         else:
-            click.secho(f"❌ Error: Command failed (exit code: {e.returncode})", fg="red", err=True)
+            click.secho(
+                f"❌ Error: Command failed (exit code: {e.returncode})",
+                fg="red",
+                err=True,
+            )
         sys.exit(e.returncode)
     except KeyboardInterrupt:
         click.echo("\n⚠️  Exited shell")
@@ -147,7 +239,9 @@ def shell(cmd: str | None) -> None:
 def manage(args: tuple) -> None:
     """Run Django management commands in the web container."""
     if not is_in_quickscale_project():
-        click.secho("❌ Error: Not in a QuickScale project directory", fg="red", err=True)
+        click.secho(
+            "❌ Error: Not in a QuickScale project directory", fg="red", err=True
+        )
         click.echo("💡 Tip: Navigate to a project directory", err=True)
         sys.exit(1)
 
@@ -157,8 +251,12 @@ def manage(args: tuple) -> None:
         sys.exit(1)
 
     if not args:
-        click.secho("❌ Error: No Django management command specified", fg="red", err=True)
-        click.echo("💡 Tip: Run 'quickscale manage help' to see available commands", err=True)
+        click.secho(
+            "❌ Error: No Django management command specified", fg="red", err=True
+        )
+        click.echo(
+            "💡 Tip: Run 'quickscale manage help' to see available commands", err=True
+        )
         sys.exit(1)
 
     try:
@@ -176,7 +274,9 @@ def manage(args: tuple) -> None:
         if is_interactive():
             subprocess.run(docker_cmd, check=True)
         else:
-            result = subprocess.run(docker_cmd, capture_output=True, text=True, check=True)
+            result = subprocess.run(
+                docker_cmd, capture_output=True, text=True, check=True
+            )
             if result.stdout:
                 click.echo(result.stdout, nl=False)
             if result.stderr:
@@ -184,7 +284,9 @@ def manage(args: tuple) -> None:
 
     except subprocess.CalledProcessError as e:
         if e.returncode == 1:
-            click.secho("❌ Error: Container not running or command failed", fg="red", err=True)
+            click.secho(
+                "❌ Error: Container not running or command failed", fg="red", err=True
+            )
             click.echo("💡 Tip: Start services with 'quickscale up' first", err=True)
         sys.exit(e.returncode)
     except KeyboardInterrupt:
@@ -195,12 +297,16 @@ def manage(args: tuple) -> None:
 @click.command()
 @click.argument("service", required=False)
 @click.option("-f", "--follow", is_flag=True, help="Follow log output")
-@click.option("--tail", default=None, help="Number of lines to show from the end of the logs")
+@click.option(
+    "--tail", default=None, help="Number of lines to show from the end of the logs"
+)
 @click.option("--timestamps", is_flag=True, help="Show timestamps")
 def logs(service: str | None, follow: bool, tail: str | None, timestamps: bool) -> None:
     """View Docker service logs."""
     if not is_in_quickscale_project():
-        click.secho("❌ Error: Not in a QuickScale project directory", fg="red", err=True)
+        click.secho(
+            "❌ Error: Not in a QuickScale project directory", fg="red", err=True
+        )
         click.echo("💡 Tip: Navigate to a project directory", err=True)
         sys.exit(1)
 
@@ -229,7 +335,9 @@ def logs(service: str | None, follow: bool, tail: str | None, timestamps: bool)
 
     except subprocess.CalledProcessError as e:
         click.secho(
-            f"❌ Error: Failed to retrieve logs (exit code: {e.returncode})", fg="red", err=True
+            f"❌ Error: Failed to retrieve logs (exit code: {e.returncode})",
+            fg="red",
+            err=True,
         )
         sys.exit(1)
     except KeyboardInterrupt:
@@ -241,7 +349,9 @@ def logs(service: str | None, follow: bool, tail: str | None, timestamps: bool)
 def ps() -> None:
     """Show service status."""
     if not is_in_quickscale_project():
-        click.secho("❌ Error: Not in a QuickScale project directory", fg="red", err=True)
+        click.secho(
+            "❌ Error: Not in a QuickScale project directory", fg="red", err=True
+        )
         click.echo("💡 Tip: Navigate to a project directory", err=True)
         sys.exit(1)