shipit-cli 0.15.0__tar.gz → 0.15.2__tar.gz

{shipit_cli-0.15.0 → shipit_cli-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.15.0
+Version: 0.15.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.15.0 → shipit_cli-0.15.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.15.0"
+version = "0.15.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.15.0 → shipit_cli-0.15.2}/src/shipit/cli.py

@@ -153,9 +153,7 @@ class Ctx:
             commands=commands,
             prepare=prepare_steps,
             workers=workers,
-            mounts=self.get_refs([mount.ref for mount in mounts])
-            if mounts
-            else None,
+            mounts=self.get_refs([mount.ref for mount in mounts]) if mounts else None,
             volumes=self.get_refs([volume["ref"] for volume in volumes])
             if volumes
             else None,
@@ -206,8 +204,12 @@ class Ctx:
         serve_path = self.runner.get_serve_mount_path(name)
         mount = Mount(name, build_path, serve_path)
         ref = self.add_mount(mount)
-        
-        return CtxMount(ref=ref, path=str(build_path.absolute()), serve_path=str(serve_path.absolute()))
+
+        return CtxMount(
+            ref=ref,
+            path=str(build_path.absolute()),
+            serve_path=str(serve_path.absolute()),
+        )
 
     def add_volume(self, volume: Volume) -> Optional[str]:
         self.volumes.append(volume)
@@ -257,7 +259,7 @@ def evaluate_shipit(
         raise ValueError(f"No serve definition found in {shipit_file}")
     assert len(ctx.serves) <= 1, "Only one serve is allowed for now"
     serve = next(iter(ctx.serves.values()))
-    
+
     # Now we apply the custom commands (start, after_deploy, build, install)
     if provider_config.commands.start:
         serve.commands["start"] = provider_config.commands.start
@@ -271,11 +273,23 @@ def evaluate_shipit(
         has_done_install = False
         for step in serve.build:
             if isinstance(step, RunStep):
-                if step.group == "build" and not has_done_build and provider_config.commands.build:
-                    new_build.append(RunStep(provider_config.commands.build, group="build"))
+                if (
+                    step.group == "build"
+                    and not has_done_build
+                    and provider_config.commands.build
+                ):
+                    new_build.append(
+                        RunStep(provider_config.commands.build, group="build")
+                    )
                     has_done_build = True
-                elif step.group == "install" and not has_done_install and provider_config.commands.install:
-                    new_build.append(RunStep(provider_config.commands.install, group="install"))
+                elif (
+                    step.group == "install"
+                    and not has_done_install
+                    and provider_config.commands.install
+                ):
+                    new_build.append(
+                        RunStep(provider_config.commands.install, group="install")
+                    )
                     has_done_install = True
                 else:
                     new_build.append(step)
@@ -288,10 +302,14 @@ def evaluate_shipit(
         serve.build = new_build
 
     if serve.commands.get("start"):
-        serve.commands["start"] = serve.commands["start"].replace("$PORT", str(provider_config.port or "8080"))
-    
+        serve.commands["start"] = serve.commands["start"].replace(
+            "$PORT", str(provider_config.port or "8080")
+        )
+
     if serve.commands.get("after_deploy"):
-        serve.commands["after_deploy"] = serve.commands["after_deploy"].replace("$PORT", str(provider_config.port or "8080"))
+        serve.commands["after_deploy"] = serve.commands["after_deploy"].replace(
+            "$PORT", str(provider_config.port or "8080")
+        )
 
     return ctx, serve
 
@@ -406,6 +424,9 @@ def auto(
         help="The port to use (defaults to 8080).",
     ),
 ):
+    # We assume wasmer as an active flag if we pass wasmer deploy or wasmer deploy config
+    wasmer = wasmer or wasmer_deploy or (wasmer_deploy_config is not None)
+
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
 
@@ -440,7 +461,7 @@ def auto(
         install_command=install_command,
         build_command=build_command,
         start_command=start_command,
-        wasmer=(wasmer or wasmer_deploy),
+        wasmer=wasmer,
         docker=docker,
         docker_client=docker_client,
         skip_docker_if_safe_build=skip_docker_if_safe_build,
@@ -522,7 +543,9 @@ def generate(
     if build_command:
         base_config.commands.build = build_command
     provider_cls = load_provider(path, base_config, use_provider=provider)
-    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
+    provider_config = load_provider_config(
+        provider_cls, path, base_config, config=config
+    )
     provider = provider_cls(path, provider_config)
     content = generate_shipit(path, provider)
     config_json = provider_config.model_dump_json(indent=2, exclude_defaults=True)
@@ -616,6 +639,9 @@ def serve(
         help="Save the output of the Wasmer build to a json file",
     ),
 ) -> None:
+    # We assume wasmer as an active flag if we pass wasmer deploy or wasmer deploy config
+    wasmer = wasmer or wasmer_deploy or (wasmer_deploy_config is not None)
+
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
 
@@ -626,8 +652,7 @@ def serve(
     else:
         build_backend = LocalBuildBackend(path, ASSETS_PATH)
 
-    needs_wasmer = wasmer or wasmer_deploy or wasmer_deploy_config
-    if needs_wasmer:
+    if wasmer:
         runner: Runner = WasmerRunner(
             build_backend,
             path,
@@ -783,7 +808,9 @@ def plan(
     if serve_port:
         base_config.port = serve_port
     provider_cls = load_provider(path, base_config, use_provider=provider)
-    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
+    provider_config = load_provider_config(
+        provider_cls, path, base_config, config=config
+    )
     # provider_config = runner.prepare_config(provider_config)
     ctx, serve = evaluate_shipit(shipit_file, build_backend, runner, provider_config)
 
@@ -811,9 +838,7 @@ def plan(
         provider_config.commands.build = build_command
     plan_output = {
         "provider": provider_cls.name(),
-        "config": json.loads(
-            provider_config.model_dump_json(exclude_defaults=True)
-        ),
+        "config": json.loads(provider_config.model_dump_json(exclude_defaults=True)),
         "services": [
             {"name": svc.name, "provider": svc.provider}
             for svc in (serve.services or [])
@@ -936,11 +961,11 @@ def build(
         base_config.port = serve_port
 
     provider_cls = load_provider(path, base_config, use_provider=provider)
-    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
-    provider_config = runner.prepare_config(provider_config)
-    ctx, serve = evaluate_shipit(
-        shipit_file, build_backend, runner, provider_config
+    provider_config = load_provider_config(
+        provider_cls, path, base_config, config=config
     )
+    provider_config = runner.prepare_config(provider_config)
+    ctx, serve = evaluate_shipit(shipit_file, build_backend, runner, provider_config)
     env = {
         "PATH": "",
         "COLORTERM": os.environ.get("COLORTERM", ""),
@@ -986,7 +1011,9 @@ def build(
         env_vars = dotenv_values(path / f".env.{env_name}")
         serve.env.update(env_vars)
 
-    assert serve.commands.get("start"), "No start command could be found, please provide a start command"
+    assert serve.commands.get("start"), (
+        "No start command could be found, please provide a start command"
+    )
 
     # Build and serve
     build_backend.build(serve.name, env, serve.mounts or [], serve.build)

{shipit_cli-0.15.0 → shipit_cli-0.15.2}/src/shipit/providers/base.py

@@ -2,8 +2,8 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Protocol, Literal
 from shipit.procfile import Procfile
-from pydantic import BaseModel, Field
-from pydantic_settings import SettingsConfigDict
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 @dataclass
@@ -12,7 +12,7 @@ class DetectResult:
     score: int  # Higher score wins when multiple providers match
 
 
-class CustomCommands(BaseModel):
+class CustomCommands(BaseSettings):
     model_config = SettingsConfigDict(extra="ignore")
 
     install: Optional[str] = None
@@ -46,7 +46,7 @@ class CustomCommands(BaseModel):
         return self
 
 
-class Config(BaseModel):
+class Config(BaseSettings):
     model_config = SettingsConfigDict(extra="ignore", env_prefix="SHIPIT_")
 
     port: Optional[int] = 8080

{shipit_cli-0.15.0 → shipit_cli-0.15.2}/src/shipit/providers/php.py

@@ -19,6 +19,7 @@ class PhpConfig(Config):
     model_config = SettingsConfigDict(extra="ignore", env_prefix="SHIPIT_")
 
     use_composer: bool = False
+    composer_build_script: Optional[str] = None
     php_version: Optional[str] = "8.3"
     php_architecture: Optional[Literal["64-bit", "32-bit"]] = "64-bit"
 
@@ -38,7 +39,16 @@ class PhpProvider:
             )
             or False
         )
-        return PhpConfig(use_composer=use_composer, **base_config.model_dump())
+        composer_build_script = None
+        if use_composer:
+            composer_config = json.load(open(path / "composer.json"))
+            if "scripts" in composer_config:
+                assert isinstance(composer_config["scripts"], dict), "Scripts must be a dictionary"
+                composer_build_script = "post-update-cmd" if "post-update-cmd" in composer_config["scripts"] else None
+                if not composer_build_script and "post-install-cmd" in composer_config["scripts"]:
+                    composer_build_script = "post-install-cmd"
+        config = PhpConfig(use_composer=use_composer, composer_build_script=composer_build_script, **base_config.model_dump())
+        return config
 
     @classmethod
     def name(cls) -> str:
@@ -97,10 +107,15 @@ class PhpProvider:
         if self.config.use_composer:
             steps.append('env(COMPOSER_HOME="/tmp", COMPOSER_FUND="0")')
             steps.append(
-                'run("composer install --optimize-autoloader --no-scripts --no-interaction", inputs=["composer.json", "composer.lock"], outputs=["."], group="install")'
+                'run("composer install --optimize-autoloader --ignore-platform-reqs --no-scripts --no-interaction", inputs=["composer.json", "composer.lock"], outputs=["."], group="install")'
             )
 
         steps.append('copy(".", ".", ignore=[".git"])')
+
+        # Since we don't run the scripts during the install step, we need to run them after the build step
+        if self.config.use_composer and self.config.composer_build_script:
+            steps.append(f'run("composer run-script {self.config.composer_build_script}", outputs=["."], group="build")')
+
         return steps
 
     def prepare_steps(self) -> Optional[list[str]]:

shipit_cli-0.15.2/src/shipit/version.py

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

shipit_cli-0.15.0/src/shipit/version.py

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