fastws-cli 0.0.4__tar.gz → 0.0.6__tar.gz

{fastws_cli-0.0.4 → fastws_cli-0.0.6}/CHANGELOG.md

@@ -1,6 +1,13 @@
 <!-- do not remove -->
 
-## 0.0.4
+## 0.0.6
+
+### New Features
+
+- Add root-aware clone/pull helpers, auto-pull in ws-sync, and docstrings to CLI entry points ([#2](https://github.com/AnswerDotAI/fastws/issues/2))
+
+
+## 0.0.5
 
 ### New Features
 

{fastws_cli-0.0.4/fastws_cli.egg-info → fastws_cli-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.4
+Version: 0.0.6
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License: Apache-2.0
@@ -66,6 +66,7 @@ Show uncommitted changes and unpushed commits:
 
 ```bash
 ws-status
+ws-status --branches
 ```
 
 ### `ws-branches`
@@ -79,7 +80,7 @@ ws-branches --expected develop
 
 ### `ws-sync`
 
-Sync the workspace metadata, install updates, and refresh Pyright editable paths.
+Sync the workspace metadata, pull local repos, install updates, and refresh Pyright editable paths.
 By default it uses the active venv parent as the workspace root, so you do not need to `cd` first:
 It respects `tool.uv.workspace.members` and `exclude` when scanning local projects.
 

{fastws_cli-0.0.4 → fastws_cli-0.0.6}/README.md

@@ -45,6 +45,7 @@ Show uncommitted changes and unpushed commits:
 
 ```bash
 ws-status
+ws-status --branches
 ```
 
 ### `ws-branches`
@@ -58,7 +59,7 @@ ws-branches --expected develop
 
 ### `ws-sync`
 
-Sync the workspace metadata, install updates, and refresh Pyright editable paths.
+Sync the workspace metadata, pull local repos, install updates, and refresh Pyright editable paths.
 By default it uses the active venv parent as the workspace root, so you do not need to `cd` first:
 It respects `tool.uv.workspace.members` and `exclude` when scanning local projects.
 

fastws_cli-0.0.6/fastws/__init__.py

@@ -0,0 +1,4 @@
+__version__ = "0.0.6"
+
+from .core import *
+

{fastws_cli-0.0.4 → fastws_cli-0.0.6}/fastws/core.py

@@ -206,22 +206,26 @@ def _write_pyright_pth_files(root: Path) -> list[Path]:
             created.append(pth)
     return created
 
-def _clone_one(repo: str) -> str:
-    d = _repo_dir(repo)
-    if Path(d).exists(): return f"✓ {d}: already exists"
+def _clone_one(repo: str, root: str = ".") -> str:
+    d = Path(root)/_repo_dir(repo)
+    if d.exists(): return f"✓ {d.name}: already exists"
     try:
-        subprocess.run(["git", "clone", f"git@github.com:{repo}.git"], check=True, capture_output=True)
-        return f"✓ {d}: cloned"
-    except subprocess.CalledProcessError as e: return f"✗ {d}: {e.stderr.decode().strip()}"
+        subprocess.run(["git", "clone", f"git@github.com:{repo}.git", str(d)], check=True, capture_output=True)
+        return f"✓ {d.name}: cloned"
+    except subprocess.CalledProcessError as e: return f"✗ {d.name}: {e.stderr.decode().strip()}"
 
-def _pull_one(repo: str) -> str:
-    d = _repo_dir(repo)
-    if not Path(d).exists(): return f"✗ {d}: directory not found"
+def _pull_one(repo: str, root: str = ".") -> str:
+    d = Path(root)/_repo_dir(repo)
+    if not d.exists(): return f"✗ {d.name}: directory not found"
     try:
-        res = subprocess.run(["git", "-C", d, "pull", "-q", "--stat"], check=True, capture_output=True, text=True)
-        return f"✓ {d}" + (f"\n{res.stdout.strip()}" if res.stdout.strip() else "")
+        res = subprocess.run(["git", "-C", str(d), "pull", "-q", "--stat"], check=True, capture_output=True, text=True)
+        return f"✓ {d.name}" + (f"\n{res.stdout.strip()}" if res.stdout.strip() else "")
     except subprocess.CalledProcessError as e: return f"✗ {d}: {e.stderr.strip()}"
 
+def _pull(repos: list[str], workers: int = 16, root: str = "."):
+    with ThreadPoolExecutor(max_workers=workers) as ex:
+        for result in as_completed([ex.submit(_pull_one, r, root) for r in repos]): print(result.result())
+
 def ws_clone(
     repos_file: str = "repos.txt",  # File containing repo list (one per line: owner/repo)
     workers: int = 16,  # Number of parallel workers
@@ -235,27 +239,30 @@ def ws_clone(
 def ws_clone_cli(
     repos_file: str = "repos.txt",  # File containing repo list (one per line: owner/repo)
     workers: int = 16,  # Number of parallel workers
-): ws_clone(repos_file, workers)
+):
+    "Clone all repos from a repos file."
+    ws_clone(repos_file, workers)
 
 def ws_pull(
     repos_file: str = "repos.txt",  # File containing repo list
     workers: int = 16,  # Number of parallel workers
 ):
     "Pull updates for all repos."
-    repos = _load_repos(repos_file)
-    with ThreadPoolExecutor(max_workers=workers) as ex:
-        for result in as_completed([ex.submit(_pull_one, r) for r in repos]): print(result.result())
+    _pull(_load_repos(repos_file), workers)
 
 @call_parse
 def ws_pull_cli(
     repos_file: str = "repos.txt",  # File containing repo list
     workers: int = 16,  # Number of parallel workers
-): ws_pull(repos_file, workers)
+):
+    "Pull updates for all repos."
+    ws_pull(repos_file, workers)
 
 def ws_status(
     repos_file: str = "repos.txt",  # File containing repo list
+    branches: bool = False,  # Show unpushed commit details
 ):
-    "Show uncommitted changes and unpushed commits across repos."
+    "Show uncommitted changes and optionally unpushed commit details across repos."
     repos = _load_repos(repos_file)
     for repo in repos:
         d = _repo_dir(repo)
@@ -265,18 +272,24 @@ def ws_status(
         changes = g.status('-s') or ""
         if isinstance(changes, list): changes = "\n".join(changes)
         unpushed = ""
-        try: unpushed = g.log('--branches', '--not', '--remotes', format='%h %s') or ""
+        try:
+            if branches: unpushed = g.log('--branches', '--not', '--remotes', format='%h %s') or ""
+            elif (branch := g.branch(show_current=True).strip()) in ('main', 'master'):
+                unpushed = g.log('@{upstream}..HEAD', '-1', format='%h %s') or ""
         except Exception: pass
         if isinstance(unpushed, list): unpushed = "\n".join(unpushed)
         if changes or unpushed:
             print(f"\n=== {d} ===")
             if changes: print(changes)
-            if unpushed: print(unpushed)
+            if unpushed: print(unpushed if branches else "unpushed commits")
 
 @call_parse
 def ws_status_cli(
     repos_file: str = "repos.txt",  # File containing repo list
-): ws_status(repos_file)
+    branches: bool = False,  # Show unpushed commit details
+):
+    "Show uncommitted changes and optionally unpushed commit details across repos."
+    ws_status(repos_file, branches)
 
 def ws_branches(
     repos_file: str = "repos.txt",  # File containing repo list
@@ -300,7 +313,9 @@ def ws_branches(
 def ws_branches_cli(
     repos_file: str = "repos.txt",  # File containing repo list
     expected: str = "main",  # Expected branch name
-): ws_branches(repos_file, expected)
+):
+    "Check if all repos are on the expected branch."
+    ws_branches(repos_file, expected)
 
 def ws_sync(
     workspace: str = "",  # Workspace root; defaults to active venv parent when available
@@ -313,8 +328,10 @@ def ws_sync(
     repos_path = _resolve_path(root, repos_file)
     pyproject_path = _resolve_path(root, pyproject_file)
     template_path = _resolve_path(root, template_file)
+    repos = _discover_ws_repos(root)
 
-    if missing_repos := _update_repos_file(repos_path, _discover_ws_repos(root)): print(f"Added repos: {', '.join(missing_repos)}")
+    if missing_repos := _update_repos_file(repos_path, repos): print(f"Added repos: {', '.join(missing_repos)}")
+    _pull(repos, root=str(root))
 
     if missing_projects := _sync_ws_pyproject(pyproject_path, template_path, _ws_projects(root)): print(f"Added workspace projects: {', '.join(missing_projects)}")
 
@@ -327,7 +344,9 @@ def ws_sync_cli(
     repos_file: str = "repos.txt",  # Repo list to update from local git remotes
     pyproject_file: str = "pyproject.toml",  # Workspace pyproject to update
     template_file: str = "pyproject.tmpl",  # Template copied when pyproject.toml is missing
-): ws_sync(workspace, repos_file, pyproject_file, template_file)
+):
+    "Sync workspace metadata, run uv sync -U, and refresh Pyright editable paths."
+    ws_sync(workspace, repos_file, pyproject_file, template_file)
 
 def ws_add(
     repo: str,  # Repo to add, e.g. AnswerDotAI/fastws
@@ -343,6 +362,7 @@ def ws_add(
     added = _update_repos_file(repos_path, [repo])
     if added: print(f"Added repo: {repo}")
     else: print(f"Repo already present: {repo}")
+    print(_clone_one(repo, str(root)))
     ws_sync(str(root), repos_file, pyproject_file, template_file)
 
 @call_parse
@@ -352,4 +372,6 @@ def ws_add_cli(
     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
-): ws_add(repo, workspace, repos_file, pyproject_file, template_file)
+):
+    "Add a repo to repos.txt and then run ws-sync."
+    ws_add(repo, workspace, repos_file, pyproject_file, template_file)

{fastws_cli-0.0.4 → fastws_cli-0.0.6/fastws_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.4
+Version: 0.0.6
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License: Apache-2.0
@@ -66,6 +66,7 @@ Show uncommitted changes and unpushed commits:
 
 ```bash
 ws-status
+ws-status --branches
 ```
 
 ### `ws-branches`
@@ -79,7 +80,7 @@ ws-branches --expected develop
 
 ### `ws-sync`
 
-Sync the workspace metadata, install updates, and refresh Pyright editable paths.
+Sync the workspace metadata, pull local repos, install updates, and refresh Pyright editable paths.
 By default it uses the active venv parent as the workspace root, so you do not need to `cd` first:
 It respects `tool.uv.workspace.members` and `exclude` when scanning local projects.
 

{fastws_cli-0.0.4 → fastws_cli-0.0.6}/tests/test_sync.py

@@ -1,5 +1,3 @@
-from pathlib import Path
-
 import fastws.core as core
 
 
@@ -98,6 +96,9 @@ def test_ws_sync_updates_workspace_and_runs_uv(tmp_path, monkeypatch):
         if cmd[:5] == ["git", "-C", str(repo), "remote", "get-url"]:
             class Res: stdout = "git@github.com:AnswerDotAI/repo1.git\n"
             return Res()
+        if cmd[:4] == ["git", "-C", str(repo), "pull"]:
+            class Res: stdout = ""
+            return Res()
         if cmd == ["uv", "sync", "-U"]:
             class Res: stdout = ""
             return Res()
@@ -112,6 +113,7 @@ def test_ws_sync_updates_workspace_and_runs_uv(tmp_path, monkeypatch):
     assert 'newpkg = { workspace = true }' in pyproject
     assert '"newpkg"' in pyproject
     assert (site/"_pyright_editable_newpkg.pth").read_text() == "/tmp/ws/src/newpkg\n"
+    assert next(i for i,(cmd,_) in enumerate(calls) if cmd[:4] == ["git", "-C", str(repo), "pull"]) < next(i for i,(cmd,_) in enumerate(calls) if cmd == ["uv", "sync", "-U"])
     assert any(cmd == ["uv", "sync", "-U"] and kwargs["cwd"] == tmp_path for cmd,kwargs in calls)
 
 
@@ -138,6 +140,9 @@ def test_ws_sync_uses_active_venv_parent_by_default(tmp_path, monkeypatch):
         if cmd[:5] == ["git", "-C", str(repo), "remote", "get-url"]:
             class Res: stdout = "git@github.com:AnswerDotAI/repo1.git\n"
             return Res()
+        if cmd[:4] == ["git", "-C", str(repo), "pull"]:
+            class Res: stdout = ""
+            return Res()
         if cmd == ["uv", "sync", "-U"]:
             class Res: stdout = ""
             return Res()
@@ -153,16 +158,79 @@ def test_ws_sync_uses_active_venv_parent_by_default(tmp_path, monkeypatch):
     assert any(cmd == ["uv", "sync", "-U"] and kwargs["cwd"] == workspace for cmd,kwargs in calls)
 
 
-def test_ws_add_updates_repos_then_runs_sync(tmp_path, monkeypatch):
+def test_ws_add_clones_and_syncs(tmp_path, monkeypatch):
     (tmp_path/"repos.txt").write_text("AnswerDotAI/existing\n")
-    calls = []
+    sync_calls, clone_calls = [], []
 
-    def fake_sync(workspace, repos_file, pyproject_file, template_file):
-        calls.append((workspace, repos_file, pyproject_file, template_file))
+    def fake_sync(*a): sync_calls.append(a)
+    def fake_clone(repo, root="."):
+        clone_calls.append((repo, root))
+        return "✓ cloned"
 
     monkeypatch.setattr(core, "ws_sync", fake_sync)
+    monkeypatch.setattr(core, "_clone_one", fake_clone)
 
     core.ws_add("answerdotai/fastws", workspace=str(tmp_path))
 
     assert (tmp_path/"repos.txt").read_text() == "AnswerDotAI/existing\nanswerdotai/fastws\n"
-    assert calls == [(str(tmp_path), "repos.txt", "pyproject.toml", "pyproject.tmpl")]
+    assert clone_calls == [("answerdotai/fastws", str(tmp_path))]
+    assert sync_calls == [(str(tmp_path), "repos.txt", "pyproject.toml", "pyproject.tmpl")]
+
+
+def test_ws_status_summarizes_unpushed_commits_by_default(tmp_path, monkeypatch, capsys):
+    (tmp_path/"repo1").mkdir()
+
+    class FakeGit:
+        exists = True
+        def __init__(self, d): pass
+        def branch(self, **kwargs): return "main"
+        def status(self, *args): return ""
+        def log(self, *args, **kwargs): return "abc first commit"
+
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(core, "_load_repos", lambda repos_file="repos.txt": ["AnswerDotAI/repo1"])
+    monkeypatch.setattr(core, "Git", FakeGit)
+
+    core.ws_status()
+    out = capsys.readouterr().out
+
+    assert "unpushed commits" in out
+    assert "abc first commit" not in out
+
+
+def test_ws_status_ignores_unpushed_commits_off_main_by_default(tmp_path, monkeypatch, capsys):
+    (tmp_path/"repo1").mkdir()
+
+    class FakeGit:
+        exists = True
+        def __init__(self, d): pass
+        def branch(self, **kwargs): return "feature"
+        def status(self, *args): return ""
+        def log(self, *args, **kwargs): return "abc first commit"
+
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(core, "_load_repos", lambda repos_file="repos.txt": ["AnswerDotAI/repo1"])
+    monkeypatch.setattr(core, "Git", FakeGit)
+
+    core.ws_status()
+
+    assert capsys.readouterr().out == ""
+
+
+def test_ws_status_shows_unpushed_commits_with_branches_flag(tmp_path, monkeypatch, capsys):
+    (tmp_path/"repo1").mkdir()
+
+    class FakeGit:
+        exists = True
+        def __init__(self, d): pass
+        def branch(self, **kwargs): return "feature"
+        def status(self, *args): return ""
+        def log(self, *args, **kwargs): return "abc first commit"
+
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(core, "_load_repos", lambda repos_file="repos.txt": ["AnswerDotAI/repo1"])
+    monkeypatch.setattr(core, "Git", FakeGit)
+
+    core.ws_status(branches=True)
+
+    assert "abc first commit" in capsys.readouterr().out

fastws_cli-0.0.4/fastws/__init__.py

@@ -1,5 +0,0 @@
-__version__ = "0.0.4"
-
-
-from .core import *
-