fastws-cli 0.0.17__tar.gz → 0.0.19__tar.gz

{fastws_cli-0.0.17 → fastws_cli-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.17
+Version: 0.0.19
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License: Apache-2.0
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.2.29
+Requires-Dist: fastcore>=2.2.28
 Requires-Dist: fastgit>=0.1.2
 Requires-Dist: ghapi>=2.0.6
 Requires-Dist: packaging
@@ -208,7 +208,7 @@ By default, `ws-sync` uses the active venv's parent as the workspace root. It cr
 
 Project scanning respects `tool.uv.workspace.members` and `exclude`. If a member directory lacks `pyproject.toml`, such as a fresh empty clone, sync warns and skips the `uv sync` step.
 
-Fastws maintains `tool.uv.workspace.exclude`. It excludes unlisted top-level directories without a valid Python project. It also excludes listed Rust or JavaScript projects without `pyproject.toml`. For a listed checkout with none of `pyproject.toml`, `Cargo.toml`, or `package.json`, sync warns and skips installation.
+Fastws maintains `tool.uv.workspace.exclude`. It excludes unlisted top-level directories without a valid Python project. It also excludes listed Rust or JavaScript projects without `pyproject.toml`. It also excludes listed project templates, whose `[project].name` still holds a `{placeholder}`, because uv cannot parse that name. For a listed checkout with none of `pyproject.toml`, `Cargo.toml`, or `package.json`, sync warns and skips installation.
 
 Existing globs, entries for missing directories, and entries for checkouts that are still not Python projects are retained. Use `exclude = [...]` under `[tool.fastws]` to specify exclusions the scan cannot infer, such as keeping a valid project out of the workspace. Adding members preserves hand-written `[tool.uv.sources]` entries, including path and Git sources.
 
@@ -216,7 +216,7 @@ Each sync regenerates Cargo overrides in the workspace's `.cargo/config.toml`. `
 
 Do not commit a `Cargo.lock` generated under these patches. Its source-less local entries cannot be resolved on another machine.
 
-When `sccache` is installed, sync also configures it as Cargo's `rustc-wrapper`, allowing unchanged compilation units to be reused across the workspace's otherwise-independent Cargo target directories. An existing wrapper is always preserved.
+When `sccache` is installed, sync also configures it as Cargo's `rustc-wrapper`, allowing unchanged compilation units to be reused across the workspace's otherwise-independent Cargo target directories. An existing wrapper is always preserved. If neither a wrapper nor `sccache` is present, sync warns with the install command (`cargo install sccache --locked`) and continues; rerun `ws-sync` after installing to enable it.
 
 Fastws discovers JavaScript packages directly under the workspace root. It reads each package's `workspaces` list for declared nested packages. These lists accept paths and globs. Fastws ignores undeclared nested packages. Lockfiles do not affect discovery. `[tool.fastws].exclude` matches paths relative to the workspace root. Fastws skips `node_modules` and directories whose names start with `.` or `_`.
 

{fastws_cli-0.0.17 → fastws_cli-0.0.19}/README.md

@@ -183,7 +183,7 @@ By default, `ws-sync` uses the active venv's parent as the workspace root. It cr
 
 Project scanning respects `tool.uv.workspace.members` and `exclude`. If a member directory lacks `pyproject.toml`, such as a fresh empty clone, sync warns and skips the `uv sync` step.
 
-Fastws maintains `tool.uv.workspace.exclude`. It excludes unlisted top-level directories without a valid Python project. It also excludes listed Rust or JavaScript projects without `pyproject.toml`. For a listed checkout with none of `pyproject.toml`, `Cargo.toml`, or `package.json`, sync warns and skips installation.
+Fastws maintains `tool.uv.workspace.exclude`. It excludes unlisted top-level directories without a valid Python project. It also excludes listed Rust or JavaScript projects without `pyproject.toml`. It also excludes listed project templates, whose `[project].name` still holds a `{placeholder}`, because uv cannot parse that name. For a listed checkout with none of `pyproject.toml`, `Cargo.toml`, or `package.json`, sync warns and skips installation.
 
 Existing globs, entries for missing directories, and entries for checkouts that are still not Python projects are retained. Use `exclude = [...]` under `[tool.fastws]` to specify exclusions the scan cannot infer, such as keeping a valid project out of the workspace. Adding members preserves hand-written `[tool.uv.sources]` entries, including path and Git sources.
 
@@ -191,7 +191,7 @@ Each sync regenerates Cargo overrides in the workspace's `.cargo/config.toml`. `
 
 Do not commit a `Cargo.lock` generated under these patches. Its source-less local entries cannot be resolved on another machine.
 
-When `sccache` is installed, sync also configures it as Cargo's `rustc-wrapper`, allowing unchanged compilation units to be reused across the workspace's otherwise-independent Cargo target directories. An existing wrapper is always preserved.
+When `sccache` is installed, sync also configures it as Cargo's `rustc-wrapper`, allowing unchanged compilation units to be reused across the workspace's otherwise-independent Cargo target directories. An existing wrapper is always preserved. If neither a wrapper nor `sccache` is present, sync warns with the install command (`cargo install sccache --locked`) and continues; rerun `ws-sync` after installing to enable it.
 
 Fastws discovers JavaScript packages directly under the workspace root. It reads each package's `workspaces` list for declared nested packages. These lists accept paths and globs. Fastws ignores undeclared nested packages. Lockfiles do not affect discovery. `[tool.fastws].exclude` matches paths relative to the workspace root. Fastws skips `node_modules` and directories whose names start with `.` or `_`.
 

{fastws_cli-0.0.17 → fastws_cli-0.0.19}/fastws/__init__.py

@@ -1,4 +1,6 @@
-__version__ = "0.0.17"
+__version__ = "0.0.19"
+
+
 
 
 

{fastws_cli-0.0.17 → fastws_cli-0.0.19}/fastws/core.py

@@ -176,13 +176,21 @@ def _remove_from_pyproject(pyproject_path: Path, names: list[str]) -> list[str]:
     pyproject_path.write_text(content)
     return removed
 
-def _read_pyproject_name(path: Path) -> str|None:
+def _pyproject_name(path: Path) -> str|None:
+    "`[project].name` as written, with any `{placeholder}` slots left in"
     try: data = tomllib.loads(path.read_text())
     except tomllib.TOMLDecodeError:
         print(f"Skipping invalid TOML: {path}")
         return None
     name = data.get("project", {}).get("name")
-    return name if isinstance(name, str) and name and "{" not in name and "}" not in name else None
+    return name if isinstance(name, str) and name else None
+
+def _is_placeholder(name: str|None) -> bool: return bool(name) and ("{" in name or "}" in name)
+
+def _read_pyproject_name(path: Path) -> str|None:
+    "`[project].name`, or None when it is missing or still a template placeholder"
+    name = _pyproject_name(path)
+    return None if _is_placeholder(name) else name
 
 def _ws_projects(root: Path) -> list[str]:
     return [name for d in (o for o in _ws_dirs(root) if (o/"pyproject.toml").exists())
@@ -208,6 +216,10 @@ def _non_python_project(d: Path) -> bool:
     "A Rust or JS project without a Python layer is not a pending Python scaffold."
     return not (d/"pyproject.toml").exists() and any((d/f).exists() for f in ("Cargo.toml", "package.json"))
 
+def _template_dir(d: Path) -> bool:
+    "A project template. Its `[project].name` still holds `{placeholder}` slots, so uv cannot parse it."
+    return (d/"pyproject.toml").exists() and _is_placeholder(_pyproject_name(d/"pyproject.toml"))
+
 def _pending_dirs(root: Path) -> list[str]:
     "uv workspace dirs that are not Python projects yet; sync stops rather than let uv fail on them"
     return [d.name for d in _ws_dirs(root) if not (d/"pyproject.toml").exists()]
@@ -218,7 +230,7 @@ def _sync_ws_excludes(pyproject_path: Path, root: Path, tracked: set[str]) -> tu
     Kept as-is: `[tool.fastws].exclude` entries (intent), globs, missing dirs, and tracked dirs
     (repos.txt checkouts) that are still not valid Python projects. Auto-managed: entries for other
     existing dirs are regenerated each sync, excluding dirs without a valid pyproject (tracked dirs
-    only when they are Cargo-only crates or npm-only packages, since a tracked dir with none of those files is a pending member
+    only when they are Cargo-only crates, npm-only packages, or templates with a `{placeholder}` name, since a tracked dir with none of those files is a pending member
     awaiting scaffolding) and un-excluding dirs that gained one; deliberately excluding a real
     project takes a `[tool.fastws]` entry."""
     if not pyproject_path.exists(): return [], []
@@ -231,7 +243,7 @@ def _sync_ws_excludes(pyproject_path: Path, root: Path, tracked: set[str]) -> tu
     kept = [e for e in cur if e in intent or any(c in e for c in "*?[") or not (root/e).is_dir() or (e in tracked and not _valid_project_dir(root/e))]
     kept += [e for e in intent if e not in kept]
     auto = [d.name for d in _project_dirs(root, exclude=kept) if not d.name.startswith(".") and any(_matches_ws(d.name, m) for m in members)
-        and (d.name not in tracked or _non_python_project(d)) and not _valid_project_dir(d)]
+        and (d.name not in tracked or _non_python_project(d) or _template_dir(d)) and not _valid_project_dir(d)]
     survivors = set(kept) | set(auto)
     new = [e for e in cur if e in survivors] + [e for e in kept + auto if e not in cur]
     if new == cur: return [], []
@@ -694,11 +706,14 @@ def _sync_cargo_patches(root: Path) -> tuple[list[str], list[str]]:
 
 def _sync_cargo_wrapper(root: Path) -> bool:
     "Add sccache to the generated Cargo config when installed, without overriding another wrapper"
-    if not (wrapper := shutil.which("sccache")): return False
     config = root/".cargo"/"config.toml"
     content = config.read_text() if config.exists() else ""
     data = tomllib.loads(content) if content else {}
     if data.get("build", {}).get("rustc-wrapper"): return False
+    if not (wrapper := shutil.which("sccache")):
+        print("⚠️  sccache not found; Rust builds won't use compiler caching.\n"
+              "Install it with: cargo install sccache --locked\nThen rerun ws-sync to enable it.")
+        return False
     line = f'rustc-wrapper = {json.dumps(wrapper)}\n'
     if match := re.search(r"(?m)^\[build\][^\n]*\n", content): new = content[:match.end()] + line + content[match.end():]
     else: new = content.rstrip() + ("\n\n" if content.strip() else "") + "[build]\n" + line
@@ -839,7 +854,13 @@ def _npm_install(root: Path):
 def _sync_js(root: Path, members: list[Path]) -> list[Path]:
     "Install the JS workspace, run every native member's build script, and return those members. Cargo handles incremental compilation."
     tool = _fastws_cfg(root).get("js", "npm")
-    if not shutil.which(tool): raise SystemExit(f"{tool} is not installed: install it, or set [tool.fastws].js to a package manager that is")
+    if not shutil.which(tool):
+        msg = f"{tool} is not installed: install it, or set [tool.fastws].js to a package manager that is"
+        if tool == "npm": msg += ("\n\nInstall Node.js and npm using nvm:\n"
+            "curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash\n"
+            "# Restart your terminal, then:\n"
+            "nvm install --lts")
+        raise SystemExit(msg)
     if tool == "npm": _npm_install(root)
     else: subprocess.run([tool, "install"], check=True, cwd=root)
     built = _native_js(members)

{fastws_cli-0.0.17 → fastws_cli-0.0.19}/fastws_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.17
+Version: 0.0.19
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License: Apache-2.0
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.2.29
+Requires-Dist: fastcore>=2.2.28
 Requires-Dist: fastgit>=0.1.2
 Requires-Dist: ghapi>=2.0.6
 Requires-Dist: packaging
@@ -208,7 +208,7 @@ By default, `ws-sync` uses the active venv's parent as the workspace root. It cr
 
 Project scanning respects `tool.uv.workspace.members` and `exclude`. If a member directory lacks `pyproject.toml`, such as a fresh empty clone, sync warns and skips the `uv sync` step.
 
-Fastws maintains `tool.uv.workspace.exclude`. It excludes unlisted top-level directories without a valid Python project. It also excludes listed Rust or JavaScript projects without `pyproject.toml`. For a listed checkout with none of `pyproject.toml`, `Cargo.toml`, or `package.json`, sync warns and skips installation.
+Fastws maintains `tool.uv.workspace.exclude`. It excludes unlisted top-level directories without a valid Python project. It also excludes listed Rust or JavaScript projects without `pyproject.toml`. It also excludes listed project templates, whose `[project].name` still holds a `{placeholder}`, because uv cannot parse that name. For a listed checkout with none of `pyproject.toml`, `Cargo.toml`, or `package.json`, sync warns and skips installation.
 
 Existing globs, entries for missing directories, and entries for checkouts that are still not Python projects are retained. Use `exclude = [...]` under `[tool.fastws]` to specify exclusions the scan cannot infer, such as keeping a valid project out of the workspace. Adding members preserves hand-written `[tool.uv.sources]` entries, including path and Git sources.
 
@@ -216,7 +216,7 @@ Each sync regenerates Cargo overrides in the workspace's `.cargo/config.toml`. `
 
 Do not commit a `Cargo.lock` generated under these patches. Its source-less local entries cannot be resolved on another machine.
 
-When `sccache` is installed, sync also configures it as Cargo's `rustc-wrapper`, allowing unchanged compilation units to be reused across the workspace's otherwise-independent Cargo target directories. An existing wrapper is always preserved.
+When `sccache` is installed, sync also configures it as Cargo's `rustc-wrapper`, allowing unchanged compilation units to be reused across the workspace's otherwise-independent Cargo target directories. An existing wrapper is always preserved. If neither a wrapper nor `sccache` is present, sync warns with the install command (`cargo install sccache --locked`) and continues; rerun `ws-sync` after installing to enable it.
 
 Fastws discovers JavaScript packages directly under the workspace root. It reads each package's `workspaces` list for declared nested packages. These lists accept paths and globs. Fastws ignores undeclared nested packages. Lockfiles do not affect discovery. `[tool.fastws].exclude` matches paths relative to the workspace root. Fastws skips `node_modules` and directories whose names start with `.` or `_`.
 

{fastws_cli-0.0.17 → fastws_cli-0.0.19}/fastws_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=2.2.29
+fastcore>=2.2.28
 fastgit>=0.1.2
 ghapi>=2.0.6
 packaging

{fastws_cli-0.0.17 → fastws_cli-0.0.19}/pyproject.toml

@@ -16,7 +16,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "fastcore>=2.2.29",
+  "fastcore>=2.2.28",
   "fastgit>=0.1.2",
   "ghapi>=2.0.6",
   "packaging",

fastws_cli-0.0.19/tests/test_releases.py

@@ -0,0 +1,28 @@
+from fastcore.basics import AttrDict
+
+import fastws.releases as relmod
+
+
+def _rel(tag): return AttrDict(tag_name=tag)
+
+
+def test_newest_tag_by_version_not_publish_order():
+    assert relmod._newest_tag([_rel("v0.1.17"), _rel("v0.1.18"), _rel("v0.1.9")]) == "v0.1.18"
+    assert relmod._newest_tag([]) is None
+
+
+def test_skip_pats_defaults_and_config(tmp_path):
+    (tmp_path/"pyproject.toml").write_text('[tool.fastws]\nrelease_skip = ["docs only"]\n')
+    pats = relmod._skip_pats("wip", root=tmp_path)
+    hits = lambda m: any(p.match(m) for p in pats)
+    assert all(hits(m) for m in ("bump", "docs only: fix typo", "wip checkpoint"))
+    assert not any(hits(m) for m in ("bumpy road ahead", "fixes #30"))
+
+
+def test_release_report_repr():
+    rep = relmod.ReleaseReport([("mdhtml", ["fixes #30"]), ("solveit", None), ("fastcore", []), ("bad", ValueError("boom"))])
+    txt = repr(rep)
+    assert "mdhtml (1 unreleased):" in txt and "  - fixes #30" in txt
+    assert "no releases: solveit" in txt
+    assert "up to date: fastcore" in txt
+    assert "bad: ERROR boom" in txt

{fastws_cli-0.0.17 → fastws_cli-0.0.19}/tests/test_sync.py

@@ -1,5 +1,4 @@
-import json, os, runpy, shutil, sys, pytest
-from types import SimpleNamespace
+import json, os, pytest
 from fastgit import Git
 import fastws.core as core
 
@@ -25,19 +24,6 @@ def mk_repo(d, origin=None):
     return g
 
 
-@pytest.fixture
-def fake_uv(monkeypatch):
-    "Intercept uv/cargo invocations (external tools stay out of tests); real git passes through"
-    calls, real = [], core.subprocess.run
-    def run(cmd, **kw):
-        if cmd[0] in ('uv', 'cargo'):
-            calls.append(cmd)
-            return SimpleNamespace(returncode=0, stdout='', stderr='')
-        return real(cmd, **kw)
-    monkeypatch.setattr(core.subprocess, 'run', run)
-    return calls
-
-
 def test_repos_file_roundtrip(tmp_path):
     repos_path = tmp_path/'repos.txt'
     repos_path.write_text('# header\nAnswerDotAI/fastws[dev]\njph00/private[docs] ~/private\nfastai/fastai sub/dir\n')
@@ -82,63 +68,6 @@ def test_invalid_repo_extras(entry):
     with pytest.raises(SystemExit, match='Invalid repo entry'): core._parse_repo_line(entry)
 
 
-async def test_sync_updates_baseline_before_cloning_and_keeps_removed_repos(tmp_path, monkeypatch, fake_uv):
-    origins, seed, root = tmp_path/'origins', tmp_path/'seed', tmp_path/'ws'
-    config = tmp_path/'gitconfig'
-    config.write_text(f'[init]\ndefaultBranch = main\n[url "{origins.as_uri()}/"]\ninsteadOf = git@github.com:org/\n')
-    monkeypatch.setenv('GIT_CONFIG_GLOBAL', str(config))
-    monkeypatch.setattr(core, '_parse_github_repo', lambda url: f'org/{core.Path(url).stem}' if str(origins) in url else None)
-    async def offline_heads(refs): raise ValueError('No GitHub API in local Git test')
-    monkeypatch.setattr(core, '_remote_heads', offline_heads)
-    for name in ('old', 'new', 'extra'):
-        d = tmp_path/name
-        d.mkdir()
-        (d/'pyproject.toml').write_text(f'[project]\nname = "{name}-pkg"\n[project.optional-dependencies]\ndev = []\ntest = []\n')
-        mk_repo(d, origin=origins/f'{name}.git')
-    seed.mkdir()
-    (seed/'repos.txt').write_text('org/old[dev]\n')
-    (seed/'.gitignore').write_text('*/\npyproject.toml\nrepos-local.txt\n')
-    (seed/'pyproject.tmpl').write_text('[project]\nname = "workspace"\ndependencies = []\n[tool.uv.workspace]\nmembers = ["./*"]\n')
-    g = mk_repo(seed, origin=origins/'workspace.git')
-    Git(tmp_path, raise_exc=True).clone(str(origins/'workspace.git'), str(root))
-    Git(root, raise_exc=True).clone('git@github.com:org/extra.git', str(root/'extra'))
-    (root/'repos-local.txt').write_text('org/old[test]\n')
-
-    await core.ws_sync(str(root))
-    assert (root/'old'/'pyproject.toml').exists()
-    assert (root/'repos.txt').read_text() == 'org/old[dev]\n'
-    assert (root/'repos-local.txt').read_text() == 'org/old[test]\norg/extra\n'
-    assert set(core.tomllib.loads((root/'pyproject.toml').read_text())['project']['dependencies']) == {'old-pkg[dev,test]', 'extra-pkg'}
-
-    (seed/'repos.txt').write_text('org/new\n')
-    g.commit('-a', m='new shared baseline')
-    g.push()
-    await core.ws_sync(str(root))
-    assert (root/'new'/'pyproject.toml').exists()
-    assert (root/'old'/'pyproject.toml').exists()
-    assert (root/'repos.txt').read_text() == 'org/new\n'
-    assert set(core._load_repos(root/'repos-local.txt')) == {'org/extra', 'org/old'}
-    assert set(core.tomllib.loads((root/'pyproject.toml').read_text())['project']['dependencies']) == {'old-pkg[test]', 'new-pkg', 'extra-pkg'}
-    (root/'repos-local.txt').write_text('org/extra\n')
-    await core.ws_sync(str(root))
-    assert set(core.tomllib.loads((root/'pyproject.toml').read_text())['project']['dependencies']) == {'old-pkg', 'new-pkg', 'extra-pkg'}
-
-    (seed/'repos.txt').write_text('org/missing\n')
-    g.commit('-a', m='unavailable member')
-    g.push()
-    fake_uv.clear()
-    with pytest.raises(SystemExit, match='clone'): await core.ws_sync(str(root))
-    assert not fake_uv
-
-    (root/'repos.txt').write_text('local edits\n')
-    (seed/'repos.txt').write_text('org/new\n')
-    g.commit('-a', m='restore baseline')
-    g.push()
-    with pytest.raises(core.subprocess.CalledProcessError): await core.ws_sync(str(root))
-    assert (root/'repos.txt').read_text() == 'local edits\n'
-    assert not fake_uv
-
-
 def test_ws_pyproject_from_template_adds_projects(tmp_path):
     (tmp_path/'pyproject.tmpl').write_text('[project]\nname = "uvws"\ndependencies = [\n    "ipython>=8.34.0",\n]\n\n[tool.uv.sources]\n\n')
     for name in ('alpha', 'beta'):
@@ -194,19 +123,19 @@ def test_ws_excludes_generates_from_intent_and_auto(tmp_path):
     pyproject.write_text(
         '[project]\nname = "uvws"\n\n[tool.uv.workspace]\nmembers = ["./*"]\n'
         'exclude = ["_*", "tmp", "example", "stale", "pending"]\n\n[tool.fastws]\nexclude = ["wanted-out"]\n')
-    for name in ('junk', 'fresh-clone', 'realpkg', 'tmpl', 'example', 'stale', 'wanted-out', 'pending', 'rustcrate'): (tmp_path/name).mkdir()
+    for name in ('junk', 'fresh-clone', 'realpkg', 'tmpl', 'tracked-tmpl', 'example', 'stale', 'wanted-out', 'pending', 'rustcrate'): (tmp_path/name).mkdir()
     (tmp_path/'realpkg'/'pyproject.toml').write_text('[project]\nname = "realpkg"\n')
-    (tmp_path/'tmpl'/'pyproject.toml').write_text('[project]\nname = "{repo}"\n')
+    for name in ('tmpl', 'tracked-tmpl'): (tmp_path/name/'pyproject.toml').write_text('[project]\nname = "{repo}"\n')
     (tmp_path/'rustcrate'/'Cargo.toml').write_text('[package]\nname = "rustcrate"\n')
     for name in ('example', 'stale', 'wanted-out'): (tmp_path/name/'pyproject.toml').write_text(f'[project]\nname = "{name}"\n')
 
-    tracked = {'fresh-clone', 'example', 'pending', 'rustcrate'}
+    tracked = {'fresh-clone', 'example', 'pending', 'rustcrate', 'tracked-tmpl'}
     added, removed = core._sync_ws_excludes(pyproject, tmp_path, tracked)
     data = core.tomllib.loads(pyproject.read_text())
 
-    # kept: glob, missing dir, tracked non-project; auto: junk, placeholder tmpl, tracked Cargo-only crate; intent: wanted-out; dropped: valid projects, tracked or not
-    assert set(data['tool']['uv']['workspace']['exclude']) == {'_*', 'tmp', 'pending', 'wanted-out', 'junk', 'tmpl', 'rustcrate'}
-    assert set(added) == {'wanted-out', 'junk', 'tmpl', 'rustcrate'}
+    # kept: glob, missing dir, tracked non-project; auto: junk, placeholder templates tracked or not, tracked Cargo-only crate; intent: wanted-out; dropped: valid projects, tracked or not
+    assert set(data['tool']['uv']['workspace']['exclude']) == {'_*', 'tmp', 'pending', 'wanted-out', 'junk', 'tmpl', 'tracked-tmpl', 'rustcrate'}
+    assert set(added) == {'wanted-out', 'junk', 'tmpl', 'tracked-tmpl', 'rustcrate'}
     assert set(removed) == {'example', 'stale'}
     assert data['tool']['fastws']['exclude'] == ['wanted-out']  # fastws table untouched
 
@@ -298,7 +227,7 @@ async def test_git_repo_resolution(tmp_path):
     assert sorted(await core._discover_ws_repos(tmp_path)) == ['AnswerDotAI/Proj', 'AnswerDotAI/crate']
 
 
-def test_ws_remove_workflow(tmp_path, monkeypatch, fake_uv):
+def test_ws_remove_refuses_unsafe_repos(tmp_path):
     (tmp_path/'repos.txt').write_text('AnswerDotAI/keep\n')
     local = tmp_path/'repos-local.txt'
     local.write_text('AnswerDotAI/repo1\nAnswerDotAI/repo2\norg/external ../external\n')
@@ -308,43 +237,17 @@ def test_ws_remove_workflow(tmp_path, monkeypatch, fake_uv):
         d.mkdir()
         (d/'pyproject.toml').write_text(f'[project]\nname = "{d.name}pkg"\n')
         g = mk_repo(d, origin=tmp_path/'origins'/d.name)
-    answer = ['n', 'y', 'y']
-    monkeypatch.setattr('builtins.input', lambda *a: answer.pop(0))
-
     with pytest.raises(SystemExit, match='baseline'): core.ws_remove('repo1', 'AnswerDotAI/keep', workspace=str(tmp_path))
     with pytest.raises(SystemExit, match='location'): core.ws_remove('repo1', 'org/external', workspace=str(tmp_path))
-    assert 'org/external ../external' in local.read_text()
-    assert (tmp_path/'repos.txt').read_text() == 'AnswerDotAI/keep\n'
-    assert not fake_uv
 
-    # a dirty tree refuses before any mutation
     (repo2/'pyproject.toml').write_text('[project]\nname = "repo2pkg"\nversion = "1"\n')
-    with pytest.raises(SystemExit): core.ws_remove('AnswerDotAI/repo1', 'repo2', workspace=str(tmp_path))
-    assert repo.exists() and repo2.exists() and 'repo1' in local.read_text() and 'repo2' in local.read_text()
-    assert (tmp_path/'pyproject.toml').read_text() == WS_META
-
-    # so does an unpushed commit on a clean tree
+    with pytest.raises(SystemExit, match='uncommitted'): core.ws_remove('repo1', 'repo2', workspace=str(tmp_path))
     g.commit('-a', m='ahead')
-    with pytest.raises(SystemExit): core.ws_remove('AnswerDotAI/repo1', 'repo2', workspace=str(tmp_path))
+    with pytest.raises(SystemExit, match='unpushed'): core.ws_remove('repo1', 'repo2', workspace=str(tmp_path))
     assert repo.exists() and repo2.exists()
-
-    # Each checkout has its own prompt; duplicate targets are removed once, with one sync for the batch.
-    g.push()
-    monkeypatch.setattr(sys, 'argv', ['ws-remove', 'AnswerDotAI/repo1', 'repo2', 'repo1', '--workspace', str(tmp_path)])
-    with pytest.raises(SystemExit) as exc: runpy.run_path(shutil.which('ws-remove'), run_name='__main__')
-    assert exc.value.code in (None, 0)
-    assert repo.exists() and not repo2.exists()
-    assert 'repo1' not in local.read_text() and 'repo2' not in local.read_text()
-    assert 'repo1pkg' not in (content := (tmp_path/'pyproject.toml').read_text()) and 'repo2pkg' not in content
-    assert 'keeppkg' in content and fake_uv == [['uv', 'sync']]
-
-    # answering 'y' (by folder name this time) also deletes the checkout
-    local.write_text('AnswerDotAI/repo1\n')
-    (tmp_path/'pyproject.toml').write_text(WS_META)
-    core.ws_remove('repo1', workspace=str(tmp_path))
-    assert not repo.exists()
+    assert local.read_text() == 'AnswerDotAI/repo1\nAnswerDotAI/repo2\norg/external ../external\n'
+    assert (tmp_path/'pyproject.toml').read_text() == WS_META
     assert (tmp_path/'repos.txt').read_text() == 'AnswerDotAI/keep\n'
-    assert not answer
 
 
 def test_upgrade_stamp(tmp_path):
@@ -413,31 +316,6 @@ def test_cargo_key_ignores_unused_patch_order(tmp_path):
     assert key.read_text() != first
 
 
-async def test_changed_dirs_pulls_only_moved_repos(tmp_path, monkeypatch):
-    # ahead: a second clone pushes to the shared bare origin, so `ahead`'s origin/main falls behind
-    ahead, current, weird = tmp_path/'ahead', tmp_path/'current', tmp_path/'weird'
-    for d in (ahead, current):
-        d.mkdir()
-        g = mk_repo(d, origin=tmp_path/'origins'/d.name)
-        g.remote('set-url', '--push', 'origin', str(tmp_path/'origins'/d.name))
-    other = tmp_path/'other'
-    Git(tmp_path, raise_exc=True).clone(str(tmp_path/'origins'/'ahead'), str(other))
-    og = Git(other, raise_exc=True)
-    (other/'g.txt').write_text('new')
-    og.add('.')
-    og.commit(m='advance')
-    og.push()
-    weird.mkdir()
-    mk_repo(weird)  # no origin remote: can't be checked, so it must be pulled
-
-    async def fake_heads(refs): return [str(Git(tmp_path/'origins'/spec.split('/')[1], raise_exc=True).rev_parse(branch)) for spec, branch in refs]
-    monkeypatch.setattr(core, '_remote_heads', fake_heads)
-    monkeypatch.setattr(core, '_parse_github_repo', lambda url: f'o/{core.Path(url).name}' if 'origins' in url else None)
-
-    changed = await core._changed_dirs([ahead, current, weird])
-    assert set(changed) == {ahead, weird}
-
-
 def test_sync_cargo_patches_generates_and_preserves(tmp_path):
     (tmp_path/'.cargo').mkdir()
     config = tmp_path/'.cargo'/'config.toml'
@@ -478,25 +356,9 @@ def test_sync_cargo_patches_generates_and_preserves(tmp_path):
     assert core.tomllib.loads((bare/'.cargo'/'config.toml').read_text())['patch']['crates-io']['c']['path'] == str(bare/'c')
 
 
-def test_sync_cargo_wrapper(tmp_path, monkeypatch):
+def test_sync_cargo_wrapper_preserves_existing(tmp_path):
     config = tmp_path/'.cargo'/'config.toml'
     config.parent.mkdir()
-    config.write_text('[term]\nquiet = true\n')
-    monkeypatch.setattr(core.shutil, 'which', lambda name: '/opt/homebrew/bin/sccache')
-
-    assert core._sync_cargo_wrapper(tmp_path)
-    data = core.tomllib.loads(config.read_text())
-    assert data['build']['rustc-wrapper'] == '/opt/homebrew/bin/sccache'
-    assert data['term']['quiet'] is True
-    assert not core._sync_cargo_wrapper(tmp_path)
-
-    (tmp_path/'crate').mkdir()
-    (tmp_path/'crate'/'Cargo.toml').write_text('[package]\nname = "crate"\n')
-    core._sync_cargo_patches(tmp_path)
-    content = config.read_text()
-    assert not core._sync_cargo_wrapper(tmp_path)
-    assert core._sync_cargo_patches(tmp_path) == ([], []) and config.read_text() == content
-
     config.write_text('[build]\nrustc-wrapper = "other-cache"\n')
     assert not core._sync_cargo_wrapper(tmp_path)
     assert core.tomllib.loads(config.read_text())['build']['rustc-wrapper'] == 'other-cache'
@@ -527,54 +389,13 @@ def test_npm_dirs_honours_fastws_exclude(tmp_path):
     assert core._npm_dirs(tmp_path) == [tmp_path/'lib', tmp_path/'py', tmp_path/'py'/'wasm']
 
 
-def test_sync_ws_package_json_generates_and_preserves(tmp_path):
-    pkg = tmp_path/'package.json'
-    pkg.write_text('{\n  "name": "ws",\n  "private": true,\n  "workspaces": ["../outside", "gone", "tools/*"]\n}\n')
-    members = [tmp_path/'app', tmp_path/'crate'/'wasm']
-
-    added, removed = core._sync_ws_package_json(tmp_path, members)
-    data = json.loads(pkg.read_text())
-    # kept: entries outside the root and globs; managed: existing dirs regenerated from discovery
-    assert data['workspaces'] == ['../outside', 'tools/*', 'app', 'crate/wasm']
-    assert data['name'] == 'ws' and data['private'] is True  # other keys untouched
-    assert added == ['app', 'crate/wasm'] and removed == ['gone']
-
-    content = pkg.read_text()
-    assert core._sync_ws_package_json(tmp_path, members) == ([], [])
-    assert pkg.read_text() == content
-
-    # a missing root package.json is created
-    bare = tmp_path/'ws2'
-    bare.mkdir()
-    assert core._sync_ws_package_json(bare, [bare/'a']) == (['a'], [])
-    assert json.loads((bare/'package.json').read_text()) == {'private': True, 'workspaces': ['a']}
-
-
-@pytest.mark.parametrize('workspaces', [{'packages': ['packages/*']}, {}])
-def test_sync_ws_package_json_rejects_object_form(tmp_path, workspaces):
-    pkg = tmp_path/'package.json'
-    content = json.dumps({'private': True, 'workspaces': workspaces}) + '\n'
-    pkg.write_text(content)
-
-    with pytest.raises(SystemExit, match='workspaces.*list') as exc: core._sync_ws_package_json(tmp_path, [tmp_path/'app'])
-    assert str(pkg) in str(exc.value)
-    assert pkg.read_text() == content
-
-
-def test_sync_ws_package_json_merges_shared_settings(tmp_path):
+def test_sync_ws_package_json_preserves_local_and_merges_shared(tmp_path):
     pkg, shared = tmp_path/'package.json', tmp_path/'package.json.shared'
-    pkg.write_text(json.dumps({'name': 'local', 'workspaces': ['app'], 'keywords': ['local'],
-        'allowScripts': {'wasm-pack@0.15.0': False, 'other': False}}))
-    shared.write_text(json.dumps({'keywords': ['shared'], 'allowScripts': {'wasm-pack@0.15.0': True}}))
-    assert core._sync_ws_package_json(tmp_path, [tmp_path/'app']) == ([], [])
-    assert json.loads(pkg.read_text()) == {'name': 'local', 'workspaces': ['app'], 'keywords': ['shared'],
-        'allowScripts': {'wasm-pack@0.15.0': True, 'other': False}}
-    content, mtime = pkg.read_text(), pkg.stat().st_mtime_ns
-    core._sync_ws_package_json(tmp_path, [tmp_path/'app'])
-    assert pkg.stat().st_mtime_ns == mtime
-    shared.write_text('{}')
-    core._sync_ws_package_json(tmp_path, [tmp_path/'app'])
-    assert pkg.read_text() == content
+    pkg.write_text(json.dumps({'name': 'local', 'workspaces': ['../outside', 'gone', 'tools/*'], 'allowScripts': {'other': False}}))
+    shared.write_text('{"allowScripts": {"wasm-pack": true}}')
+    assert core._sync_ws_package_json(tmp_path, [tmp_path/'app']) == (['app'], ['gone'])
+    assert json.loads(pkg.read_text()) == {'name': 'local', 'workspaces': ['../outside', 'tools/*', 'app'],
+        'allowScripts': {'other': False, 'wasm-pack': True}}
 
 
 def test_ws_excludes_treat_npm_only_dirs_like_cargo_only(tmp_path):
@@ -588,44 +409,7 @@ def test_ws_excludes_treat_npm_only_dirs_like_cargo_only(tmp_path):
     assert core._pending_dirs(tmp_path) == ['pending']
 
 
-def test_native_js_requires_rust_and_build_script(tmp_path):
-    app, crate, wasm = [tmp_path/n for n in ('app', 'crate', 'wasm')]
-    for d in (app, crate, wasm): d.mkdir()
-    (app/'package.json').write_text('{"scripts": {"build": "vite build"}}')
-    for d in (crate, wasm): (d/'Cargo.toml').write_text('')
-    (crate/'package.json').write_text('{}')
-    (wasm/'package.json').write_text('{"scripts": {"build": "cargo build"}}')
-    assert core._native_js([app, crate, wasm]) == [wasm]
-
-
-def test_check_rustup_missing(monkeypatch):
-    monkeypatch.setattr(core.shutil, 'which', lambda tool: None)
-    with pytest.raises(SystemExit, match='Install it from https://rustup.rs'): core._check_rustup()
-
-
-@pytest.mark.parametrize('shadowed', [None, 'rustc', 'cargo'])
-def test_check_rustup_proxies(tmp_path, monkeypatch, shadowed):
-    rustup = tmp_path/'rustup'
-    rustup.touch()
-    (tmp_path/'rustc').symlink_to(rustup)
-    (tmp_path/'cargo').hardlink_to(rustup)
-    other = tmp_path/'brew-rust'
-    other.touch()
-    monkeypatch.setattr(core.shutil, 'which', lambda tool: str(other if tool == shadowed else tmp_path/tool))
-    if shadowed:
-        with pytest.raises(SystemExit, match=f'{shadowed} resolves to') as err: core._check_rustup()
-        assert 'Homebrew Rust can remain installed' in str(err.value)
-        assert 'PATH' in str(err.value)
-    else: core._check_rustup()
-
-
-async def test_sync_checks_rustup_before_installs(tmp_path, monkeypatch, fake_uv):
-    (tmp_path/'repos.txt').write_text('')
-    (tmp_path/'pyproject.toml').write_text('[project]\nname = "ws"\n[tool.uv.workspace]\nmembers = ["*"]\n')
-    wasm = tmp_path/'wasm'
-    wasm.mkdir()
-    (wasm/'Cargo.toml').write_text('[package]\nname = "wasm"\n')
-    (wasm/'package.json').write_text('{"name": "wasm", "scripts": {"build": "wasm-pack build"}}')
-    monkeypatch.setattr(core.shutil, 'which', lambda tool: None)
-    with pytest.raises(SystemExit, match='require rustup'): await core.ws_sync(str(tmp_path))
-    assert not fake_uv
+def test_check_rustup_rejects_shadowed_compiler(tmp_path, monkeypatch):
+    for tool in ('rustup', 'rustc'): (tmp_path/tool).touch(mode=0o755)
+    monkeypatch.setenv('PATH', str(tmp_path))
+    with pytest.raises(SystemExit, match='rustc resolves to'): core._check_rustup()

fastws_cli-0.0.17/tests/test_releases.py

@@ -1,96 +0,0 @@
-import asyncio, pytest
-
-from fastcore.basics import AttrDict
-
-import fastws.releases as relmod
-
-
-def _rel(tag): return AttrDict(tag_name=tag)
-
-
-def test_newest_tag_by_version_not_publish_order():
-    assert relmod._newest_tag([_rel("v0.1.17"), _rel("v0.1.18"), _rel("v0.1.9")]) == "v0.1.18"
-    assert relmod._newest_tag([]) is None
-
-
-def test_skip_pats_defaults_and_config(tmp_path):
-    (tmp_path/"pyproject.toml").write_text('[tool.fastws]\nrelease_skip = ["docs only"]\n', encoding="utf-8")
-    pats = relmod._skip_pats("wip", root=tmp_path)
-    hits = lambda m: any(p.match(m) for p in pats)
-    assert hits("bump") and hits("Bump version to 0.2.2") and hits("update .gitignore")
-    assert hits("docs only: fix typo")  # workspace config
-    assert hits("wip checkpoint")       # per-call extra
-    assert not hits("bumpy road ahead") # bump$ is anchored
-    assert not hits("fixes #30")
-    for m in (".gitignore", "gitignore", "docs", "doc", "clean", "CI", "meta", "ignore", "allowed_metadata_keys"): assert hits(m)
-    for m in ("deps", "CI fixups", "document the API", "cleanup tests"): assert not hits(m)  # deps IS release-worthy; anchored bare words only
-
-
-def test_release_report_repr():
-    rep = relmod.ReleaseReport([("mdhtml", ["fixes #30"]), ("solveit", None), ("fastcore", []), ("bad", ValueError("boom"))])
-    txt = repr(rep)
-    assert "mdhtml (1 unreleased):" in txt and "  - fixes #30" in txt
-    assert "no releases: solveit" in txt
-    assert "up to date: fastcore" in txt
-    assert "bad: ERROR boom" in txt
-
-
-def test_release_exclude(tmp_path, monkeypatch):
-    (tmp_path/"repos.txt").write_text("AnswerDotAI/libx\nAnswerDotAI/appy\n", encoding="utf-8")
-    (tmp_path/"pyproject.toml").write_text('[tool.fastws]\nrelease_exclude = ["Appy"]\n', encoding="utf-8")
-    checked = []
-    async def fake(repo, skip=None): return checked.append(repo) or []
-    monkeypatch.setattr(relmod, "check_release", fake)
-
-    rep = asyncio.run(relmod.check_releases(workspace=str(tmp_path)))
-
-    assert checked == ["AnswerDotAI/libx"]  # appy excluded, case-insensitively
-    assert [r for r, _ in rep] == ["libx"]
-
-
-def _member(tmp_path, dirname, pkg=None, deps=()):
-    d = tmp_path/dirname
-    d.mkdir()
-    dep_s = ", ".join(f'"{x}"' for x in deps)
-    (d/"pyproject.toml").write_text(f'[project]\nname = "{pkg or dirname}"\ndependencies = [{dep_s}]\n', encoding="utf-8")
-
-
-def test_check_releases_scoping(tmp_path, monkeypatch):
-    (tmp_path/"repos.txt").write_text("AnswerDotAI/libx\nAnswerDotAI/appy\n", encoding="utf-8")
-    (tmp_path/"repos-local.txt").write_text("AnswerDotAI/exty\n", encoding="utf-8")
-    _member(tmp_path, "libx", pkg="libx-cli")
-    _member(tmp_path, "appy", deps=["libx-cli"])
-    _member(tmp_path, "exty")
-    checked = []
-    async def fake(repo, skip=None): return checked.append(repo) or []
-    monkeypatch.setattr(relmod, "check_release", fake)
-    run = lambda **kw: asyncio.run(relmod.check_releases(workspace=str(tmp_path), **kw))
-
-    monkeypatch.chdir(tmp_path)
-    run()
-    assert checked == ["AnswerDotAI/libx", "AnswerDotAI/appy", "AnswerDotAI/exty"]  # at root: full sweep
-
-    checked.clear()
-    (tmp_path/"appy"/"sub").mkdir()
-    monkeypatch.chdir(tmp_path/"appy"/"sub")
-    run()
-    assert checked == ["AnswerDotAI/libx", "AnswerDotAI/appy"]  # inside a member: its closure, dir<->package mapped
-
-    checked.clear()
-    run(nodeps=True)
-    assert checked == ["AnswerDotAI/appy"]  # nodeps: the repo alone
-
-    checked.clear()
-    monkeypatch.chdir(tmp_path)
-    run(project="appy")
-    assert checked == ["AnswerDotAI/libx", "AnswerDotAI/appy"]  # explicit project: closure, as before
-
-    checked.clear()
-    run(project="libx")
-    assert checked == ["AnswerDotAI/libx"]  # explicit project by dir name maps to its package
-
-    checked.clear()
-    run(project="appy", nodeps=True)
-    assert checked == ["AnswerDotAI/appy"]
-
-    with pytest.raises(SystemExit): run(nodeps=True)  # no project in play