djaploy 1.2.1__tar.gz → 1.2.3__tar.gz

{djaploy-1.2.1 → djaploy-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.2.1
+Version: 1.2.3
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.2.1 → djaploy-1.2.3}/djaploy/builtin_hooks.py

@@ -103,6 +103,19 @@ def _deploy_calculate_release_info(context):
     if release_info:
         context["pyinfra_data"]["version"] = release_info["new_version"]
         context["pyinfra_data"]["commit"] = release_info["commit"]
+    elif "commit" not in context["pyinfra_data"]:
+        # Always pass commit hash even without versioning configured
+        try:
+            import subprocess
+            from django.conf import settings
+            commit = subprocess.check_output(
+                ["git", "rev-parse", "--short", "HEAD"],
+                cwd=str(settings.GIT_DIR),
+                text=True,
+            ).strip()
+            context["pyinfra_data"]["commit"] = commit
+        except Exception:
+            pass
 
 
 # ── deploy:postcommand ───────────────────────────────────────────────

{djaploy-1.2.1 → djaploy-1.2.3}/djaploy/commands/deploy.py

@@ -34,7 +34,9 @@ for phase in ("deploy:upload", "deploy:configure", "deploy:pre", "deploy:start")
 _activate_val = getattr(host.data, "activate", None)
 if _activate_val in (True, "true", "True"):
     for phase in ("activate:pre", "activate", "activate:post"):
-        for hook in registry.get_remote_hooks(phase):
+        _hooks = registry.get_remote_hooks(phase)
+        print(f"[activate] phase={phase} hooks={[h.function.__name__ for h in _hooks]}")
+        for hook in _hooks:
             _deploy_decorator(hook.function.__name__)(hook.function)(
                 host.data
             )

djaploy-1.2.3/djaploy/commands/status.py

@@ -0,0 +1,88 @@
+"""
+Pyinfra command: show blue-green deployment status.
+
+Reads and displays the blue-green state from each host.
+
+Usage (via djaploy management command):
+    manage.py djaploy status --env production
+"""
+
+from pyinfra import host
+from pyinfra.api import deploy as _deploy_decorator
+from pyinfra.operations import python as python_op
+
+from djaploy.hooks import discover_hooks, get_registry
+from djaploy.infra.utils import is_bluegreen, get_app_path, get_slot_socket_path
+from djaploy.infra.djaploy_hooks import _read_slot_info_from_remote
+
+discover_hooks()
+registry = get_registry()
+
+if is_bluegreen(host.data):
+    app_name = getattr(host.data, 'app_name', 'unknown')
+    app_path = get_app_path(host.data)
+    state_file = f"{app_path}/state.json"
+
+    def _show_status(app_n, state_f):
+        blue_info = _read_slot_info_from_remote(host, "blue", state_f)
+        green_info = _read_slot_info_from_remote(host, "green", state_f)
+
+        # Read active slot
+        import json
+        result = host.run_shell_command(command=f"cat {state_f}")
+        active = "none"
+        if result[0] and len(result) > 1:
+            try:
+                lines = [l.line if hasattr(l, 'line') else str(l) for l in result[1]]
+                state_data = json.loads("\n".join(lines))
+                active = state_data.get("active_slot") or "none"
+            except (json.JSONDecodeError, KeyError):
+                pass
+
+        print(f"\nBlue-Green Status for {app_n}")
+        print("=" * 40)
+        print(f"Active slot: {active}\n")
+
+        for slot, info in [("blue", blue_info), ("green", green_info)]:
+            tag = "ACTIVE" if active == slot else "inactive"
+            print(f"{slot.upper()} ({tag}):")
+            if info:
+                print(f"  Release:     {info.get('release', 'unknown')}")
+                print(f"  Commit:      {info.get('commit', 'unknown')}")
+                print(f"  Deployed at: {info.get('deployed_at', 'unknown')}")
+                print(f"  Python:      {info.get('python_interpreter', 'unknown')}")
+                print(f"  Venv:        {info.get('venv_path', 'unknown')}")
+                print(f"  Socket:      {get_slot_socket_path(app_n, slot)}")
+            else:
+                print("  (empty)")
+            print()
+
+        # Show service status
+        for slot in ("blue", "green"):
+            svc = f"{app_n}-{slot}.service"
+            res = host.run_shell_command(command=f"systemctl is-active {svc} 2>/dev/null || echo inactive")
+            status_str = "unknown"
+            if res[0] and len(res) > 1:
+                try:
+                    status_str = (list(res[1])[0].line if hasattr(list(res[1])[0], 'line') else str(list(res[1])[0])).strip()
+                except (IndexError, AttributeError):
+                    pass
+            print(f"Service {svc}: {status_str}")
+        print()
+
+    python_op.call(
+        name="Show blue-green status",
+        function=_show_status,
+        app_n=app_name,
+        state_f=state_file,
+    )
+else:
+    def _show_non_bluegreen():
+        strategy = getattr(host.data, "deployment_strategy", "zero_downtime")
+        print(f"\nDeployment strategy: {strategy}")
+        print("Not a blue-green deployment. Use deploy/rollback commands.\n")
+
+    python_op.call(
+        name="Show deployment status",
+        function=_show_non_bluegreen,
+    )

{djaploy-1.2.1 → djaploy-1.2.3}/djaploy/infra/djaploy_hooks.py

@@ -854,6 +854,9 @@ def activate_bluegreen(host_data):
         )
         return
 
+    # Store on host.data so activate:post hooks can read it
+    host.data._bluegreen_activated_slot = target_slot
+
     # Update nginx upstream config to point to target slot
     from io import StringIO
     from djaploy.infra.templates import NGINX_UPSTREAM_BLUEGREEN, build_template_context

{djaploy-1.2.1 → djaploy-1.2.3}/djaploy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.2.1
+Version: 1.2.3
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.2.1 → djaploy-1.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "djaploy"
-version = "1.2.1"
+version = "1.2.3"
 description = "Modular Django deployment system based on pyinfra"
 authors = [
     {name = "Johanna Mae Dimayuga", email = "johanna@techco.fi"}

djaploy-1.2.1/djaploy/commands/status.py

@@ -1,62 +0,0 @@
-"""
-Pyinfra command: show blue-green deployment status.
-
-Reads and displays the blue-green state from each host.
-
-Usage (via djaploy management command):
-    manage.py djaploy status --env production
-"""
-
-from pyinfra import host
-from pyinfra.api import deploy as _deploy_decorator
-from pyinfra.operations import server
-
-from djaploy.hooks import discover_hooks, get_registry
-from djaploy.infra.utils import is_bluegreen, get_app_path, get_slot_socket_path
-from djaploy.infra.bluegreen import print_status_cmd
-
-discover_hooks()
-registry = get_registry()
-
-if is_bluegreen(host.data):
-    app_name = getattr(host.data, 'app_name', 'unknown')
-    app_path = get_app_path(host.data)
-    state_file = f"{app_path}/state.json"
-
-    @_deploy_decorator("show_bluegreen_status")
-    def show_bluegreen_status(host_data):
-        server.shell(
-            name="Show blue-green status",
-            commands=[
-                print_status_cmd(state_file, app_name),
-                f'echo "Sockets:"',
-                f'echo "  Blue:  {get_slot_socket_path(app_name, "blue")}"',
-                f'echo "  Green: {get_slot_socket_path(app_name, "green")}"',
-                f'echo ""',
-                # Show systemd service status
-                f'echo "Services:"',
-                f'systemctl is-active {app_name}-blue.service 2>/dev/null && '
-                f'echo "  {app_name}-blue:  active" || '
-                f'echo "  {app_name}-blue:  inactive"',
-                f'systemctl is-active {app_name}-green.service 2>/dev/null && '
-                f'echo "  {app_name}-green: active" || '
-                f'echo "  {app_name}-green: inactive"',
-                f'echo ""',
-            ],
-            _sudo=True,
-        )
-
-    show_bluegreen_status(host.data)
-else:
-    @_deploy_decorator("show_status")
-    def show_status(host_data):
-        server.shell(
-            name="Show deployment status",
-            commands=[
-                f'echo "Deployment strategy: {getattr(host.data, "deployment_strategy", "zero_downtime")}"',
-                f'echo "Not a blue-green deployment. Use deploy/rollback commands."',
-            ],
-            _sudo=True,
-        )
-
-    show_status(host.data)