path-sync 0.4.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

path_sync/__init__.py

@@ -1,12 +1,14 @@
 # Generated by pkg-ext
 # flake8: noqa
-from path_sync import config
 from path_sync import copy
 from path_sync import dep_update
+from path_sync import validate_no_changes
+from path_sync import config
 
-VERSION = "0.4.1"
+VERSION = "0.6.0"
 __all__ = [
-    "config",
     "copy",
     "dep_update",
+    "validate_no_changes",
+    "config",
 ]

path_sync/_internal/cmd_copy.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 
 import glob
 import logging
-import tempfile
-from contextlib import contextmanager
+from collections.abc import Callable
 from dataclasses import dataclass, field
 from pathlib import Path
 
@@ -11,10 +10,10 @@ import typer
 from pydantic import BaseModel
 
 from path_sync import sections
-from path_sync._internal import git_ops, header
+from path_sync._internal import cmd_options, git_ops, header, prompt_utils, verify
 from path_sync._internal.file_utils import ensure_parents_write_text
+from path_sync._internal.log_capture import capture_log
 from path_sync._internal.models import (
-    LOG_FORMAT,
     Destination,
     PathMapping,
     SrcConfig,
@@ -23,6 +22,7 @@ from path_sync._internal.models import (
     resolve_config_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
 
 logger = logging.getLogger(__name__)
@@ -32,16 +32,6 @@ EXIT_CHANGES = 1
 EXIT_ERROR = 2
 
 
-def _prompt(message: str, no_prompt: bool) -> bool:
-    if no_prompt:
-        return True
-    try:
-        response = input(f"{message} [y/n]: ").strip().lower()
-        return response == "y"
-    except (EOFError, KeyboardInterrupt):
-        return False
-
-
 @dataclass
 class SyncResult:
     content_changes: int = 0
@@ -53,35 +43,20 @@ class SyncResult:
         return self.content_changes + self.orphans_deleted
 
 
-@contextmanager
-def capture_sync_log(dest_name: str):
-    with tempfile.TemporaryDirectory(prefix="path-sync-") as tmpdir:
-        log_path = Path(tmpdir) / f"{dest_name}.log"
-        file_handler = logging.FileHandler(log_path, mode="w")
-        file_handler.setLevel(logging.INFO)
-        file_handler.setFormatter(logging.Formatter(LOG_FORMAT))
-        root_logger = logging.getLogger("path_sync")
-        root_logger.addHandler(file_handler)
-        try:
-            yield log_path
-        finally:
-            file_handler.close()
-            root_logger.removeHandler(file_handler)
-
-
 class CopyOptions(BaseModel):
     dry_run: bool = False
     force_overwrite: bool = False
     no_checkout: bool = False
     checkout_from_default: bool = False
-    local: bool = False
+    skip_commit: bool = False
     no_prompt: bool = False
     no_pr: bool = False
     skip_orphan_cleanup: bool = False
+    skip_verify: bool = False
     pr_title: str = ""
-    pr_labels: str = ""
-    pr_reviewers: str = ""
-    pr_assignees: str = ""
+    labels: list[str] | None = None
+    reviewers: list[str] | None = None
+    assignees: list[str] | None = None
 
 
 @app.command()
@@ -120,8 +95,9 @@ def copy(
         "--checkout-from-default",
         help="Reset to origin/default before sync (for CI)",
     ),
-    local: bool = typer.Option(
+    skip_commit: bool = typer.Option(
         False,
+        "--skip-commit",
         "--local",
         help="No git operations after sync (no commit/push/PR)",
     ),
@@ -141,26 +117,19 @@ def copy(
         "--pr-title",
         help="Override PR title (supports {name}, {dest_name})",
     ),
-    pr_labels: str = typer.Option(
-        "",
-        "--pr-labels",
-        help="Comma-separated PR labels",
-    ),
-    pr_reviewers: str = typer.Option(
-        "",
-        "--pr-reviewers",
-        help="Comma-separated PR reviewers",
-    ),
-    pr_assignees: str = typer.Option(
-        "",
-        "--pr-assignees",
-        help="Comma-separated PR assignees",
-    ),
+    pr_labels: str = cmd_options.pr_labels_option(),
+    pr_reviewers: str = cmd_options.pr_reviewers_option(),
+    pr_assignees: str = cmd_options.pr_assignees_option(),
     skip_orphan_cleanup: bool = typer.Option(
         False,
         "--skip-orphan-cleanup",
         help="Skip deletion of orphaned synced files",
     ),
+    skip_verify: bool = typer.Option(
+        False,
+        "--skip-verify",
+        help="Skip verification steps after syncing",
+    ),
 ) -> None:
     """Copy files from SRC to DEST repositories."""
     if name and config_path_opt:
@@ -187,14 +156,15 @@ def copy(
         force_overwrite=force_overwrite,
         no_checkout=no_checkout,
         checkout_from_default=checkout_from_default,
-        local=local,
+        skip_commit=skip_commit,
         no_prompt=no_prompt,
         no_pr=no_pr,
         skip_orphan_cleanup=skip_orphan_cleanup,
+        skip_verify=skip_verify,
         pr_title=pr_title or config.pr_defaults.title,
-        pr_labels=pr_labels or ",".join(config.pr_defaults.labels),
-        pr_reviewers=pr_reviewers or ",".join(config.pr_defaults.reviewers),
-        pr_assignees=pr_assignees or ",".join(config.pr_defaults.assignees),
+        labels=cmd_options.split_csv(pr_labels) or config.pr_defaults.labels,
+        reviewers=cmd_options.split_csv(pr_reviewers) or config.pr_defaults.reviewers,
+        assignees=cmd_options.split_csv(pr_assignees) or config.pr_defaults.assignees,
     )
 
     destinations = config.destinations
@@ -205,8 +175,8 @@ def copy(
     total_changes = 0
     for dest in destinations:
         try:
-            with capture_sync_log(dest.name) as log_path:
-                changes = _sync_destination(config, dest, src_root, current_sha, src_repo_url, opts, log_path)
+            with capture_log(dest.name) as read_log:
+                changes = _sync_destination(config, dest, src_root, current_sha, src_repo_url, opts, read_log)
             total_changes += changes
         except Exception as e:
             logger.error(f"Failed to sync {dest.name}: {e}")
@@ -225,7 +195,7 @@ def _sync_destination(
     current_sha: str,
     src_repo_url: str,
     opts: CopyOptions,
-    log_path: Path,
+    read_log: Callable[[], str],
 ) -> int:
     dest_root = (src_root / dest.dest_path_relative).resolve()
 
@@ -235,23 +205,14 @@ def _sync_destination(
     dest_repo = _ensure_dest_repo(dest, dest_root, opts.dry_run)
     copy_branch = dest.resolved_copy_branch(config.name)
 
-    # --no-checkout means "I'm already on the right branch"
-    # Prompt decline means "skip git operations for this run"
-    if opts.dry_run:
-        skip_git_ops = True
-    elif opts.no_checkout:
-        skip_git_ops = False
-    elif _prompt(f"Switch {dest.name} to {copy_branch}?", opts.no_prompt):
+    # --no-checkout skips branch switching (assumes already on correct branch)
+    if not opts.no_checkout and prompt_utils.prompt_confirm(f"Switch {dest.name} to {copy_branch}?", opts.no_prompt):
         git_ops.prepare_copy_branch(
             repo=dest_repo,
             default_branch=dest.default_branch,
             copy_branch=copy_branch,
             from_default=opts.checkout_from_default,
         )
-        skip_git_ops = False
-    else:
-        skip_git_ops = True
-
     result = _sync_paths(config, dest, src_root, dest_root, opts)
     _print_sync_summary(dest, result)
 
@@ -259,10 +220,29 @@ def _sync_destination(
         logger.info(f"{dest.name}: No changes")
         return 0
 
-    if skip_git_ops:
-        return result.total
+    # --skip-commit and --dry-run skip commit; otherwise prompt
+    should_skip_commit = opts.skip_commit or opts.dry_run
+    if not should_skip_commit and prompt_utils.prompt_confirm(f"Commit changes to {dest.name}?", opts.no_prompt):
+        sync_commit_msg = f"chore: sync {config.name} from {current_sha[:8]}"
+        git_ops.commit_changes(dest_repo, sync_commit_msg)
+
+    verify_result = VerifyResult()
+    effective_verify = dest.resolve_verify(config.verify)
+    if not opts.skip_verify and effective_verify.steps:
+        verify_result = verify.run_verify_steps(
+            dest_repo, dest_root, effective_verify, dry_run=opts.dry_run, skip_commit=opts.skip_commit
+        )
+        verify.log_verify_summary(dest.name, verify_result)
+
+        if verify_result.status == VerifyStatus.FAILED:
+            logger.error(f"{dest.name}: Verification failed, stopping")
+            raise typer.Exit(EXIT_ERROR)
+
+        if verify_result.status == VerifyStatus.SKIPPED:
+            logger.warning(f"{dest.name}: Verification skipped due to failure")
+            return result.total
 
-    _commit_and_pr(config, dest_repo, dest_root, dest, current_sha, src_repo_url, opts, log_path)
+    _push_and_pr(config, dest_repo, dest_root, dest, current_sha, src_repo_url, opts, read_log, verify_result)
     return result.total
 
 
@@ -303,6 +283,7 @@ def _sync_paths(
             config.name,
             opts.dry_run,
             opts.force_overwrite,
+            config.wrap_synced_files,
         )
         result.content_changes += changes
         result.synced_paths.update(paths)
@@ -353,10 +334,12 @@ def _sync_path(
     config_name: str,
     dry_run: bool,
     force_overwrite: bool,
+    wrap_synced_files: bool = False,
 ) -> tuple[int, set[Path]]:
     changes = 0
     synced: set[Path] = set()
 
+    should_wrap = mapping.should_wrap(wrap_synced_files)
     for src_path, dest_key, dest_path in _iter_sync_files(mapping, src_root, dest_root):
         if dest.is_skipped(dest_key):
             continue
@@ -369,6 +352,7 @@ def _sync_path(
             mapping.sync_mode,
             dry_run,
             force_overwrite,
+            should_wrap,
         )
         synced.add(dest_path)
 
@@ -384,6 +368,7 @@ def _copy_file(
     sync_mode: SyncMode,
     dry_run: bool,
     force_overwrite: bool = False,
+    should_wrap: bool = False,
 ) -> int:
     try:
         src_content = header.remove_header(src.read_text())
@@ -397,7 +382,7 @@ def _copy_file(
             return _handle_replace(src_content, dest_path, dry_run)
         case SyncMode.SYNC:
             skip_list = dest.skip_sections.get(dest_key, [])
-            return _handle_sync(src_content, dest_path, skip_list, config_name, dry_run, force_overwrite)
+            return _handle_sync(src_content, dest_path, skip_list, config_name, dry_run, force_overwrite, should_wrap)
 
 
 def _copy_binary_file(src: Path, dest_path: Path, sync_mode: SyncMode, dry_run: bool) -> int:
@@ -441,10 +426,15 @@ def _handle_sync(
     config_name: str,
     dry_run: bool,
     force_overwrite: bool,
+    should_wrap: bool = False,
 ) -> int:
     if sections.has_sections(src_content, dest_path):
         return _handle_sync_sections(src_content, dest_path, skip_list, config_name, dry_run, force_overwrite)
 
+    if should_wrap:
+        wrapped = sections.wrap_in_synced_section(src_content, dest_path)
+        return _handle_sync_sections(wrapped, dest_path, skip_list, config_name, dry_run, force_overwrite)
+
     if dest_path.exists():
         existing = dest_path.read_text()
         has_hdr = header.has_header(existing)
@@ -475,7 +465,7 @@ def _handle_sync_sections(
     dry_run: bool,
     force_overwrite: bool,
 ) -> int:
-    src_sections = sections.extract_sections(src_content, dest_path)
+    src_sections = sections.parse_sections(src_content, dest_path)
 
     if dest_path.exists():
         existing = dest_path.read_text()
@@ -484,6 +474,9 @@ def _handle_sync_sections(
             return 0
         dest_body = header.remove_header(existing)
         new_body = sections.replace_sections(dest_body, src_sections, dest_path, skip_list)
+    elif skip_list:
+        filtered = [s for s in src_sections if s.id not in skip_list]
+        new_body = sections.build_sections_content(filtered, dest_path)
     else:
         new_body = src_content
 
@@ -523,7 +516,7 @@ def _find_files_with_config(dest_root: Path, config_name: str) -> list[Path]:
     return result
 
 
-def _commit_and_pr(
+def _push_and_pr(
     config: SrcConfig,
     repo,
     dest_root: Path,
@@ -531,31 +524,33 @@ def _commit_and_pr(
     sha: str,
     src_repo_url: str,
     opts: CopyOptions,
-    log_path: Path,
+    read_log: Callable[[], str],
+    verify_result: VerifyResult,
 ) -> None:
-    if opts.local:
-        logger.info("Local mode: skipping commit/push/PR")
+    if opts.skip_commit or opts.dry_run:
+        logger.info("Skipping push/PR (--skip-commit or --dry-run)")
         return
 
     copy_branch = dest.resolved_copy_branch(config.name)
 
-    if not _prompt(f"Commit changes to {dest.name}?", opts.no_prompt):
-        return
-
-    commit_msg = f"chore: sync {config.name} from {sha[:8]}"
-    git_ops.commit_changes(repo, commit_msg)
-    typer.echo(f"  Committed: {commit_msg}", err=True)
+    # Commit any remaining changes from verify steps without their own commit config
+    if git_ops.has_changes(repo):
+        if not prompt_utils.prompt_confirm(f"Commit remaining changes to {dest.name}?", opts.no_prompt):
+            return
+        commit_msg = f"chore: post-sync changes for {config.name}"
+        git_ops.commit_changes(repo, commit_msg)
+        typer.echo(f"  Committed: {commit_msg}", err=True)
 
-    if not _prompt(f"Push {dest.name} to origin?", opts.no_prompt):
+    if not prompt_utils.prompt_confirm(f"Push {dest.name} to origin?", opts.no_prompt):
         return
 
     git_ops.push_branch(repo, copy_branch, force=True)
     typer.echo(f"  Pushed: {copy_branch} (force)", err=True)
 
-    if opts.no_pr or not _prompt(f"Create PR for {dest.name}?", opts.no_prompt):
+    if opts.no_pr or not prompt_utils.prompt_confirm(f"Create PR for {dest.name}?", opts.no_prompt):
         return
 
-    sync_log = log_path.read_text() if log_path.exists() else ""
+    sync_log = read_log()
     pr_body = config.pr_defaults.format_body(
         src_repo_url=src_repo_url,
         src_sha=sha,
@@ -563,15 +558,25 @@ def _commit_and_pr(
         dest_name=dest.name,
     )
 
+    if verify_result.failures:
+        pr_body = _append_verify_warnings(pr_body, verify_result.failures)
+
     title = opts.pr_title.format(name=config.name, dest_name=dest.name)
     pr_url = git_ops.create_or_update_pr(
         dest_root,
         copy_branch,
         title,
         pr_body,
-        opts.pr_labels.split(",") if opts.pr_labels else None,
-        opts.pr_reviewers.split(",") if opts.pr_reviewers else None,
-        opts.pr_assignees.split(",") if opts.pr_assignees else None,
+        opts.labels,
+        opts.reviewers,
+        opts.assignees,
     )
     if pr_url:
         typer.echo(f"  Created PR: {pr_url}", err=True)
+
+
+def _append_verify_warnings(body: str, failures: list[StepFailure]) -> str:
+    body += "\n\n---\n## Verification Warnings\n"
+    for f in failures:
+        body += f"\n- `{f.step}` failed (exit code {f.returncode}, strategy: {f.on_fail})"
+    return body