wexample-wex-addon-dev-php 12.11.1__tar.gz → 12.13.0__tar.gz

{wexample_wex_addon_dev_php-12.11.1 → wexample_wex_addon_dev_php-12.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-php
-Version: 12.11.1
+Version: 12.13.0
 Summary: Extends wex with PHP-specific development commands for Composer, Laravel, Symfony, and WordPress services running in Docker containers
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -12,10 +12,10 @@ Requires-Python: >=3.10
 Requires-Dist: attrs>=23.1.0
 Requires-Dist: cattrs>=23.1.0
 Requires-Dist: wexample-filestate-php>=6.5.0
-Requires-Dist: wexample-filestate-symfony>=2.1.0
-Requires-Dist: wexample-wex-addon-ai>=19.0.0
-Requires-Dist: wexample-wex-addon-app>=34.3.0
-Requires-Dist: wexample-wex-addon-dev-javascript>=8.6.0
+Requires-Dist: wexample-filestate-symfony>=2.2.0
+Requires-Dist: wexample-wex-addon-ai>=19.1.0
+Requires-Dist: wexample-wex-addon-app>=34.5.0
+Requires-Dist: wexample-wex-addon-dev-javascript>=8.8.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 # wex_addon_dev_php
 
-Version: 12.11.1
+Version: 12.13.0
 
 Extends wex with PHP-specific development commands for Composer, Laravel, Symfony, and WordPress services running in Docker containers
 

{wexample_wex_addon_dev_php-12.11.1 → wexample_wex_addon_dev_php-12.13.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_php
 
-Version: 12.11.1
+Version: 12.13.0
 
 Extends wex with PHP-specific development commands for Composer, Laravel, Symfony, and WordPress services running in Docker containers
 

{wexample_wex_addon_dev_php-12.11.1 → wexample_wex_addon_dev_php-12.13.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-php"
-version = "12.11.1"
+version = "12.13.0"
 description = "Extends wex with PHP-specific development commands for Composer, Laravel, Symfony, and WordPress services running in Docker containers"
 authors = [
     { name = "weeger", email = "contact@wexample.com" },
@@ -21,10 +21,10 @@ dependencies = [
     "attrs>=23.1.0",
     "cattrs>=23.1.0",
     "wexample-filestate-php>=6.5.0",
-    "wexample-filestate-symfony>=2.1.0",
-    "wexample-wex-addon-ai>=19.0.0",
-    "wexample-wex-addon-app>=34.3.0",
-    "wexample-wex-addon-dev-javascript>=8.6.0",
+    "wexample-filestate-symfony>=2.2.0",
+    "wexample-wex-addon-ai>=19.1.0",
+    "wexample-wex-addon-app>=34.5.0",
+    "wexample-wex-addon-dev-javascript>=8.8.0",
 ]
 
 [project.readme]

{wexample_wex_addon_dev_php-12.11.1 → wexample_wex_addon_dev_php-12.13.0}/src/wexample_wex_addon_dev_php/common/packagist_registry_gateway.py

@@ -8,7 +8,8 @@ _HAS_VERSION_STATUS_CODES: tuple[int, ...] = (200, 404)
 
 @base_class
 class PackagistRegistryGateway(AbstractGateway):
-    """Thin HTTP gateway over Packagist's Composer v2 metadata.
+    """Thin HTTP gateway over Packagist's Composer v2 metadata, or a GitLab
+    composer registry's, which serves the same file.
 
     Reads `p2/<vendor>/<package>.json`, the file composer itself downloads:
     a version listed there is one a `composer update` run right after will
@@ -34,6 +35,9 @@ class PackagistRegistryGateway(AbstractGateway):
             releases = response.json().get("packages", {}).get(package, [])
         except ValueError:
             return False
+        # Packagist lists the releases; a GitLab registry maps them by version.
+        if isinstance(releases, dict):
+            releases = list(releases.values())
 
         wanted = version.removeprefix("v")
         return any(

{wexample_wex_addon_dev_php-12.11.1 → wexample_wex_addon_dev_php-12.13.0}/src/wexample_wex_addon_dev_php/workdir/php_package_workdir.py

@@ -38,6 +38,17 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
         dependency check erring toward reporting is the right way round.
         """
         return line.lstrip().startswith(("*", "//", "#", "/*"))
+
+    def get_gitlab_registry_url(self) -> str | None:
+        """The GitLab composer registry of the group, when the suite publishes there.
+
+        `php.gitlab_registry.url`, the group's `packages.json`:
+        `https://gitlab.example.com/api/v4/group/<id>/-/packages/composer/packages.json`.
+        Each version is registered from its tag on the package's own project.
+        """
+        return self.search_app_or_suite_runtime_config(
+            "php.gitlab_registry.url", default=None
+        ).get_str_or_none()
     def get_package_import_name(self) -> str:
         """Get the full package import name with vendor prefix."""
         return f"{string_to_pascal_case(self.get_vendor_name())}\\{string_to_pascal_case(self.get_project_name())}"
@@ -160,7 +171,7 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
 
         path = self.get_path()
 
-        if not git_has_changes_since_tag(last_tag, "src", cwd=path):
+        if not git_has_changes_since_tag(last_tag, "src", cwd=path, content_only=True):
             return UPGRADE_TYPE_MINOR
 
         try:
@@ -218,6 +229,42 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
         # Uses git repo to deploy packages.
         self.push_to_deployment_remote()
 
+        # Our own registry first, where the release counts: what the apps can
+        # install as soon as it is out, and what the publication waits for.
+        # Packagist follows from the tag, through the mirror, unwaited.
+        if self.get_gitlab_registry_url():
+            self._publish_to_gitlab_registry(tag)
+
+    def _publish_to_gitlab_registry(self, tag: str) -> None:
+        """Register the version of tag in the composer registry of the package's
+        GitLab project, which the group's registry then serves."""
+        import re
+        import urllib.request
+        from urllib.parse import quote, urlencode
+
+        from wexample_helpers_git.helper.git import git_get_remote_url
+
+        api_url = self.get_gitlab_registry_url().split("/group/", 1)[0]
+        # The project is the package's origin: ssh://git@host:port/<group>/<name>.git
+        project_path = re.sub(
+            r"^(ssh://[^/]+/|git@[^:]+:|https?://[^/]+/)",
+            "",
+            git_get_remote_url(cwd=self.get_path()),
+        ).removesuffix(".git")
+        request = urllib.request.Request(
+            f"{api_url}/projects/{quote(project_path, safe='')}/packages/composer",
+            data=urlencode({"tag": tag}).encode(),
+            headers={
+                "PRIVATE-TOKEN": self.get_env_parameter_or_suite_fallback(
+                    "GITLAB_API_TOKEN"
+                )
+            },
+            method="POST",
+        )
+        with urllib.request.urlopen(request, timeout=30):
+            pass
+        self.log(f"{self.get_package_name()} {tag} registered on the GitLab registry.")
+
     def _test_run_without_container(self) -> None:
         """In the php image of the runners, the dependencies included.
 
@@ -320,21 +367,33 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
             PackagistRegistryGateway,
         )
 
-        if not self.is_published_publicly():
-            return
-
         package = self.get_package_name()
         version = self.get_setup_version()
-        gateway = PackagistRegistryGateway(
-            base_url="https://repo.packagist.org",
-            io=self.io,
-            timeout=10,
-        )
 
-        max_attempts = 40
-        delay_seconds = 30
+        # The GitLab registry, when the suite publishes there, serves a version
+        # as soon as it is registered; Packagist, behind the mirror and its
+        # webhook, takes minutes, and nobody waits for it any more.
+        group_url = self.get_gitlab_registry_url()
+        if group_url:
+            gateway = PackagistRegistryGateway(
+                base_url=group_url.removesuffix("/packages.json"),
+                io=self.io,
+                timeout=10,
+            )
+            registry, delay_seconds = "the GitLab registry", 5
+        elif self.is_published_publicly():
+            gateway = PackagistRegistryGateway(
+                base_url="https://repo.packagist.org",
+                io=self.io,
+                timeout=10,
+            )
+            registry, delay_seconds = "Packagist", 30
+        else:
+            return
+
+        max_attempts = 20 * 60 // delay_seconds
 
-        self.log(f"Waiting for {package} {version} to appear on Packagist…")
+        self.log(f"Waiting for {package} {version} to appear on {registry}…")
 
         def on_retry(attempt, max_a, delay, _exc, _msg) -> None:
             self.log(
@@ -347,7 +406,7 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
             delay_seconds_callback=lambda _attempt: delay_seconds,
             on_retry_callback=on_retry,
             timeout_message=(
-                f"Timed out waiting for {package} {version} on Packagist after "
+                f"Timed out waiting for {package} {version} on {registry} after "
                 f"{max_attempts * delay_seconds // 60} minutes."
             ),
         ).run()