!squash

Author: tony

src/vcspull/cli/sync.py

@@ -1,61 +1,17 @@
 import argparse
 import logging
 import sys
+import typing as t
 from copy import deepcopy
 
-import click
-import click.shell_completion
-from click.shell_completion import CompletionItem
-
 from libvcs._internal.shortcuts import create_project
 from libvcs.url import registry as url_tools
-from vcspull.types import ConfigDict
 
 from ..config import filter_repos, find_config_files, load_configs
 
 log = logging.getLogger(__name__)
 
 
-def get_repo_completions(
-    ctx: click.Context, param: click.Parameter, incomplete: str
-) -> list[CompletionItem]:
-    configs = (
-        load_configs(find_config_files(include_home=True))
-        if ctx.params["config"] is None
-        else load_configs(files=[ctx.params["config"]])
-    )
-    found_repos: list[ConfigDict] = []
-    repo_terms = [incomplete]
-
-    for repo_term in repo_terms:
-        dir, vcs_url, name = None, None, None
-        if any(repo_term.startswith(n) for n in ["./", "/", "~", "$HOME"]):
-            dir = dir
-        elif any(repo_term.startswith(n) for n in ["http", "git", "svn", "hg"]):
-            vcs_url = repo_term
-        else:
-            name = repo_term
-
-        # collect the repos from the config files
-        found_repos.extend(filter_repos(configs, dir=dir, vcs_url=vcs_url, name=name))
-    if len(found_repos) == 0:
-        found_repos = configs
-
-    return [
-        CompletionItem(o["name"])
-        for o in found_repos
-        if o["name"].startswith(incomplete)
-    ]
-
-
-def get_config_file_completions(ctx, args, incomplete):
-    return [
-        click.shell_completion.CompletionItem(c)
-        for c in find_config_files(include_home=True)
-        if str(c).startswith(incomplete)
-    ]
-
-
 def clamp(n, _min, _max):
     return max(_min, min(n, _max))
 
@@ -64,29 +20,6 @@ def clamp(n, _min, _max):
 NO_REPOS_FOR_TERM_MSG = 'No repo found in config(s) for "{name}"'
 
 
-# @click.command(name="sync")
-# @click.pass_context
-# @click.argument(
-#     "repo_terms", type=click.STRING, nargs=-1, shell_complete=get_repo_completions
-# )
-# @click.option(
-#     "config",
-#     "--config",
-#     "-c",
-#     type=click.Path(exists=True),
-#     help="Specify config",
-#     shell_complete=get_config_file_completions,
-# )
-# @click.option(
-#     "exit_on_error",
-#     "--exit-on-error",
-#     "-x",
-#     is_flag=True,
-#     default=False,
-#     help="Exit immediately when encountering an error syncing multiple repos",
-# )
-
-
 def create_sync_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     parser.add_argument("--config", "-c", help="Specify config")
     parser.add_argument("repo_terms", nargs="+", help="Specify config")
@@ -104,7 +37,9 @@ def sync(
     repo_terms,
     config,
     exit_on_error: bool,
-    parser: argparse.ArgumentParser | None = None,
+    parser: t.Optional[
+        argparse.ArgumentParser
+    ] = None,  # optional so sync can be unit tested
 ) -> None:
     if config:
         configs = load_configs([config])

tests/test_cli.py

@@ -5,7 +5,6 @@
 import pytest
 
 import yaml
-from click.testing import CliRunner
 
 from libvcs.sync.git import GitSync
 from vcspull.__about__ import __version__
@@ -209,44 +208,42 @@ def test_sync(
     expected_in_err: "ExpectedOutput",
     expected_not_in_err: "ExpectedOutput",
 ) -> None:
-    runner = CliRunner()
-    with runner.isolated_filesystem(temp_dir=tmp_path):
-        config = {
-            "~/github_projects/": {
-                "my_git_repo": {
-                    "url": f"git+file://{git_repo.dir}",
-                    "remotes": {"test_remote": f"git+file://{git_repo.dir}"},
-                },
-                "broken_repo": {
-                    "url": f"git+file://{git_repo.dir}",
-                    "remotes": {"test_remote": "git+file://non-existent-remote"},
-                },
-            }
+    config = {
+        "~/github_projects/": {
+            "my_git_repo": {
+                "url": f"git+file://{git_repo.dir}",
+                "remotes": {"test_remote": f"git+file://{git_repo.dir}"},
+            },
+            "broken_repo": {
+                "url": f"git+file://{git_repo.dir}",
+                "remotes": {"test_remote": "git+file://non-existent-remote"},
+            },
         }
-        yaml_config = config_path / ".vcspull.yaml"
-        yaml_config_data = yaml.dump(config, default_flow_style=False)
-        yaml_config.write_text(yaml_config_data, encoding="utf-8")
-
-        # CLI can sync
-        try:
-            cli(sync_args)
-        except SystemExit:
-            pass
-
-        result = capsys.readouterr()
-        output = "".join(list(result.out if expected_exit_code == 0 else result.err))
-
-        if expected_in_out is not None:
-            if isinstance(expected_in_out, str):
-                expected_in_out = [expected_in_out]
-            for needle in expected_in_out:
-                assert needle in output
-
-        if expected_not_in_out is not None:
-            if isinstance(expected_not_in_out, str):
-                expected_not_in_out = [expected_not_in_out]
-            for needle in expected_not_in_out:
-                assert needle not in output
+    }
+    yaml_config = config_path / ".vcspull.yaml"
+    yaml_config_data = yaml.dump(config, default_flow_style=False)
+    yaml_config.write_text(yaml_config_data, encoding="utf-8")
+
+    # CLI can sync
+    try:
+        cli(sync_args)
+    except SystemExit:
+        pass
+
+    result = capsys.readouterr()
+    output = "".join(list(result.out if expected_exit_code == 0 else result.err))
+
+    if expected_in_out is not None:
+        if isinstance(expected_in_out, str):
+            expected_in_out = [expected_in_out]
+        for needle in expected_in_out:
+            assert needle in output
+
+    if expected_not_in_out is not None:
+        if isinstance(expected_not_in_out, str):
+            expected_not_in_out = [expected_not_in_out]
+        for needle in expected_not_in_out:
+            assert needle not in output
 
 
 class SyncBrokenFixture(t.NamedTuple):