shipit-cli 0.11.0__tar.gz → 0.11.2__tar.gz

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.11.0
+Version: 0.11.2
 Summary: Shipit CLI is the best way to build, serve and deploy your projects anywhere.
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.11.0"
+version = "0.11.2"
 description = "Shipit CLI is the best way to build, serve and deploy your projects anywhere."
 readme = "README.md"
 requires-python = ">=3.10"

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/src/shipit/assets/wordpress/install.sh

@@ -4,6 +4,8 @@ IFS=$'\n\t'
 export COLUMNS=80  # Prevent WP-CLI from asking for TTY size
 export PAGER="cat"
 
+alias wp="php /opt/assets/wp-cli.phar --allow-root --path=/app"
+
 echo "🚀 Starting WordPress setup..."
 
 echo "Creating required directories..."

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/src/shipit/assets/wordpress/wp-config.php

@@ -21,10 +21,12 @@ define( 'WP_AUTO_UPDATE_CORE', false); // Disable automatic aupdates and checks
  * @package WordPress
  */
 
+
 function get_env_var(string $name, string $default = ''): string
 {
-    if (isset($_ENV[$name])) {
-	    return $_ENV[$name];
+    $value = getenv($name);
+    if ($value !== false) {
+        return $value;
     }
 
     if ($default === '') {

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/src/shipit/cli.py

@@ -1491,6 +1491,10 @@ def auto(
         None,
         help="The environment to use (defaults to `.env`, it will use .env.<env_name> if provided)",
     ),
+    use_provider: Optional[str] = typer.Option(
+        None,
+        help="Use a specific provider to build the project.",
+    ),
 ):
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
@@ -1503,6 +1507,7 @@ def auto(
             install_command=install_command,
             build_command=build_command,
             start_command=start_command,
+            use_provider=use_provider,
         )
 
     build(
@@ -1561,6 +1566,10 @@ def generate(
         None,
         help="The start command to use (overwrites the default)",
     ),
+    use_provider: Optional[str] = typer.Option(
+        None,
+        help="Use a specific provider to build the project.",
+    ),
 ):
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
@@ -1591,7 +1600,7 @@ def generate(
         custom_commands.install = install_command
     if build_command:
         custom_commands.build = build_command
-    content = generate_shipit(path, custom_commands)
+    content = generate_shipit(path, custom_commands, use_provider=use_provider)
     out.write_text(content)
     console.print(f"[bold]Generated Shipit[/bold] at {out.absolute()}")
 

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/src/shipit/generator.py

@@ -84,8 +84,12 @@ def _emit_dependencies_declarations(
     return "\n".join(lines), serve_vars, build_vars
 
 
-def generate_shipit(path: Path, custom_commands: CustomCommands) -> str:
-    provider_cls = detect_provider(path, custom_commands)
+def generate_shipit(path: Path, custom_commands: CustomCommands, use_provider: Optional[str] = None) -> str:
+    provider_cls = None
+    if use_provider:
+        provider_cls = next((p for p in _providers() if p.name().lower() == use_provider.lower()), None)
+    if not provider_cls:
+        provider_cls = detect_provider(path, custom_commands)
     provider = provider_cls(path, custom_commands)
 
     # Collect parts

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/src/shipit/providers/base.py

@@ -92,16 +92,3 @@ class ProviderPlan:
 
 def _exists(path: Path, *candidates: str) -> bool:
     return any((path / c).exists() for c in candidates)
-
-
-def _has_dependency(pkg_json: Path, dep: str) -> bool:
-    try:
-        import json
-
-        data = json.loads(pkg_json.read_text())
-        for section in ("dependencies", "devDependencies", "peerDependencies"):
-            if dep in data.get(section, {}):
-                return True
-    except Exception:
-        return False
-    return False

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/src/shipit/providers/php.py

@@ -20,7 +20,9 @@ class PhpProvider:
     def __init__(self, path: Path, custom_commands: CustomCommands):
         self.path = path
         self.custom_commands = custom_commands
-        self.has_composer = _exists(self.path, "composer.json", "composer.lock")
+        self.has_composer = _exists(self.path, "composer.json", "composer.lock") or (
+            custom_commands.install and custom_commands.install.startswith("composer ")
+        )
 
     @classmethod
     def name(cls) -> str:
@@ -40,6 +42,8 @@ class PhpProvider:
             return DetectResult(cls.name(), 10)
         if custom_commands.start and custom_commands.start.startswith("php "):
             return DetectResult(cls.name(), 70)
+        if custom_commands.install and custom_commands.install.startswith("composer "):
+            return DetectResult(cls.name(), 30)
         return None
 
     def initialize(self) -> None:
@@ -115,7 +119,9 @@ class PhpProvider:
             }
         elif _exists(self.path, "index.php"):
             return {"start": '"php -S localhost:{} -t {}".format(PORT, app["serve"])'}
-        return {}
+        return {
+            "start": '"php -S localhost:{} -t {}".format(PORT, app["serve"])',
+        }
 
     def mounts(self) -> list[MountSpec]:
         return [

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/src/shipit/providers/python.py

@@ -216,7 +216,7 @@ class PythonProvider:
                 return DetectResult(cls.name(), 70)
             return DetectResult(cls.name(), 50)
         if custom_commands.start:
-            if custom_commands.start.startswith("python ") or custom_commands.start.startswith("uv ") or custom_commands.start.startswith("uvicorn "):
+            if custom_commands.start.startswith("python ") or custom_commands.start.startswith("uv ") or custom_commands.start.startswith("uvicorn ") or custom_commands.start.startswith("gunicorn "):
                 return DetectResult(cls.name(), 80)
         return None
 

{shipit_cli-0.11.0 → shipit_cli-0.11.2}/src/shipit/providers/registry.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from .base import Provider
-from .gatsby import GatsbyProvider
 from .hugo import HugoProvider
 from .laravel import LaravelProvider
 from .mkdocs import MkdocsProvider
@@ -16,7 +15,6 @@ def providers() -> list[type[Provider]]:
     # Order matters: more specific providers first
     return [
         LaravelProvider,
-        # GatsbyProvider,
         HugoProvider,
         MkdocsProvider,
         PythonProvider,

shipit_cli-0.11.2/src/shipit/version.py

@@ -0,0 +1,5 @@
+__all__ = ["version", "version_info"]
+
+
+version = "0.11.2"
+version_info = (0, 11, 2, "final", 0)

shipit_cli-0.11.0/src/shipit/providers/gatsby.py

@@ -1,90 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-from typing import Dict, Optional
-
-from .base import (
-    DetectResult,
-    DependencySpec,
-    Provider,
-    _exists,
-    _has_dependency,
-    MountSpec,
-    ServiceSpec,
-    VolumeSpec,
-    CustomCommands,
-)
-
-
-class GatsbyProvider:
-    def __init__(self, path: Path, custom_commands: CustomCommands):
-        self.path = path
-        self.custom_commands = custom_commands
-
-    @classmethod
-    def name(cls) -> str:
-        return "gatsby"
-
-    @classmethod
-    def detect(cls, path: Path, custom_commands: CustomCommands) -> Optional[DetectResult]:
-        pkg = path / "package.json"
-        if not pkg.exists():
-            return None
-        if _exists(path, "gatsby-config.js", "gatsby-config.ts") or _has_dependency(
-            pkg, "gatsby"
-        ):
-            return DetectResult(cls.name(), 90)
-        return None
-
-    def initialize(self) -> None:
-        pass
-
-    def serve_name(self) -> str:
-        return self.path.name
-
-    def provider_kind(self) -> str:
-        return "staticsite"
-
-    def platform(self) -> Optional[str]:
-        return "gatsby"
-
-    def declarations(self) -> Optional[str]:
-        return None
-
-    def dependencies(self) -> list[DependencySpec]:
-        return [
-            DependencySpec(
-                "node",
-                env_var="SHIPIT_NODE_VERSION",
-                default_version="22",
-                use_in_build=True,
-            ),
-            DependencySpec("npm", use_in_build=True),
-            DependencySpec("static-web-server", env_var="SHIPIT_SWS_VERSION", use_in_serve=True),
-        ]
-
-    def build_steps(self) -> list[str]:
-        return [
-            "run(\"npm install\", inputs=[\"package.json\", \"package-lock.json\"], group=\"install\")",
-            "copy(\".\", \".\", ignore=[\"node_modules\", \".git\"])",
-            "run(\"npm run build\", outputs=[\"public\"], group=\"build\")",
-            "run(\"cp -R public/* {}/\".format(app[\"build\"]))",
-        ]
-
-    def prepare_steps(self) -> Optional[list[str]]:
-        return None
-
-    def commands(self) -> Dict[str, str]:
-        return {"start": '"static-web-server --root /app"'}
-
-    def mounts(self) -> list[MountSpec]:
-        return [MountSpec("app")]
-
-    def volumes(self) -> list[VolumeSpec]:
-        return []
-
-    def env(self) -> Optional[Dict[str, str]]:
-        return None
-    
-    def services(self) -> list[ServiceSpec]:
-        return []

shipit_cli-0.11.0/src/shipit/version.py

@@ -1,5 +0,0 @@
-__all__ = ["version", "version_info"]
-
-
-version = "0.11.0"
-version_info = (0, 11, 0, "final", 0)