path-sync 0.7.4__tar.gz → 0.7.5__tar.gz

{path_sync-0.7.4 → path_sync-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: path-sync
-Version: 0.7.4
+Version: 0.7.5
 Summary: Sync files from a source repo to multiple destination repos
 Author-email: EspenAlbert <espen.albert1@gmail.com>
 License-Expression: MIT

{path_sync-0.7.4 → path_sync-0.7.5}/path_sync/__init__.py

@@ -5,7 +5,7 @@ from path_sync import dep_update
 from path_sync import validate_no_changes
 from path_sync import config
 
-VERSION = "0.7.4"
+VERSION = "0.7.5"
 __all__ = [
     "copy",
     "dep_update",

{path_sync-0.7.4 → path_sync-0.7.5}/path_sync/_internal/cmd_copy.py

@@ -23,6 +23,7 @@ from path_sync._internal.models import (
     pr_already_synced,
     resolve_config_path,
 )
+from path_sync._internal.repo_utils import ensure_repo, resolve_repo_path
 from path_sync._internal.typer_app import app
 from path_sync._internal.verify import StepFailure, VerifyResult, VerifyStatus
 from path_sync._internal.yaml_utils import load_yaml_model
@@ -57,6 +58,7 @@ class CopyOptions(BaseModel):
     skip_verify: bool = False
     no_wait: bool = False
     no_auto_merge: bool = False
+    work_dir: str = ""
     pr_title: str = ""
     labels: list[str] | None = None
     reviewers: list[str] | None = None
@@ -78,6 +80,7 @@ def copy(
         help="Source repo root (default: find git root from cwd)",
     ),
     dest_filter: str = typer.Option("", "-d", "--dest", help="Filter destinations (comma-separated)"),
+    work_dir: str = typer.Option("", "--work-dir", help="Clone repos here (overrides dest_path_relative)"),
     dry_run: bool = typer.Option(False, "--dry-run", help="Preview without writing"),
     force_overwrite: bool = typer.Option(
         False,
@@ -174,6 +177,7 @@ def copy(
         skip_verify=skip_verify,
         no_wait=no_wait,
         no_auto_merge=no_auto_merge,
+        work_dir=work_dir,
         pr_title=pr_title or config.pr_defaults.title,
         labels=cmd_options.split_csv(pr_labels) or config.pr_defaults.labels,
         reviewers=cmd_options.split_csv(pr_reviewers) or config.pr_defaults.reviewers,
@@ -251,12 +255,8 @@ def _sync_destination(
     opts: CopyOptions,
     read_log: Callable[[], str],
 ) -> tuple[int, PRRef | None]:
-    dest_root = (src_root / dest.dest_path_relative).resolve()
-
-    if opts.dry_run and not dest_root.exists():
-        raise ValueError(f"Destination repo not found: {dest_root}. Clone it first or run without --dry-run.")
-
-    dest_repo = _ensure_dest_repo(dest, dest_root, opts.dry_run)
+    dest_root = resolve_repo_path(dest, src_root, opts.work_dir)
+    dest_repo = ensure_repo(dest, dest_root, dry_run=opts.dry_run)
     copy_branch = dest.resolved_copy_branch(config.name)
 
     if _skip_already_synced(dest.name, dest_root, copy_branch, commit_ts, opts, config):
@@ -314,16 +314,6 @@ def _print_sync_summary(dest: Destination, result: SyncResult) -> None:
         typer.echo(f"\n{result.total} changes ready.", err=True)
 
 
-def _ensure_dest_repo(dest: Destination, dest_root: Path, dry_run: bool):
-    if not dest_root.exists():
-        if dry_run:
-            raise ValueError(f"Destination repo not found: {dest_root}. Clone it first or run without --dry-run.")
-        if not dest.repo_url:
-            raise ValueError(f"Dest {dest.name} not found and no repo_url configured")
-        git_ops.clone_repo(dest.repo_url, dest_root)
-    return git_ops.get_repo(dest_root)
-
-
 def _sync_paths(
     config: SrcConfig,
     dest: Destination,

{path_sync-0.7.4 → path_sync-0.7.5}/path_sync/_internal/cmd_dep_update.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import logging
-import shutil
 import subprocess
 from dataclasses import dataclass, field
 from enum import StrEnum
@@ -10,7 +9,7 @@ from pathlib import Path
 import typer
 from git import Repo
 
-from path_sync._internal import cmd_options, git_ops, prompt_utils, verify
+from path_sync._internal import cmd_options, git_ops, verify
 from path_sync._internal.auto_merge import PRRef, handle_auto_merge
 from path_sync._internal.log_capture import capture_log
 from path_sync._internal.models import Destination, OnFailStrategy, find_repo_root
@@ -19,6 +18,7 @@ from path_sync._internal.models_dep import (
     UpdateEntry,
     resolve_dep_config_path,
 )
+from path_sync._internal.repo_utils import ensure_repo, resolve_repo_path
 from path_sync._internal.typer_app import app
 from path_sync._internal.verify import StepFailure, VerifyStatus
 from path_sync._internal.yaml_utils import load_yaml_model
@@ -154,8 +154,8 @@ def _process_single_repo_inner(
     opts: DepUpdateOptions,
 ) -> RepoResult:
     logger.info(f"Processing {dest.name}...")
-    repo_path = _resolve_repo_path(dest, src_root, work_dir)
-    repo = _ensure_repo(dest, repo_path, dest.default_branch)
+    repo_path = resolve_repo_path(dest, src_root, work_dir)
+    repo = ensure_repo(dest, repo_path)
     git_ops.prepare_copy_branch(repo, dest.default_branch, config.pr.branch, from_default=True)
 
     if failure := _run_updates(config.updates, repo_path):
@@ -219,29 +219,6 @@ def _create_prs(config: DepConfig, results: list[RepoResult], opts: DepUpdateOpt
     return pr_refs
 
 
-def _resolve_repo_path(dest: Destination, src_root: Path, work_dir: str) -> Path:
-    if work_dir:
-        return Path(work_dir) / dest.name
-    if dest.dest_path_relative:
-        return (src_root / dest.dest_path_relative).resolve()
-    raise typer.BadParameter(f"No dest_path_relative for {dest.name}, --work-dir required")
-
-
-def _ensure_repo(dest: Destination, repo_path: Path, default_branch: str) -> Repo:
-    if repo_path.exists():
-        if git_ops.is_git_repo(repo_path):
-            repo = git_ops.get_repo(repo_path)
-            git_ops.fetch_and_reset_to_default(repo, default_branch)
-            return repo
-        logger.warning(f"Invalid git repo at {repo_path}")
-        if not prompt_utils.prompt_confirm(f"Remove {repo_path} and re-clone?"):
-            raise typer.Abort()
-        shutil.rmtree(repo_path)
-    if not dest.repo_url:
-        raise ValueError(f"Dest {dest.name} not found at {repo_path} and no repo_url configured")
-    return git_ops.clone_repo(dest.repo_url, repo_path)
-
-
 def _build_pr_body(log_content: str, failures: list[StepFailure]) -> str:
     body = "Automated dependency update."
 

path_sync-0.7.5/path_sync/_internal/repo_utils.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+import logging
+import shutil
+from pathlib import Path
+
+from git import Repo
+
+from path_sync._internal import git_ops, prompt_utils
+from path_sync._internal.models import Destination
+
+logger = logging.getLogger(__name__)
+
+
+def resolve_repo_path(dest: Destination, src_root: Path, work_dir: str) -> Path:
+    if work_dir:
+        return Path(work_dir) / dest.name
+    if dest.dest_path_relative:
+        return (src_root / dest.dest_path_relative).resolve()
+    raise ValueError(f"No dest_path_relative for {dest.name}, use --work-dir")
+
+
+def ensure_repo(dest: Destination, repo_path: Path, dry_run: bool = False) -> Repo:
+    if repo_path.exists():
+        if git_ops.is_git_repo(repo_path):
+            return git_ops.get_repo(repo_path)
+        logger.warning(f"Invalid git repo at {repo_path}")
+        if dry_run:
+            raise ValueError(f"Invalid git repo at {repo_path}, cannot re-clone in dry-run mode")
+        if not prompt_utils.prompt_confirm(f"Remove {repo_path} and re-clone?"):
+            raise ValueError(f"Aborted: user declined to remove invalid repo at {repo_path}")
+        shutil.rmtree(repo_path)
+    if dry_run:
+        raise ValueError(f"Destination repo not found: {repo_path}. Clone it first or run without --dry-run.")
+    if not dest.repo_url:
+        raise ValueError(f"Dest {dest.name} not found at {repo_path} and no repo_url configured")
+    return git_ops.clone_repo(dest.repo_url, repo_path)

{path_sync-0.7.4 → path_sync-0.7.5}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "path-sync"
-version = "0.7.4"
+version = "0.7.5"
 description = "Sync files from a source repo to multiple destination repos"
 requires-python = ">=3.13"
 license = "MIT"