shipit-cli 0.21.2__tar.gz → 0.21.3__tar.gz

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.21.2
+Version: 0.21.3
 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
@@ -145,16 +145,26 @@ The e2e tests will:
 * Run the project (locally or with Wasmer)
 * Test that the project output (via http requests) is the correct one
 
-### Automatic PyPI Publish
+### Release Automation
 
-Publishing to PyPI is automated with GitHub Actions on version tags.
+Releases are automated with Release Please and PyPI Trusted Publishing.
 
 Requirements:
 
-* Add a repository secret named `PYPI_API_TOKEN` with a PyPI API token.
-* Push tags using the `vX.Y.Z` format (for example: `v0.17.5`).
-
-On each `v*` tag push, the workflow:
+* Enable GitHub Actions workflow permissions for creating pull requests in the
+  repository settings. Release Please uses the built-in `GITHUB_TOKEN`.
+* Configure PyPI Trusted Publishing for the `shipit-cli` project:
+  * owner: `wasmerio`
+  * repository: `shipit`
+  * workflow: `pypi-publish.yml`
+  * environment: `pypi`
+* Create a GitHub environment named `pypi`. Add reviewers there if releases
+  should require manual approval before publishing.
+
+On each push to `main`, Release Please opens or updates a release PR based on
+Conventional Commits. When that PR is merged, it creates a GitHub release with
+a `vX.Y.Z` tag and dispatches the PyPI workflow for that tag with the built-in
+`GITHUB_TOKEN`. The PyPI workflow also supports manual dispatch for reruns. It:
 
 * Runs regular test and e2e workflows.
 * Validates that the tag version without the leading `v` matches:

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/README.md

@@ -122,16 +122,26 @@ The e2e tests will:
 * Run the project (locally or with Wasmer)
 * Test that the project output (via http requests) is the correct one
 
-### Automatic PyPI Publish
+### Release Automation
 
-Publishing to PyPI is automated with GitHub Actions on version tags.
+Releases are automated with Release Please and PyPI Trusted Publishing.
 
 Requirements:
 
-* Add a repository secret named `PYPI_API_TOKEN` with a PyPI API token.
-* Push tags using the `vX.Y.Z` format (for example: `v0.17.5`).
-
-On each `v*` tag push, the workflow:
+* Enable GitHub Actions workflow permissions for creating pull requests in the
+  repository settings. Release Please uses the built-in `GITHUB_TOKEN`.
+* Configure PyPI Trusted Publishing for the `shipit-cli` project:
+  * owner: `wasmerio`
+  * repository: `shipit`
+  * workflow: `pypi-publish.yml`
+  * environment: `pypi`
+* Create a GitHub environment named `pypi`. Add reviewers there if releases
+  should require manual approval before publishing.
+
+On each push to `main`, Release Please opens or updates a release PR based on
+Conventional Commits. When that PR is merged, it creates a GitHub release with
+a `vX.Y.Z` tag and dispatches the PyPI workflow for that tag with the built-in
+`GITHUB_TOKEN`. The PyPI workflow also supports manual dispatch for reruns. It:
 
 * Runs regular test and e2e workflows.
 * Validates that the tag version without the leading `v` matches:

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.21.2"
+version = "0.21.3"
 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.21.2 → shipit_cli-0.21.3}/src/shipit/assets/wordpress/install.sh

@@ -1,5 +1,6 @@
 # Needed to get the WP-CLI commands to avoid asking for the TTY size
 IFS=$'\n\t'
+set -e
 
 export COLUMNS=80  # Prevent WP-CLI from asking for TTY size
 export PAGER="cat"
@@ -11,18 +12,21 @@ WP_DEFAULT_LOCALE=${WP_DEFAULT_LOCALE:-"en_US"}
 WP_LOCALE=${WP_LOCALE:-"$WP_DEFAULT_LOCALE"}
 WP_SITEURL=${WP_SITEURL:-"http://localhost"}
 WP_SITE_TITLE=${WP_SITE_TITLE:-"WordPress"}
+WP_CONTENT_DIR=${WP_CONTENT_DIR:-"wp-content"}
 
 echo "📁 Initializing wp-content..."
-mkdir -p wp-content/plugins
-mkdir -p wp-content/themes
-mkdir -p wp-content/upgrade
+mkdir -p "${WP_CONTENT_DIR}/plugins"
+mkdir -p "${WP_CONTENT_DIR}/themes"
+mkdir -p "${WP_CONTENT_DIR}/upgrade"
 
 if [ -n "${WPCONTENT_BASE_PATH:-}" ] && [ -d "${WPCONTENT_BASE_PATH}" ]; then
   shopt -s dotglob nullglob
-  # Note: change this back to copy all, once using the WP Zip files.
-  # cp -R "${WPCONTENT_BASE_PATH}"/* /app/wp-content || true
-  cp -R "${WPCONTENT_BASE_PATH}"/plugins/* /app/wp-content/plugins || true
-  cp -R "${WPCONTENT_BASE_PATH}"/themes/twentytwenty* /app/wp-content/themes || true
+  cp -R "${WPCONTENT_BASE_PATH}"/plugins/* "${WP_CONTENT_DIR}/plugins" || true
+  if [ -n "${WP_DEFAULT_THEME:-}" ]; then
+    cp -R "${WPCONTENT_BASE_PATH}"/themes/* "${WP_CONTENT_DIR}/themes" || true
+  else
+    cp -R "${WPCONTENT_BASE_PATH}"/themes/twentytwenty* "${WP_CONTENT_DIR}/themes" || true
+  fi
   shopt -u dotglob nullglob
 fi
 

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/src/shipit/builders/docker.py

@@ -144,7 +144,7 @@ RUN apt-get update \\
     && apt-get -y --no-install-recommends install \\
         build-essential gcc make autoconf libtool bison \\
         dpkg-dev pkg-config re2c locate \\
-        libmariadb-dev libmariadb-dev-compat libpq-dev \\
+        libmariadb-dev libmariadb-dev-compat libpq-dev libsqlite3-dev \\
         libvips-dev default-libmysqlclient-dev libmagickwand-dev \\
         libicu-dev libxml2-dev libxslt-dev libyaml-dev \\
         sudo curl ca-certificates unzip git \\

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/src/shipit/cli.py

@@ -1493,6 +1493,7 @@ def main() -> None:
         console.print(f"[bold red]{type(e).__name__}[/bold red]: {e}")
         if os.environ.get("SHIPIT_DEBUG", "false").lower() in ["1", "true", "yes", "y"]:
             raise e
+        sys.exit(1)
 
 
 if __name__ == "__main__":

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/src/shipit/providers/node.py

@@ -1,4 +1,5 @@
 import json
+import re
 import shlex
 from enum import Enum
 from pathlib import Path
@@ -483,6 +484,46 @@ class NodeProvider:
         "src/server.js",
         "src/index.js",
     )
+    NODE_BUILTIN_MODULES: ClassVar[tuple[str, ...]] = (
+        "assert",
+        "buffer",
+        "child_process",
+        "cluster",
+        "crypto",
+        "dgram",
+        "dns",
+        "events",
+        "fs",
+        "http",
+        "http2",
+        "https",
+        "module",
+        "net",
+        "os",
+        "path",
+        "perf_hooks",
+        "process",
+        "querystring",
+        "readline",
+        "stream",
+        "timers",
+        "tls",
+        "tty",
+        "url",
+        "util",
+        "v8",
+        "vm",
+        "worker_threads",
+        "zlib",
+    )
+    NODE_ENTRY_MARKER_PATTERN: ClassVar[re.Pattern[str]] = re.compile(
+        r"\bmodule\.exports\b"
+        r"|\bexports\."
+        r"|\b__dirname\b"
+        r"|\b__filename\b"
+        r"|\bprocess\.(?:env|argv|exit|cwd|platform|version)\b"
+        r"|\b[A-Za-z_$][\w$]*\.listen\s*\("
+    )
     START_PROGRAMS = {
         "edge",
         "node",
@@ -598,12 +639,62 @@ class NodeProvider:
         if (path / "package.json").is_file():
             return DetectResult(cls.name(), 30)
 
-        for entry_file in cls.COMMON_ENTRY_FILES:
-            if (path / entry_file).is_file():
-                return DetectResult(cls.name(), 30)
+        if cls._common_entry_file(path, require_node_evidence=True):
+            return DetectResult(cls.name(), 30)
+
+        return None
 
+    @classmethod
+    def _common_entry_file(
+        cls,
+        path: Path,
+        *,
+        require_node_evidence: bool,
+    ) -> Optional[str]:
+        for entry_file in cls.COMMON_ENTRY_FILES:
+            entry_path = path / entry_file
+            if not entry_path.is_file():
+                continue
+            if not require_node_evidence:
+                return entry_file
+            if cls._looks_like_node_entry(entry_path):
+                return entry_file
         return None
 
+    @classmethod
+    def _looks_like_node_entry(cls, entry_path: Path) -> bool:
+        try:
+            source = entry_path.read_text(errors="ignore")
+        except OSError:
+            return False
+
+        first_line = source.splitlines()[0] if source else ""
+        has_node_shebang = (
+            first_line.startswith("#!")
+            and re.search(r"\bnode(?:js)?\b", first_line)
+        )
+        if has_node_shebang:
+            return True
+
+        if cls.NODE_ENTRY_MARKER_PATTERN.search(source):
+            return True
+
+        module_ref = cls._node_builtin_module_ref_pattern()
+        module_patterns = (
+            rf"\brequire\s*\(\s*['\"]{module_ref}['\"]\s*\)",
+            rf"\bimport\s*\(\s*['\"]{module_ref}['\"]\s*\)",
+            rf"\bfrom\s*['\"]{module_ref}['\"]",
+            rf"\bimport\s*['\"]{module_ref}['\"]",
+        )
+        return any(re.search(pattern, source) for pattern in module_patterns)
+
+    @classmethod
+    def _node_builtin_module_ref_pattern(cls) -> str:
+        modules = "|".join(
+            re.escape(module) for module in cls.NODE_BUILTIN_MODULES
+        )
+        return rf"(?:node:)?(?:{modules})(?:/[^'\"\s)]*)?"
+
     @classmethod
     def detect_package_manager(cls, path: Path) -> PackageManager:
         package_json = cls.parse_package_json(path) or {}
@@ -921,9 +1012,12 @@ class NodeProvider:
             if isinstance(main, str) and main.strip():
                 return cls._node_entry_command(main.strip())
 
-        for entry_file in cls.COMMON_ENTRY_FILES:
-            if (path / entry_file).is_file():
-                return cls._node_entry_command(entry_file)
+        entry_file = cls._common_entry_file(
+            path,
+            require_node_evidence=not (path / "package.json").is_file(),
+        )
+        if entry_file:
+            return cls._node_entry_command(entry_file)
 
         return None
 

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/src/shipit/providers/wordpress.py

@@ -47,6 +47,9 @@ class WordPressProvider(PhpProvider):
     THEME_HEADER_RE = re.compile(
         r"^[ \t/*#@]*Theme Name\s*:", re.I | re.M
     )
+    TEXT_DOMAIN_RE = re.compile(
+        r"^[ \t/*#@]*Text Domain\s*:\s*([^\s*/#@]+)", re.I | re.M
+    )
 
     @classmethod
     def name(cls) -> str:
@@ -93,7 +96,9 @@ class WordPressProvider(PhpProvider):
         for plugin_file in plugin_files:
             if not cls._file_has_header(plugin_file, cls.PLUGIN_HEADER_RE):
                 continue
-            slug = cls._slugify(path.name)
+            slug = cls._detect_text_domain_slug(plugin_file) or cls._slugify(
+                path.name
+            )
             return WordPressExtension(
                 kind="plugin",
                 slug=slug,
@@ -113,7 +118,9 @@ class WordPressProvider(PhpProvider):
             or (path / "theme.json").is_file()
         ):
             return None
-        slug = cls._slugify(path.name)
+        slug = cls._detect_text_domain_slug(style_css) or cls._slugify(
+            path.name
+        )
         return WordPressExtension(
             kind="theme",
             slug=slug,
@@ -121,15 +128,36 @@ class WordPressProvider(PhpProvider):
             source_file="style.css",
         )
 
+    @classmethod
+    def _detect_text_domain_slug(cls, header_file: Path) -> Optional[str]:
+        text_domain = cls._file_header_value(
+            header_file,
+            cls.TEXT_DOMAIN_RE,
+        )
+        if not text_domain:
+            return None
+        return cls._slugify(text_domain)
+
     @classmethod
     def _file_has_header(cls, path: Path, pattern: re.Pattern[str]) -> bool:
+        return cls._file_header_value(path, pattern) is not None
+
+    @classmethod
+    def _file_header_value(
+        cls, path: Path, pattern: re.Pattern[str]
+    ) -> Optional[str]:
         if not path.is_file():
-            return False
+            return None
         try:
             contents = path.read_text(errors="ignore")[: cls.HEADER_SCAN_BYTES]
         except OSError:
-            return False
-        return bool(pattern.search(contents))
+            return None
+        match = pattern.search(contents)
+        if not match:
+            return None
+        if match.lastindex:
+            return match.group(1).strip()
+        return match.group(0).strip()
 
     @staticmethod
     def _slugify(value: str) -> str:

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/src/shipit/runners/wasmer.py

@@ -167,28 +167,28 @@ class WasmerRunner:
         },
         "phpix": {
             "dependencies": {
-                "latest": "phpix/phpix-83-32bit@=0.2.0",
-                "8.3": "phpix/phpix-83-32bit@=0.2.0",
-                "8.3.29": "phpix/phpix-83-32bit@=0.2.0",
-                "8.2": "phpix/phpix-82-32bit@=0.2.0",
-                "8.1": "phpix/phpix-81-32bit@=0.2.0",
+                "latest": "phpix/phpix-83-32bit@=0.2.2",
+                "8.3": "phpix/phpix-83-32bit@=0.2.2",
+                "8.3.29": "phpix/phpix-83-32bit@=0.2.2",
+                "8.2": "phpix/phpix-82-32bit@=0.2.2",
+                "8.1": "phpix/phpix-81-32bit@=0.2.2",
                 "7.4": "php/php-32@=7.4.3301", # Note, we don't have PHPix + PHP 7.4 and never will
             },
             "architecture_dependencies": {
                 "64-bit": {
-                    "latest": "phpix/phpix-83-64bit@=0.2.0",
-                    "8.3": "phpix/phpix-83-64bit@=0.2.0",
-                    "8.3.29": "phpix/phpix-83-64bit@=0.2.0",
-                    "8.2": "phpix/phpix-82-64bit@=0.2.0",
-                    "8.1": "phpix/phpix-81-64bit@=0.2.0",
+                    "latest": "phpix/phpix-83-64bit@=0.2.2",
+                    "8.3": "phpix/phpix-83-64bit@=0.2.2",
+                    "8.3.29": "phpix/phpix-83-64bit@=0.2.2",
+                    "8.2": "phpix/phpix-82-64bit@=0.2.2",
+                    "8.1": "phpix/phpix-81-64bit@=0.2.2",
                     "7.4": "php/php-64@=7.4.3301",
                 },
                 "32-bit": {
-                    "latest": "phpix/phpix-83-32bit@=0.2.0",
-                    "8.3": "phpix/phpix-83-32bit@=0.2.0",
-                    "8.3.29": "phpix/phpix-83-32bit@=0.2.0",
-                    "8.2": "phpix/phpix-82-32bit@=0.2.0",
-                    "8.1": "phpix/phpix-81-32bit@=0.2.0",
+                    "latest": "phpix/phpix-83-32bit@=0.2.2",
+                    "8.3": "phpix/phpix-83-32bit@=0.2.2",
+                    "8.3.29": "phpix/phpix-83-32bit@=0.2.2",
+                    "8.2": "phpix/phpix-82-32bit@=0.2.2",
+                    "8.1": "phpix/phpix-81-32bit@=0.2.2",
                     "7.4": "php/php-32@=7.4.3301",
                 },
             },

shipit_cli-0.21.3/src/shipit/version.py

@@ -0,0 +1,12 @@
+__all__ = ["version", "version_info"]
+
+
+version = "0.21.3"  # x-release-please-version
+_version_parts = version.split(".")
+version_info = (
+    int(_version_parts[0]),
+    int(_version_parts[1]),
+    int(_version_parts[2]),
+    "final",
+    0,
+)

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/tests/test_e2e.py

@@ -65,6 +65,7 @@ class E2ECase:
     http: List[HTTPRequest]
     path: str | None = None
     download: str | None = None
+    name: str | None = None
     use_random_port: bool = True
     env: dict[str, str] | None = None
     extra_env: dict[str, str] | None = None
@@ -77,6 +78,8 @@ class E2ECase:
     build_modes: tuple[BuildMode, ...] | None = None
 
     def __str__(self):
+        if self.name:
+            return self.name
         if self.path:
             return self.path
         assert self.download is not None
@@ -86,6 +89,12 @@ class E2ECase:
         return str(self)
 
 
+BRO_BARBERSHOP_ARCHIVE_URL = (
+    "https://github.com/motopress/bro-barbershop/archive/"
+    "refs/heads/master.zip"
+)
+
+
 @pytest.mark.e2e
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
@@ -203,6 +212,41 @@ class E2ECase:
             ],
             build_modes=(BuildMode.Wasmer,),
         ),
+        # Real WordPress theme from GitHub; validates custom theme activation.
+        E2ECase(
+            download=BRO_BARBERSHOP_ARCHIVE_URL,
+            name="wordpress_bro_barbershop_theme",
+            serve_pattern=(
+                r"listening addr"
+            ),
+            http=[
+                HTTPRequest(
+                    path="/",
+                    expected_status=200,
+                )
+            ],
+            use_random_port=False,
+            env={
+                "DB_NAME": "test",
+                "DB_USERNAME": "root",
+                "DB_HOST": "127.0.0.1",
+                "DB_PORT": "3306",
+                "DB_PASSWORD": "",
+                "SHIPIT_PHPIX": "true",
+                "SHIPIT_WP_VERSION": "6.9.4",
+            },
+            create_db=True,
+            create_wp_content_volume=True,
+            run_after_deploy=True,
+            commands=[
+                RunCommand("wp theme is-active bro-barbershop"),
+                RunCommand(
+                    "wp option get stylesheet",
+                    stdout_match=r"^bro-barbershop\s*$",
+                ),
+            ],
+            build_modes=(BuildMode.Wasmer,),
+        ),
         # WordPress skeleton in phpix mode (Wasmer only), validate memory cap.
         E2ECase(
             path="examples/php-wordpress",
@@ -230,6 +274,13 @@ class E2ECase:
             serve_pattern=r"server is listening on",
             http=[HTTPRequest(path="/", body_match=r"Test")],
         ),
+        # Static HTML app with browser JavaScript should not be treated as Node.
+        E2ECase(
+            path="examples/static-htmlwithjs",
+            serve_pattern=r"server is listening on",
+            http=[HTTPRequest(path="/", body_match=r"Static HTML with JS")],
+            build_modes=(BuildMode.Wasmer,),
+        ),
         # Staticfile provider serving content under site/
         E2ECase(
             path="examples/staticfile",
@@ -641,11 +692,16 @@ class E2ECase:
             serve_pattern=r"Uvicorn running on .*",
             http=[HTTPRequest(path="/", body_match=r"Welcome to Flask")],
         ),
-        # Python Django via Uvicorn WSGI (check admin login)
+        # Python Django via Uvicorn WSGI. Docker covers collectstatic.
         E2ECase(
             path="examples/python-django",
             serve_pattern=r"Uvicorn running on .*",
             http=[HTTPRequest(path="/", body_match=r"Django")],
+            build_modes=(
+                BuildMode.Local,
+                BuildMode.Wasmer,
+                BuildMode.WasmerAndDocker,
+            ),
         ),
         # Python ffmpeg demo (FastAPI), homepage is static HTML form
         E2ECase(
@@ -776,6 +832,7 @@ async def test_end_to_end(
                     env=env,
                     timeout=180,
                 )
+                _print_run_command_output(command, cmd, result)
                 _assert_run_command(command, cmd, result)
             return
 
@@ -1276,6 +1333,25 @@ async def _stop_process(proc: asyncio.subprocess.Process) -> None:
             await proc.wait()
 
 
+def _print_run_command_output(
+    command: RunCommand,
+    cmd: list[str],
+    result: CompletedCommand,
+) -> None:
+    print(f"[run-command] {shlex.join(cmd)}")
+    print(
+        "[run-command] "
+        f"expected_returncode={command.expected_returncode} "
+        f"returncode={result.returncode}"
+    )
+    if result.stdout:
+        print("[run-command stdout]")
+        print(result.stdout, end="" if result.stdout.endswith("\n") else "\n")
+    if result.stderr:
+        print("[run-command stderr]")
+        print(result.stderr, end="" if result.stderr.endswith("\n") else "\n")
+
+
 def _assert_run_command(
     command: RunCommand,
     cmd: list[str],

{shipit_cli-0.21.2 → shipit_cli-0.21.3}/tests/test_node_provider.py

@@ -123,6 +123,24 @@ def test_node_provider_detects_generic_node_example() -> None:
     assert load_provider(path, Config()) is NodeProvider
 
 
+def test_common_entry_without_package_json_needs_node_evidence(
+    tmp_path: Path,
+) -> None:
+    (tmp_path / "app.js").write_text(
+        """import http from "node:http";
+
+http.createServer((_req, res) => {
+  res.end("ok");
+}).listen(process.env.PORT || 8080);
+"""
+    )
+
+    provider_config = NodeProvider.load_config(tmp_path, Config())
+
+    assert load_provider(tmp_path, Config()) is NodeProvider
+    assert provider_config.commands.start == "node app.js"
+
+
 @pytest.mark.parametrize(
     ("example", "framework"),
     [
@@ -332,7 +350,14 @@ def test_node_start_command_uses_package_main(tmp_path: Path) -> None:
 
 
 def test_node_start_command_uses_common_entry_file(tmp_path: Path) -> None:
-    (tmp_path / "server.js").write_text("console.log('ok')\n")
+    (tmp_path / "server.js").write_text(
+        """const http = require("http");
+
+http.createServer((_req, res) => {
+  res.end("ok");
+}).listen(8080);
+"""
+    )
 
     provider_config = NodeProvider.load_config(tmp_path, Config())
 

shipit_cli-0.21.2/src/shipit/version.py

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