tests/cli(test[add]): Cover path-mode workflow

Author: tony

tests/cli/test_add.py

@@ -2,11 +2,15 @@
 
 from __future__ import annotations
 
+import argparse
+import logging
+import subprocess
 import typing as t
 
 import pytest
 
-from vcspull.cli.add import add_repo
+from vcspull.cli.add import add_repo, handle_add_command
+from vcspull.util import contract_user_home
 
 if t.TYPE_CHECKING:
     import pathlib
@@ -29,6 +33,17 @@ class AddRepoFixture(t.NamedTuple):
     expected_log_messages: list[str]
 
 
+def init_git_repo(repo_path: pathlib.Path, remote_url: str | None) -> None:
+    """Initialize a git repository with an optional origin remote."""
+    repo_path.mkdir(parents=True, exist_ok=True)
+    subprocess.run(["git", "init", "-q", str(repo_path)], check=True)
+    if remote_url:
+        subprocess.run(
+            ["git", "-C", str(repo_path), "remote", "add", "origin", remote_url],
+            check=True,
+        )
+
+
 ADD_REPO_FIXTURES: list[AddRepoFixture] = [
     AddRepoFixture(
         test_id="simple-add-default-workspace",
@@ -297,3 +312,210 @@ def test_add_repo_creates_new_file(
 
     assert "./" in config
     assert "newrepo" in config["./"]
+
+
+def test_add_repo_merges_duplicate_workspace_roots(
+    tmp_path: pathlib.Path,
+    monkeypatch: MonkeyPatch,
+    caplog: t.Any,
+) -> None:
+    """Duplicate workspace roots are merged without losing repositories."""
+    import yaml
+
+    caplog.set_level(logging.INFO)
+
+    monkeypatch.setenv("HOME", str(tmp_path))
+    monkeypatch.chdir(tmp_path)
+
+    config_file = tmp_path / ".vcspull.yaml"
+    config_file.write_text(
+        (
+            "~/study/python/:\n"
+            "  repo1:\n"
+            "    repo: git+https://example.com/repo1.git\n"
+            "~/study/python/:\n"
+            "  repo2:\n"
+            "    repo: git+https://example.com/repo2.git\n"
+        ),
+        encoding="utf-8",
+    )
+
+    add_repo(
+        name="pytest-docker",
+        url="git+https://github.com/avast/pytest-docker.git",
+        config_file_path_str=str(config_file),
+        path=str(tmp_path / "study/python/pytest-docker"),
+        workspace_root_path="~/study/python/",
+        dry_run=False,
+    )
+
+    with config_file.open() as fh:
+        merged_config = yaml.safe_load(fh)
+
+    assert "~/study/python/" in merged_config
+    repos = merged_config["~/study/python/"]
+    assert set(repos.keys()) == {"repo1", "repo2", "pytest-docker"}
+
+    assert "Merged" in caplog.text
+
+
+class PathAddFixture(t.NamedTuple):
+    """Fixture describing CLI path-mode add scenarios."""
+
+    test_id: str
+    remote_url: str | None
+    assume_yes: bool
+    prompt_response: str | None
+    dry_run: bool
+    expected_written: bool
+    expected_url_kind: str  # "remote" or "path"
+    override_name: str | None
+    expected_warning: str | None
+
+
+PATH_ADD_FIXTURES: list[PathAddFixture] = [
+    PathAddFixture(
+        test_id="path-auto-confirm",
+        remote_url="https://github.com/avast/pytest-docker",
+        assume_yes=True,
+        prompt_response=None,
+        dry_run=False,
+        expected_written=True,
+        expected_url_kind="remote",
+        override_name=None,
+        expected_warning=None,
+    ),
+    PathAddFixture(
+        test_id="path-interactive-accept",
+        remote_url="https://github.com/example/project",
+        assume_yes=False,
+        prompt_response="y",
+        dry_run=False,
+        expected_written=True,
+        expected_url_kind="remote",
+        override_name="project-alias",
+        expected_warning=None,
+    ),
+    PathAddFixture(
+        test_id="path-interactive-decline",
+        remote_url="https://github.com/example/decline",
+        assume_yes=False,
+        prompt_response="n",
+        dry_run=False,
+        expected_written=False,
+        expected_url_kind="remote",
+        override_name=None,
+        expected_warning=None,
+    ),
+    PathAddFixture(
+        test_id="path-no-remote",
+        remote_url=None,
+        assume_yes=True,
+        prompt_response=None,
+        dry_run=False,
+        expected_written=True,
+        expected_url_kind="path",
+        override_name=None,
+        expected_warning="Unable to determine git remote",
+    ),
+]
+
+
+@pytest.mark.parametrize(
+    list(PathAddFixture._fields),
+    PATH_ADD_FIXTURES,
+    ids=[fixture.test_id for fixture in PATH_ADD_FIXTURES],
+)
+def test_handle_add_command_path_mode(
+    test_id: str,
+    remote_url: str | None,
+    assume_yes: bool,
+    prompt_response: str | None,
+    dry_run: bool,
+    expected_written: bool,
+    expected_url_kind: str,
+    override_name: str | None,
+    expected_warning: str | None,
+    tmp_path: pathlib.Path,
+    monkeypatch: MonkeyPatch,
+    caplog: t.Any,
+) -> None:
+    """CLI path mode prompts and adds repositories appropriately."""
+    caplog.set_level(logging.INFO)
+
+    monkeypatch.setenv("HOME", str(tmp_path))
+    monkeypatch.chdir(tmp_path)
+
+    repo_path = tmp_path / "study/python/pytest-docker"
+    init_git_repo(repo_path, remote_url)
+
+    config_file = tmp_path / ".vcspull.yaml"
+
+    expected_input = prompt_response if prompt_response is not None else "y"
+    monkeypatch.setattr("builtins.input", lambda _: expected_input)
+
+    args = argparse.Namespace(
+        target=str(repo_path),
+        url=None,
+        override_name=override_name,
+        config=str(config_file),
+        path=None,
+        workspace_root_path=None,
+        dry_run=dry_run,
+        assume_yes=assume_yes,
+    )
+
+    handle_add_command(args)
+
+    log_output = caplog.text
+    contracted_path = contract_user_home(repo_path)
+
+    assert "Found new repository to import" in log_output
+    assert contracted_path in log_output
+
+    if dry_run:
+        assert "skipped (dry-run)" in log_output
+
+    if assume_yes:
+        assert "auto-confirm" in log_output
+
+    if expected_warning is not None:
+        assert expected_warning in log_output
+
+    repo_name = override_name or repo_path.name
+
+    if expected_written:
+        import yaml
+
+        assert config_file.exists()
+        with config_file.open(encoding="utf-8") as fh:
+            config_data = yaml.safe_load(fh)
+
+        workspace = "~/study/python/"
+        assert workspace in config_data
+        assert repo_name in config_data[workspace]
+
+        repo_entry = config_data[workspace][repo_name]
+        expected_url: str
+        if expected_url_kind == "remote" and remote_url is not None:
+            cleaned_remote = remote_url.strip()
+            expected_url = (
+                cleaned_remote
+                if cleaned_remote.startswith("git+")
+                else f"git+{cleaned_remote}"
+            )
+        else:
+            expected_url = str(repo_path)
+
+        assert repo_entry == {"repo": expected_url}
+    else:
+        if config_file.exists():
+            import yaml
+
+            with config_file.open(encoding="utf-8") as fh:
+                config_data = yaml.safe_load(fh)
+            if config_data is not None:
+                workspace = config_data.get("~/study/python/")
+                if workspace is not None:
+                    assert repo_name not in workspace
+        assert "Aborted import" in log_output