shipit-cli 0.7.1__tar.gz → 0.9.0__tar.gz

{shipit_cli-0.7.1 → shipit_cli-0.9.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.7.1
-Summary: Add your description here
+Version: 0.9.0
+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
 Project-URL: Changelog, https://github.com/wasmerio/shipit/changelog
@@ -10,6 +10,7 @@ Requires-Dist: dotenv>=0.9.9
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: requests>=2.32.5
 Requires-Dist: rich>=14.1.0
+Requires-Dist: semantic-version>=2.10.0
 Requires-Dist: sh>=2.2.2
 Requires-Dist: starlark-pyo3>=2025.1
 Requires-Dist: tomlkit>=0.13.3

{shipit_cli-0.7.1 → shipit_cli-0.9.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "shipit-cli"
-version = "0.7.1"
-description = "Add your description here"
+version = "0.9.0"
+description = "Shipit CLI is the best way to build, serve and deploy your projects anywhere."
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
@@ -9,6 +9,7 @@ dependencies = [
     "pyyaml>=6.0.2",
     "requests>=2.32.5",
     "rich>=14.1.0",
+    "semantic-version>=2.10.0",
     "sh>=2.2.2",
     "starlark-pyo3>=2025.1",
     "tomlkit>=0.13.3",
@@ -35,5 +36,12 @@ only-include = ["src/shipit", "tests"]
 
 [tool.uv]
 dev-dependencies = [
-    "pytest>=8.2",
+    "aiohttp>=3.12.15",
+    "pytest>=8.4.1",
+    "pytest-asyncio>=1.2.0",
+    "pytest-rerunfailures>=16.0.1",
+    "pytest-xdist>=3.8.0",
 ]
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"

{shipit_cli-0.7.1 → shipit_cli-0.9.0}/src/shipit/assets/wordpress/install.sh

@@ -12,7 +12,7 @@ echo "" > wp-content/upgrade/.keep
 
 echo "Installing WordPress core..."
 
-wp-cli core install \
+wp core install \
   --url="$WASMER_APP_URL"  \
   --title="$WP_SITE_TITLE" \
   --admin_user="$WP_ADMIN_USERNAME" \
@@ -21,13 +21,8 @@ wp-cli core install \
   --locale="$WP_LOCALE"
 
 
-if [ -z "$WASMER_FIRST_DEPLOYMENT" ]; then
-    wp-cli core update-db
-fi    
-
-echo "Installing theme..."
-wp-cli wasmer-aio-install install \
-  --locale="$WP_LOCALE" \
-  --theme=twentytwentyfive || true
+if [ -z "$WP_UPDATE_DB" ]; then
+    wp core update-db
+fi
 
 echo "Installation complete"

{shipit_cli-0.7.1 → shipit_cli-0.9.0}/src/shipit/cli.py

@@ -148,10 +148,12 @@ class Build:
 
 def write_stdout(line: str) -> None:
     sys.stdout.write(line)  # print to console
+    sys.stdout.flush()
 
 
 def write_stderr(line: str) -> None:
     sys.stderr.write(line)  # print to console
+    sys.stderr.flush()
 
 
 class MapperItem(TypedDict):
@@ -179,6 +181,16 @@ class Builder(Protocol):
 
 
 class DockerBuilder:
+    mise_mapper = {
+        "php": {
+            "source": "ubi:adwinying/php",
+        },
+        "composer": {
+            "source": "ubi:composer/composer",
+            "postinstall": """composer_dir=$(mise where ubi:composer/composer); ln -s "$composer_dir/composer.phar" /usr/local/bin/composer""",
+        },
+    }
+
     def __init__(self, src_dir: Path, docker_client: Optional[str] = None) -> None:
         self.src_dir = src_dir
         self.docker_file_contents = ""
@@ -293,7 +305,7 @@ class DockerBuilder:
             image_name,
             command,
             *(extra_args or []),
-            _env=os.environ,  # Pass the current environment variables to the Docker client
+            _env={"DOCKER_BUILDKIT": "1", **os.environ},  # Pass the current environment variables to the Docker client
             _out=write_stdout,
             _err=write_stderr,
         )
@@ -340,12 +352,17 @@ RUN chmod {oct(mode)[2:]} {path.absolute()}
                 )
             self.docker_file_contents += f"RUN curl --proto '=https' --tlsv1.2 -sSfL https://get.static-web-server.net | sh\n"
             return
+
+        mapped_dependency = self.mise_mapper.get(dependency.name, {})
+        package_name = mapped_dependency.get("source", dependency.name)
         if dependency.version:
             self.docker_file_contents += (
-                f"RUN mise use --global {dependency.name}@{dependency.version}\n"
+                f"RUN mise use --global {package_name}@{dependency.version}\n"
             )
         else:
-            self.docker_file_contents += f"RUN mise use --global {dependency.name}\n"
+            self.docker_file_contents += f"RUN mise use --global {package_name}\n"
+        if mapped_dependency.get("postinstall"):
+            self.docker_file_contents += f"RUN {mapped_dependency.get('postinstall')}\n"
 
     def build(
         self, env: Dict[str, str], mounts: List[Mount], steps: List[Step]
@@ -353,14 +370,17 @@ RUN chmod {oct(mode)[2:]} {path.absolute()}
         base_path = self.docker_path
         shutil.rmtree(base_path, ignore_errors=True)
         base_path.mkdir(parents=True, exist_ok=True)
-        self.docker_file_contents = "FROM debian:trixie-slim AS build\n"
+        self.docker_file_contents = "# syntax=docker/dockerfile:1.7-labs\n"
+        self.docker_file_contents += "FROM debian:trixie-slim AS build\n"
 
         self.docker_file_contents += """
 RUN apt-get update \\
     && apt-get -y --no-install-recommends install \\
-        build-essential gcc make \\
-        dpkg-dev pkg-config \\
+        build-essential gcc make autoconf libtool bison \\
+        dpkg-dev pkg-config re2c locate \\
         libmariadb-dev libmariadb-dev-compat libpq-dev \\
+        libvips-dev default-libmysqlclient-dev libmagickwand-dev \\
+        libicu-dev libxml2-dev libxslt-dev \\
         sudo curl ca-certificates \\
     && rm -rf /var/lib/apt/lists/*
 
@@ -407,7 +427,7 @@ RUN curl https://mise.run | sh
                         # Read the file content and write it to the target file
                         content_base64 = base64.b64encode(
                             (ASSETS_PATH / step.source).read_bytes()
-                        )
+                        ).decode("utf-8")
                         self.docker_file_contents += (
                             f"RUN echo '{content_base64}' | base64 -d > {step.target}\n"
                         )
@@ -418,7 +438,11 @@ RUN curl https://mise.run | sh
                     else:
                         raise Exception(f"Asset {step.source} does not exist")
                 else:
-                    self.docker_file_contents += f"COPY {step.source} {step.target}\n"
+                    if step.ignore:
+                        exclude = " \\\n" +" \\\n".join([f"  --exclude={ignore}" for ignore in step.ignore]) + " \\\n "
+                    else:
+                        exclude = ""
+                    self.docker_file_contents += f"COPY{exclude} {step.source} {step.target}\n"
             elif isinstance(step, EnvStep):
                 env_vars = " ".join(
                     [f"{key}={value}" for key, value in step.variables.items()]
@@ -446,12 +470,6 @@ Shipit
     def get_path(self) -> Path:
         return Path("/")
 
-    def get_build_path(self) -> Path:
-        return self.get_path() / "app"
-
-    def get_serve_path(self) -> Path:
-        return self.get_path() / "serve"
-
     def prepare(self, env: Dict[str, str], prepare: List[PrepareStep]) -> None:
         raise NotImplementedError
 
@@ -461,13 +479,12 @@ Shipit
         for dep in serve.deps:
             self.add_dependency(dep)
 
-        build_path = self.get_build_path()
         for command in serve.commands:
             console.print(f"* {command}")
             command_path = serve_command_path / command
             self.create_file(
                 command_path,
-                f"#!/bin/bash\ncd {build_path}\n{serve.commands[command]}",
+                f"#!/bin/bash\ncd {serve.cwd}\n{serve.commands[command]}",
                 mode=0o755,
             )
 
@@ -480,6 +497,7 @@ class LocalBuilder:
     def __init__(self, src_dir: Path) -> None:
         self.src_dir = src_dir
         self.local_path = self.src_dir / ".shipit" / "local"
+        self.serve_bin_path = self.local_path / "serve" / "bin"
         self.prepare_bash_script = self.local_path / "prepare" / "prepare.sh"
         self.build_path = self.local_path / "build"
         self.workdir = self.build_path
@@ -503,6 +521,8 @@ class LocalBuilder:
         elif isinstance(step, WorkdirStep):
             console.print(f"[bold]Working in {step.path}[/bold]")
             self.workdir = step.path
+            # We make sure the dir exists
+            step.path.mkdir(parents=True, exist_ok=True)
         elif isinstance(step, RunStep):
             extra = ""
             if step.inputs:
@@ -525,9 +545,10 @@ class LocalBuilder:
             exe = shutil.which(program, path=PATH)
             if not exe:
                 raise Exception(f"Program is not installed: {program}")
-            cmd = sh.Command(exe)  # "grep"
+            cmd = sh.Command("bash")  # "grep"
             result = cmd(
-                *parts[1:],
+                "-c",
+                command_line,
                 _env={**env, "PATH": PATH},
                 _cwd=build_path,
                 _out=write_stdout,
@@ -628,12 +649,6 @@ class LocalBuilder:
     def get_path(self) -> Path:
         return self.local_path
 
-    def get_build_path(self) -> Path:
-        return self.get_path() / "build"
-
-    def get_serve_path(self) -> Path:
-        return self.get_path() / "serve"
-
     def build_prepare(self, serve: Serve) -> None:
         self.prepare_bash_script.parent.mkdir(parents=True, exist_ok=True)
         commands: List[str] = []
@@ -676,14 +691,13 @@ class LocalBuilder:
     def build_serve(self, serve: Serve) -> None:
         # Remember serve configuration for run-time
         console.print("\n[bold]Building serve[/bold]")
-        serve_command_path = self.get_serve_path() / "bin"
-        serve_command_path.mkdir(parents=True, exist_ok=False)
+        self.serve_bin_path.mkdir(parents=True, exist_ok=False)
         path = self.get_path() / ".path"
         path_text = path.read_text()
         console.print(f"[bold]Serve Commands:[/bold]")
         for command in serve.commands:
             console.print(f"* {command}")
-            command_path = serve_command_path / command
+            command_path = self.serve_bin_path / command
             env_vars = ""
             if serve.env:
                 env_vars = " ".join([f"{k}={v}" for k, v in serve.env.items()])
@@ -707,8 +721,7 @@ class LocalBuilder:
 
     def run_serve_command(self, command: str) -> None:
         console.print(f"\n[bold]Running {command} command[/bold]")
-        base_path = self.get_serve_path() / "bin"
-        command_path = base_path / command
+        command_path = self.serve_bin_path / command
         sh.Command(str(command_path))(_out=write_stdout, _err=write_stderr)
 
 
@@ -808,9 +821,6 @@ class WasmerBuilder:
     ) -> None:
         return self.inner_builder.build(env, mounts, build)
 
-    def get_build_path(self) -> Path:
-        return Path("/app")
-
     def build_prepare(self, serve: Serve) -> None:
         print("Building prepare")
         prepare_dir = self.wasmer_dir_path / "prepare"
@@ -1704,7 +1714,7 @@ def main() -> None:
         app()
     except Exception as e:
         console.print(f"[bold red]{type(e).__name__}[/bold red]: {e}")
-        raise e
+        # raise e
 
 
 if __name__ == "__main__":

{shipit_cli-0.7.1 → shipit_cli-0.9.0}/src/shipit/generator.py

@@ -109,7 +109,7 @@ def generate_shipit(path: Path, custom_commands: CustomCommands) -> str:
 
     build_steps_block = ",\n".join([f"    {s}" for s in build_steps])
     deps_array = ", ".join(serve_dep_vars)
-    commands_lines = ",\n".join([f'    "{k}": {v}' for k, v in plan.commands.items()])
+    commands_lines = ",\n".join([f'    "{k}": {v}.replace("$PORT", PORT)' for k, v in plan.commands.items()])
     env_lines = None
     if plan.env is not None:
         if len(plan.env) == 0:
@@ -119,31 +119,43 @@ def generate_shipit(path: Path, custom_commands: CustomCommands) -> str:
     mounts_block = None
     volumes_block = None
     attach_serve_names: list[str] = []
+
     if plan.mounts:
         mounts = list(filter(lambda m: m.attach_to_serve, plan.mounts))
         attach_serve_names = [m.name for m in mounts]
         mounts_block = ",\n".join([f"    {m.name}" for m in mounts])
+
     if plan.volumes:
         volumes_block = ",\n".join(
             [f"    {v.var_name or v.name}" for v in plan.volumes]
         )
 
     out: List[str] = []
+
     if dep_block:
         out.append(dep_block)
         out.append("")
+
     for m in plan.mounts:
         out.append(f"{m.name} = mount(\"{m.name}\")")
+        out.append("")
+
     if plan.volumes:
         for v in plan.volumes:
             out.append(f"{v.var_name or v.name} = volume(\"{v.name}\", {v.serve_path})")
+        out.append("")
+
     if plan.services:
         for s in plan.services:
             out.append(f"{s.name} = service(\n  name=\"{s.name}\",\n  provider=\"{s.provider}\"\n)")
+        out.append("")
+
+    out.append("PORT = getenv(\"PORT\") or\"8080\"")
 
     if plan.declarations:
         out.append(plan.declarations)
-        out.append("")
+    
+    out.append("")
     out.append("serve(")
     out.append(f'  name="{plan.serve_name}",')
     out.append(f'  provider="{plan.provider}",')

{shipit_cli-0.7.1 → shipit_cli-0.9.0}/src/shipit/providers/hugo.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, ServiceSpec, VolumeSpec, CustomCommands
+from .base import DetectResult, DependencySpec, Provider, _exists, ServiceSpec, VolumeSpec, CustomCommands, MountSpec
 from .staticfile import StaticFileProvider
 
 class HugoProvider(StaticFileProvider):
@@ -43,10 +43,14 @@ class HugoProvider(StaticFileProvider):
 
     def build_steps(self) -> list[str]:
         return [
+            'workdir(temp["build"])',
             'copy(".", ".", ignore=[".git"])',
             'run("hugo build --destination={}".format(app["build"]), group="build")',
         ]
-    
+
+    def mounts(self) -> list[MountSpec]:
+        return [MountSpec("temp", attach_to_serve=False), *super().mounts()]
+
     def services(self) -> list[ServiceSpec]:
         return []
 

{shipit_cli-0.7.1 → shipit_cli-0.9.0}/src/shipit/providers/laravel.py

@@ -80,7 +80,7 @@ class LaravelProvider:
 
     def commands(self) -> Dict[str, str]:
         return {
-            "start": '"php -S localhost:8080 -t public"',
+            "start": 'f"php -S localhost:{PORT} -t public"',
             "after_deploy": '"php artisan migrate"',
         }
 

{shipit_cli-0.7.1 → shipit_cli-0.9.0}/src/shipit/providers/mkdocs.py

@@ -30,6 +30,8 @@ class MkdocsProvider(StaticFileProvider):
     def detect(cls, path: Path, custom_commands: CustomCommands) -> Optional[DetectResult]:
         if _exists(path, "mkdocs.yml", "mkdocs.yaml"):
             return DetectResult(cls.name(), 85)
+        if custom_commands.build and custom_commands.build.startswith("mkdocs "):
+            return DetectResult(cls.name(), 85)
         return None
 
     def initialize(self) -> None: