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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.16
+Version: 0.0.17
 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.6
+Requires-Dist: fastcore>=2.2.29
 Requires-Dist: fastgit>=0.1.2
 Requires-Dist: ghapi>=2.0.6
 Requires-Dist: packaging
@@ -261,15 +261,16 @@ ws-add ~/private  # stays where it is, recorded in repos-local.txt with its loca
 
 ### `ws-remove`
 
-Delete a personal repo's clone, remove it from `repos-local.txt` and the workspace `pyproject.toml`, then run `uv sync`.
+Delete one or more personal repo clones and remove them from `repos-local.txt` and the workspace `pyproject.toml`. Run `uv sync` once after processing all repos.
 
 The command refuses shared baseline members. Edit `repos.txt` deliberately to change the team's baseline. It also refuses external or custom checkout locations, which must be managed explicitly.
 
-Removal requires a clean Git checkout with an `origin` remote and no uncommitted changes or unpushed commits. The command always asks for confirmation before deleting anything:
+Removal requires a clean Git checkout with an `origin` remote and no uncommitted changes or unpushed commits. The command validates all targets before changing anything. It asks for confirmation before deleting each checkout. Declining keeps that checkout but still removes its workspace metadata. Repeated targets are processed once:
 
 ```bash
 ws-remove owner/personal-project
 ws-remove personal-project  # bare folder name also works if the directory exists
+ws-remove owner/project-one project-two project-three
 ```
 
 ### `ws-releases`

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

@@ -236,15 +236,16 @@ ws-add ~/private  # stays where it is, recorded in repos-local.txt with its loca
 
 ### `ws-remove`
 
-Delete a personal repo's clone, remove it from `repos-local.txt` and the workspace `pyproject.toml`, then run `uv sync`.
+Delete one or more personal repo clones and remove them from `repos-local.txt` and the workspace `pyproject.toml`. Run `uv sync` once after processing all repos.
 
 The command refuses shared baseline members. Edit `repos.txt` deliberately to change the team's baseline. It also refuses external or custom checkout locations, which must be managed explicitly.
 
-Removal requires a clean Git checkout with an `origin` remote and no uncommitted changes or unpushed commits. The command always asks for confirmation before deleting anything:
+Removal requires a clean Git checkout with an `origin` remote and no uncommitted changes or unpushed commits. The command validates all targets before changing anything. It asks for confirmation before deleting each checkout. Declining keeps that checkout but still removes its workspace metadata. Repeated targets are processed once:
 
 ```bash
 ws-remove owner/personal-project
 ws-remove personal-project  # bare folder name also works if the directory exists
+ws-remove owner/project-one project-two project-three
 ```
 
 ### `ws-releases`

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

@@ -1,4 +1,5 @@
-__version__ = "0.0.16"
+__version__ = "0.0.17"
+
 
 
 

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

@@ -984,33 +984,41 @@ def _repo_safety_issues(d: Path) -> list[str]:
 
 @call_parse
 def ws_remove(
-    repo: str,  # Repo to remove, e.g. AnswerDotAI/fastws
+    repo: str,  # Repo to remove, e.g. owner/repo or a local folder name
+    *repos: str,  # Additional repos to remove
     workspace: str = "",  # Workspace root; defaults to active venv parent when available
     repos_file: str = "repos.txt",  # Repo list to update
     pyproject_file: str = "pyproject.toml",  # Workspace pyproject to update
     template_file: str = "pyproject.tmpl",  # Template copied when pyproject.toml is missing
 ):
-    "Remove a personal repo and its local metadata; shared baseline members cannot be removed."
+    "Remove personal repos and their local metadata; shared baseline members cannot be removed."
     root = _ws_root(workspace, repos_file, pyproject_file, template_file)
     repos_path = _resolve_path(root, repos_file)
     pyproject_path = _resolve_path(root, pyproject_file)
-    repo = _resolve_removal_target(root, repo, repos_path)
-    if _repo_key(repo) in {_repo_key(r) for r in _load_repos(repos_path)}:
-        raise SystemExit(f'{repo} belongs to the shared baseline: edit {repos_path} deliberately to remove it')
-    d = _resolve_repo_dir(root, repo)
-    for r,location,_ in _load_repo_entries(repos_path, root):
-        if _repo_key(r) == _repo_key(repo) and location.resolve() != d:
-            raise SystemExit(f'Refusing to remove {repo}: custom checkout location {location}; manage it explicitly')
-    repos_path = _local_repos_path(repos_path)
-    name = _read_pyproject_name(d/"pyproject.toml") if (d/"pyproject.toml").exists() else None
-    names = [name] if name else [d.name]
-    in_repos = _repo_key(repo) in {_repo_key(r) for r in _load_repos(repos_path)}
-    if not d.exists() and not in_repos: raise SystemExit(f"Nothing to remove for {repo}")
-    if d.exists() and (issues := _repo_safety_issues(d)): raise SystemExit("Refusing to remove:\n" + "\n".join(f"  - {i}" for i in issues))
-    _remove_from_repos_file(repos_path, repo)
-    _remove_from_pyproject(pyproject_path, names)
-    if d.exists():
-        try: ans = input(f"Remove directory {d}? [y/N] ")
-        except EOFError: ans = ""
-        if ans.strip().lower() in ("y", "yes"): shutil.rmtree(d)
+    local_path = _local_repos_path(repos_path)
+    baseline = {_repo_key(r) for r in _load_repos(repos_path)}
+    local = {_repo_key(r) for r in _load_repos(local_path)}
+    entries = _load_repo_entries(repos_path, root)
+    targets = {}
+    for repo in (repo, *repos):
+        repo = _resolve_removal_target(root, repo, repos_path)
+        key = _repo_key(repo)
+        if key in baseline: raise SystemExit(f'{repo} belongs to the shared baseline: edit {repos_path} deliberately to remove it')
+        d = _resolve_repo_dir(root, repo)
+        for r,location,_ in entries:
+            if _repo_key(r) == key and location.resolve() != d:
+                raise SystemExit(f'Refusing to remove {repo}: custom checkout location {location}; manage it explicitly')
+        if d in targets: continue
+        if not d.exists() and key not in local: raise SystemExit(f"Nothing to remove for {repo}")
+        if d.exists() and (issues := _repo_safety_issues(d)):
+            raise SystemExit("Refusing to remove:\n" + "\n".join(f"  - {i}" for i in issues))
+        name = _read_pyproject_name(d/"pyproject.toml") if (d/"pyproject.toml").exists() else None
+        targets[d] = repo, name or d.name
+    for d,(repo,name) in targets.items():
+        _remove_from_repos_file(local_path, repo)
+        _remove_from_pyproject(pyproject_path, [name])
+        if d.exists():
+            try: ans = input(f"Remove directory {d}? [y/N] ")
+            except EOFError: ans = ""
+            if ans.strip().lower() in ("y", "yes"): shutil.rmtree(d)
     subprocess.run(["uv", "sync"], check=True, cwd=root)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.16
+Version: 0.0.17
 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.6
+Requires-Dist: fastcore>=2.2.29
 Requires-Dist: fastgit>=0.1.2
 Requires-Dist: ghapi>=2.0.6
 Requires-Dist: packaging
@@ -261,15 +261,16 @@ ws-add ~/private  # stays where it is, recorded in repos-local.txt with its loca
 
 ### `ws-remove`
 
-Delete a personal repo's clone, remove it from `repos-local.txt` and the workspace `pyproject.toml`, then run `uv sync`.
+Delete one or more personal repo clones and remove them from `repos-local.txt` and the workspace `pyproject.toml`. Run `uv sync` once after processing all repos.
 
 The command refuses shared baseline members. Edit `repos.txt` deliberately to change the team's baseline. It also refuses external or custom checkout locations, which must be managed explicitly.
 
-Removal requires a clean Git checkout with an `origin` remote and no uncommitted changes or unpushed commits. The command always asks for confirmation before deleting anything:
+Removal requires a clean Git checkout with an `origin` remote and no uncommitted changes or unpushed commits. The command validates all targets before changing anything. It asks for confirmation before deleting each checkout. Declining keeps that checkout but still removes its workspace metadata. Repeated targets are processed once:
 
 ```bash
 ws-remove owner/personal-project
 ws-remove personal-project  # bare folder name also works if the directory exists
+ws-remove owner/project-one project-two project-three
 ```
 
 ### `ws-releases`

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

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

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

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

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

@@ -1,4 +1,4 @@
-import json, os, pytest
+import json, os, runpy, shutil, sys, pytest
 from types import SimpleNamespace
 from fastgit import Git
 import fastws.core as core
@@ -6,7 +6,7 @@ import fastws.core as core
 os.environ.update(GIT_AUTHOR_NAME='fastws', GIT_AUTHOR_EMAIL='fastws@example.com',
     GIT_COMMITTER_NAME='fastws', GIT_COMMITTER_EMAIL='fastws@example.com')
 
-WS_META = '[project]\nname = "uvws"\ndependencies = [\n    "repo1pkg",\n    "keeppkg",\n]\n\n[tool.uv.sources]\nrepo1pkg = { workspace = true }\nkeeppkg = { workspace = true }\n'
+WS_META = '[project]\nname = "uvws"\ndependencies = [\n    "repo1pkg",\n    "repo2pkg",\n    "keeppkg",\n]\n\n[tool.uv.sources]\nrepo1pkg = { workspace = true }\nrepo2pkg = { workspace = true }\nkeeppkg = { workspace = true }\n'
 
 
 def mk_repo(d, origin=None):
@@ -301,47 +301,50 @@ async def test_git_repo_resolution(tmp_path):
 def test_ws_remove_workflow(tmp_path, monkeypatch, fake_uv):
     (tmp_path/'repos.txt').write_text('AnswerDotAI/keep\n')
     local = tmp_path/'repos-local.txt'
-    local.write_text('AnswerDotAI/repo1\norg/external ../external\n')
+    local.write_text('AnswerDotAI/repo1\nAnswerDotAI/repo2\norg/external ../external\n')
     (tmp_path/'pyproject.toml').write_text(WS_META)
-    repo = tmp_path/'repo1'
-    repo.mkdir()
-    (repo/'pyproject.toml').write_text('[project]\nname = "repo1pkg"\n')
-    g = mk_repo(repo, origin=tmp_path/'origins'/'repo1')
-    answer = ['y']
-    monkeypatch.setattr('builtins.input', lambda *a: answer[0])
+    repo, repo2 = tmp_path/'repo1', tmp_path/'repo2'
+    for d in repo, repo2:
+        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('AnswerDotAI/keep', workspace=str(tmp_path))
-    with pytest.raises(SystemExit, match='location'): core.ws_remove('org/external', workspace=str(tmp_path))
+    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
-    (repo/'pyproject.toml').write_text('[project]\nname = "repo1pkg"\nversion = "1"\n')
-    with pytest.raises(SystemExit): core.ws_remove('AnswerDotAI/repo1', workspace=str(tmp_path))
-    assert repo.exists() and 'repo1' in local.read_text()
+    (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
     g.commit('-a', m='ahead')
-    with pytest.raises(SystemExit): core.ws_remove('AnswerDotAI/repo1', workspace=str(tmp_path))
-    assert repo.exists()
+    with pytest.raises(SystemExit): core.ws_remove('AnswerDotAI/repo1', 'repo2', workspace=str(tmp_path))
+    assert repo.exists() and repo2.exists()
 
-    # pushed and clean: answering 'n' keeps the directory but still removes the metadata and re-syncs
+    # Each checkout has its own prompt; duplicate targets are removed once, with one sync for the batch.
     g.push()
-    answer[0] = 'n'
-    core.ws_remove('AnswerDotAI/repo1', workspace=str(tmp_path))
-    assert repo.exists()
-    assert 'repo1' not in local.read_text()
-    assert 'repo1pkg' not in (tmp_path/'pyproject.toml').read_text()
-    assert ['uv', 'sync'] in fake_uv
+    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)
-    answer[0] = 'y'
     core.ws_remove('repo1', workspace=str(tmp_path))
     assert not repo.exists()
     assert (tmp_path/'repos.txt').read_text() == 'AnswerDotAI/keep\n'
+    assert not answer
 
 
 def test_upgrade_stamp(tmp_path):