openbase-coder 0.1.3__tar.gz → 0.1.4__tar.gz

{openbase_coder-0.1.3 → openbase_coder-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openbase-coder
-Version: 0.1.3
+Version: 0.1.4
 Summary: OpenBase Coder CLI with embedded server
 Project-URL: Repository, https://github.com/openbase-community/openbase-coder
 Project-URL: Issues, https://github.com/openbase-community/openbase-coder/issues

{openbase_coder-0.1.3 → openbase_coder-0.1.4}/openbase_coder_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.3'
-__version_tuple__ = version_tuple = (0, 1, 3)
+__version__ = version = '0.1.4'
+__version_tuple__ = version_tuple = (0, 1, 4)
 
 __commit_id__ = commit_id = None

{openbase_coder-0.1.3 → openbase_coder-0.1.4}/openbase_coder_cli/cli/node.py

@@ -24,6 +24,7 @@ def run_workspace_package_command(workspace_dir: Path, package_dir: Path, *args:
     subprocess.run(
         [executable, *command_prefix, *command_args],
         cwd=str(package_dir),
+        env=_package_manager_env(executable, command_args),
         check=True,
     )
     return True
@@ -93,12 +94,22 @@ def _normalize_package_manager_args(
     workspace_dir: Path,
     args: tuple[str, ...],
 ) -> tuple[str, ...]:
-    """Keep managed workspace installs reproducible when using pnpm."""
+    """Avoid mutating or validating partial install-set lockfiles with pnpm."""
     if (
         Path(executable).name == "pnpm"
         and args == ("install",)
         and (workspace_dir / "pnpm-lock.yaml").is_file()
     ):
-        return ("install", "--frozen-lockfile")
+        return ("install", "--no-lockfile", "--shamefully-hoist")
 
     return args
+
+
+def _package_manager_env(
+    executable: str,
+    args: tuple[str, ...],
+) -> dict[str, str] | None:
+    if Path(executable).name == "pnpm" and args and args[0] == "install":
+        return {**os.environ, "CI": "true"}
+
+    return None

{openbase_coder-0.1.3 → openbase_coder-0.1.4}/openbase_coder_cli/cli/setup.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 import platform
 import secrets
 import shlex
@@ -142,7 +143,9 @@ def _clone_workspace(workspace_dir: str) -> None:
     if ws.exists() and (ws / ".git").is_dir():
         click.echo(f"Workspace already exists at {ws}, pulling latest...")
         _update_existing_workspace(ws)
+        _remove_managed_repo_symlinks(ws)
         _multi_sync(ws)
+        _update_install_set_repos(ws)
         return
 
     click.echo(f"Cloning workspace to {ws}...")
@@ -151,6 +154,7 @@ def _clone_workspace(workspace_dir: str) -> None:
         check=True,
     )
     _multi_sync(ws)
+    _update_install_set_repos(ws)
 
 
 def _update_existing_workspace(ws: Path) -> None:
@@ -176,6 +180,57 @@ def _update_existing_workspace(ws: Path) -> None:
     subprocess.run(["git", "-C", str(ws), "pull", "--ff-only"], check=True)
 
 
+def _remove_managed_repo_symlinks(ws: Path) -> None:
+    if ws.resolve() != DEFAULT_WORKSPACE_DIR.resolve():
+        return
+
+    for repo_name in _install_set_repo_names(ws):
+        repo_path = ws / repo_name
+        if repo_path.is_symlink():
+            click.echo(f"Removing symlinked install repo at {repo_path}")
+            repo_path.unlink()
+
+
+def _update_install_set_repos(ws: Path) -> None:
+    for repo_name in _install_set_repo_names(ws):
+        repo_path = ws / repo_name
+        if not (repo_path / ".git").exists():
+            continue
+
+        if ws.resolve() == DEFAULT_WORKSPACE_DIR.resolve():
+            click.echo(f"Updating managed install repo {repo_name}...")
+            subprocess.run(
+                ["git", "-C", str(repo_path), "fetch", "origin", "main"],
+                check=True,
+            )
+            subprocess.run(
+                ["git", "-C", str(repo_path), "reset", "--hard", "origin/main"],
+                check=True,
+            )
+        else:
+            subprocess.run(["git", "-C", str(repo_path), "pull", "--ff-only"], check=True)
+
+
+def _install_set_repo_names(ws: Path) -> list[str]:
+    multi_json_path = ws / "multi.json"
+    if not multi_json_path.is_file():
+        return []
+
+    try:
+        multi_json = json.loads(multi_json_path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return []
+
+    names = []
+    for repo in multi_json.get("repos", []):
+        install_sets = repo.get("installSets")
+        if install_sets is not None and WORKSPACE_INSTALL_SET not in install_sets:
+            continue
+        if name := repo.get("name"):
+            names.append(name)
+    return names
+
+
 def _multi_sync(ws_path: Path) -> None:
     click.echo(f"Running multi sync --install-set {WORKSPACE_INSTALL_SET}...")
     sync_workspace(ws_path, install_set=WORKSPACE_INSTALL_SET)