shipit-cli 0.15.1__py3-none-any.whl → 0.15.2__py3-none-any.whl

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/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/version.py

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

{shipit_cli-0.15.1.dist-info → shipit_cli-0.15.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.15.1
+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.1.dist-info → shipit_cli-0.15.2.dist-info}/RECORD

@@ -5,7 +5,7 @@ shipit/procfile.py,sha256=bjsdG8aSbRhKvrN96OiSOh0xjJHnlZg42eadtlsLc0M,1129
 shipit/shipit_types.py,sha256=wQzuYOIJMlovOq56ropf2T3j_Ye6Y8BYYdAuXfEGHbM,2062
 shipit/ui.py,sha256=vqtuAYXwB_PqlcOchrPFTQ3yoCXRBqV_GnB5R2u-1-k,243
 shipit/utils.py,sha256=XaiuaT_5mnzlXD9i1PAkaVc162y5Y_wj_oo1z2gUQBI,248
-shipit/version.py,sha256=q8SlRWdsvng7MZpPYDKxyoGYK8uOMP4KzryloyqqOfc,97
+shipit/version.py,sha256=VIlfN0QiC8CAK1LDKQ9UxRGa1rI4adibaKMCjK4g2To,97
 shipit/assets/php/php.ini,sha256=SaR3wvssSROtxTY_CQ5-BspM_47_I971V5X2dsqe8sU,2579
 shipit/assets/wordpress/install.sh,sha256=8sNe4w9F9y97JR-w5Q0ZHVgZvNm_vnd1CacY5fQjewI,3087
 shipit/assets/wordpress/wp-config.php,sha256=q7KHB_TyLrodXzbg8EEPm42XWDIevtwL6wk3L0kbVrs,4809
@@ -13,13 +13,13 @@ shipit/builders/__init__.py,sha256=n1g3bZ_VaXVQIhwTlJnRWzDMCymVUjolykopnypyyyE,1
 shipit/builders/base.py,sha256=mP8WdPs53oLiTQkYT1r7xpyNW5D_2gcTUFwOPkpPsHc,477
 shipit/builders/docker.py,sha256=wnCJdOK-PR7TV3QpHTapDkOYx3G4P47YJeLihgifJ88,9613
 shipit/builders/local.py,sha256=xWN-YevtXp63igycJU-lnIkZQHhhrX176RX6kFNfxKE,6014
-shipit/providers/base.py,sha256=qKEarV37t7Zi2T8Mg0utjvVJN4gkiRCkOPG4w4NqFo4,4163
+shipit/providers/base.py,sha256=gExUrdeZsfC_auBS2OYz-aUTQto1Xsp7mpyVXBXJ3Z4,4172
 shipit/providers/hugo.py,sha256=OIjfRMY6BbEM5uhtVlHlMDZH0uxbrtEEIoMMqDZlX5U,3515
 shipit/providers/jekyll.py,sha256=6XjTIklYfK_iez90j7YL1UDCreReGAaT3zH8fSYMguI,3968
 shipit/providers/laravel.py,sha256=UjfG-CDLihxuWkvZ6Q8KfXOi1Fx71Vcy1NfdjW1Nwgo,3412
 shipit/providers/mkdocs.py,sha256=PDg8gV8OVmlU89B8Fa2AfEgdC9c0x3JkpMUPFaBd0Ts,2662
 shipit/providers/node_static.py,sha256=XCmWIV7OtKE0vg4lIba0Y3IvHuNMaFmJ4OCj3fev5kY,15463
-shipit/providers/php.py,sha256=YL9bFVlTkQ3HgSQ7Vi9YJlkEWXl1M4dbeBMXP2G-EHc,4483
+shipit/providers/php.py,sha256=yYXbu_s8kDIc5qNKlrultFUnXCtQqRP3QfrcqRzTNyo,5487
 shipit/providers/python.py,sha256=gj4tfL4ewAU4mhzOrpcdVYx19JNFNBx3pRYE0IixTPM,22754
 shipit/providers/registry.py,sha256=MSaKc3Eqs1vM04njGUyTtOeL8ffmmWyB3kSpvirqHfg,693
 shipit/providers/staticfile.py,sha256=hpZVFBATiIUOD0miSE1aHtJurqCaPusRuj5MdJV2JU8,3447
@@ -28,7 +28,7 @@ shipit/runners/__init__.py,sha256=s1kICs9W8Z5buF0dalgNNx2AzGAsiTw8OzCIgYiN_ps,15
 shipit/runners/base.py,sha256=edXGW_4lngQS_Q110yy_6UnyOSKLbxxJm5vDIu8ge7Y,582
 shipit/runners/local.py,sha256=OFWyI_IO_7q_QZrbEnXFRUVbNCwNYuxZTdA1PI2Icp4,4138
 shipit/runners/wasmer.py,sha256=d2oL7x74yU6_q1cMYuu3M19XyGzDKnJZHirf1SBuF_k,17202
-shipit_cli-0.15.1.dist-info/METADATA,sha256=dQCRPs5oKZzgOzJrdG-Ji_gYNk7GXv7ojZm02ngQg1k,3773
-shipit_cli-0.15.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-shipit_cli-0.15.1.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
-shipit_cli-0.15.1.dist-info/RECORD,,
+shipit_cli-0.15.2.dist-info/METADATA,sha256=QjI79Bec18mghB3iG2L-f7E8gkeK8JAgorre0e9X6QM,3773
+shipit_cli-0.15.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+shipit_cli-0.15.2.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
+shipit_cli-0.15.2.dist-info/RECORD,,