devs-common 3.4.1__tar.gz → 4.0.1__tar.gz

{devs_common-3.4.1 → devs_common-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-common
-Version: 3.4.1
+Version: 4.0.1
 Summary: Shared utilities for devs package ecosystem
 Author: Dan Lester
 License-Expression: MIT

{devs_common-3.4.1 → devs_common-4.0.1}/devs_common/templates/devcontainer.json

@@ -99,6 +99,7 @@
   },
   "workspaceFolder": "/workspaces/${localEnv:WORKSPACE_FOLDER_NAME}",
   "postCreateCommand": "/usr/local/bin/post-create-wrapper.sh",
+  "postAttachCommand": "/usr/local/bin/install-bridge-drop.sh",
   "forwardPorts": [],
   "portsAttributes": {
     "3306": {

devs_common-4.0.1/devs_common/templates/extensions/README.md

@@ -0,0 +1,13 @@
+# Bundled VS Code extensions
+
+Built `.vsix` files placed in this directory are mounted into every devcontainer at `/usr/local/devs-extensions/` (read-only) and installed by `setup-workspace.sh` on container creation.
+
+Build artifacts are gitignored. Produce them with:
+
+```bash
+./scripts/build-extension.sh
+```
+
+This compiles `packages/vscode-bridge-drop/` and drops the resulting `devs-bridge-drop.vsix` here. Re-run after editing the extension to pick up changes on the next `devs start`.
+
+`scripts/bump-and-publish.py` runs the build script automatically before producing PyPI wheels, so released `devs-common` wheels always include the current `.vsix`.

devs_common-4.0.1/devs_common/templates/extensions/install.sh

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+# Install every bundled .vsix in this directory.
+# Intended to be invoked from a devcontainer postCreateCommand or postAttachCommand.
+# Self-contained — does not depend on anything outside this directory.
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+shopt -s nullglob
+vsix_files=("$SCRIPT_DIR"/*.vsix)
+shopt -u nullglob
+
+if [ ${#vsix_files[@]} -eq 0 ]; then
+    echo "[devs-extensions] no .vsix files found in $SCRIPT_DIR"
+    exit 0
+fi
+
+install_with_code_cli() {
+    local vsix="$1"
+    code --install-extension "$vsix" --force
+}
+
+install_by_unpacking() {
+    # Fallback when 'code' CLI isn't on PATH yet (e.g. third-party image that
+    # doesn't bake in the CLI, when running before VS Code Server attaches).
+    # VS Code Server scans ~/.vscode-server/extensions/<publisher>.<name>-<version>/
+    local vsix="$1"
+    local home_dir="${HOME:-/root}"
+    local ext_root="$home_dir/.vscode-server/extensions"
+    mkdir -p "$ext_root"
+
+    local tmp
+    tmp="$(mktemp -d)"
+    if ! unzip -q "$vsix" -d "$tmp" 2>/dev/null; then
+        if command -v python3 >/dev/null 2>&1; then
+            python3 -c "import zipfile,sys; zipfile.ZipFile(sys.argv[1]).extractall(sys.argv[2])" "$vsix" "$tmp" || {
+                rm -rf "$tmp"; return 1
+            }
+        else
+            rm -rf "$tmp"
+            return 1
+        fi
+    fi
+
+    # .vsix layout: extension/package.json + extension/...
+    local manifest="$tmp/extension/package.json"
+    if [ ! -f "$manifest" ]; then
+        rm -rf "$tmp"
+        return 1
+    fi
+
+    local publisher name version
+    publisher=$(python3 -c "import json,sys; print(json.load(open(sys.argv[1]))['publisher'])" "$manifest")
+    name=$(python3 -c "import json,sys; print(json.load(open(sys.argv[1]))['name'])" "$manifest")
+    version=$(python3 -c "import json,sys; print(json.load(open(sys.argv[1]))['version'])" "$manifest")
+
+    local target="$ext_root/${publisher}.${name}-${version}"
+    rm -rf "$target"
+    mv "$tmp/extension" "$target"
+    rm -rf "$tmp"
+    echo "[devs-extensions] unpacked into $target"
+}
+
+for vsix in "${vsix_files[@]}"; do
+    name="$(basename "$vsix")"
+    echo "[devs-extensions] installing $name"
+    if command -v code >/dev/null 2>&1; then
+        if install_with_code_cli "$vsix"; then
+            continue
+        fi
+        echo "[devs-extensions] 'code --install-extension' failed for $name; trying fallback unpack"
+    fi
+    if install_by_unpacking "$vsix"; then
+        echo "[devs-extensions] installed $name via unpack fallback"
+    else
+        echo "[devs-extensions] ⚠️  failed to install $name (continuing)"
+    fi
+done
+exit 0

devs_common-4.0.1/devs_common/templates/scripts/install-bridge-drop.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# Fetch the latest devs-bridge-drop.vsix from GitHub Releases and install it.
+# Intended to be invoked from devcontainer postAttachCommand — by that point
+# VS Code Server is up and 'code' resolves to the Server-aware shim that
+# installs into ~/.vscode-server/extensions/.
+set -uo pipefail
+
+echo "Installing devs-bridge-drop extension..."
+
+if ! command -v code >/dev/null 2>&1; then
+    echo "⚠️  Skipping devs-bridge-drop install: 'code' CLI not on PATH"
+    exit 0
+fi
+
+tmp_vsix="/tmp/devs-bridge-drop.vsix"
+vsix_url="https://github.com/ideonate/devs/releases/latest/download/devs-bridge-drop.vsix"
+
+if ! curl -fsSL "$vsix_url" -o "$tmp_vsix"; then
+    echo "⚠️  Could not download $vsix_url (continuing)"
+    exit 0
+fi
+
+if code --install-extension "$tmp_vsix" --force; then
+    echo "✓ Installed devs-bridge-drop"
+else
+    echo "⚠️  'code --install-extension' failed for devs-bridge-drop (continuing)"
+fi
+
+rm -f "$tmp_vsix"
+exit 0

{devs_common-3.4.1 → devs_common-4.0.1}/devs_common/templates/scripts/setup-workspace.sh

@@ -280,6 +280,11 @@ else
     echo "No package.json found in root directory"
 fi
 
+# Note: devs-bridge-drop is installed by postAttachCommand (install-bridge-drop.sh)
+# rather than here, because the 'code' CLI baked into /usr/local/bin (used for
+# tunnels) doesn't write to the same extensions dir VS Code Server reads from.
+# By postAttachCommand time, VS Code Server's own 'code' shim is on PATH.
+
 echo "Workspace setup complete!"
 echo ""
 echo "Discovered environments:"

{devs_common-3.4.1 → devs_common-4.0.1}/devs_common/utils/devcontainer.py

@@ -77,7 +77,7 @@ def prepare_devcontainer_environment(
     bridge_mount_path = Path.home() / '.devs' / 'bridge' / f"{project_name}-{dev_name}"
     bridge_mount_path.mkdir(parents=True, exist_ok=True)
     env['DEVS_BRIDGE_MOUNT_PATH'] = str(bridge_mount_path)
-    
+
     # Pass debug mode to container scripts
     if debug:
         env['DEVS_DEBUG'] = 'true'

{devs_common-3.4.1 → devs_common-4.0.1}/devs_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-common
-Version: 3.4.1
+Version: 4.0.1
 Summary: Shared utilities for devs package ecosystem
 Author: Dan Lester
 License-Expression: MIT

{devs_common-3.4.1 → devs_common-4.0.1}/devs_common.egg-info/SOURCES.txt

@@ -17,7 +17,11 @@ devs_common/core/workspace.py
 devs_common/templates/Dockerfile
 devs_common/templates/devcontainer.json
 devs_common/templates/vscode-settings-reference.md
+devs_common/templates/extensions/README.md
+devs_common/templates/extensions/devs-bridge-drop.vsix
+devs_common/templates/extensions/install.sh
 devs_common/templates/scripts/copy-ssh.sh
+devs_common/templates/scripts/install-bridge-drop.sh
 devs_common/templates/scripts/post-create-wrapper.sh
 devs_common/templates/scripts/python-venv-integration.sh
 devs_common/templates/scripts/screenshot-webapp.sh

{devs_common-3.4.1 → devs_common-4.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devs-common"
-version = "3.4.1"
+version = "4.0.1"
 description = "Shared utilities for devs package ecosystem"
 authors = [
     {name = "Dan Lester"},