Fix: Resolve test issues and add missing imports

- Fix sync() function call to pass pathlib.Path for config parameter
- Add save_config_yaml to helpers and fix imports
- Improve test teardown to use shutil.rmtree
- Add missing pathlib import in CLI __init__.py
- Set logging level in tests for proper log capture

Author: tony

src/vcspull/cli/__init__.py

@@ -4,6 +4,7 @@
 
 import argparse
 import logging
+import pathlib
 import textwrap
 import typing as t
 from typing import overload
@@ -142,7 +143,7 @@ def cli(_args: list[str] | None = None) -> None:
             "repo_patterns": args.repo_patterns
             if hasattr(args, "repo_patterns")
             else None,
-            "config": args.config if hasattr(args, "config") else None,
+            "config": pathlib.Path(args.config) if hasattr(args, "config") and args.config else None,
             "exit_on_error": args.exit_on_error
             if hasattr(args, "exit_on_error")
             else False,

src/vcspull/cli/add_from_fs.py

@@ -10,7 +10,6 @@
 
 import yaml  # For YAML processing
 
-from vcspull.cli.add import save_config_yaml  # Re-use from add.py
 from vcspull.config import (  # Assuming these are useful
     expand_dir,
     find_home_config_files,
@@ -39,6 +38,12 @@ def get_git_origin_url(repo_path: pathlib.Path) -> str | None:
         return None
 
 
+def save_config_yaml(config_file_path: pathlib.Path, data: dict[t.Any, t.Any]) -> None:
+    """Save a dictionary to a YAML file."""
+    with open(config_file_path, "w", encoding="utf-8") as f:
+        yaml.dump(data, f, sort_keys=False, indent=2, default_flow_style=False)
+
+
 def create_add_from_fs_subparser(parser: argparse.ArgumentParser) -> None:
     """Configure :py:class:`argparse.ArgumentParser` for ``vcspull add-from-fs``."""
     parser.add_argument(

tests/cli/test_add_from_fs.py

@@ -2,15 +2,16 @@
 
 from __future__ import annotations
 
+import logging
 import pathlib
 import subprocess  # For CompletedProcess
 import typing as t
 
 import pytest
 import yaml
 
+from tests.helpers import save_config_yaml
 from vcspull.cli.add_from_fs import add_from_filesystem, get_git_origin_url
-from vcspull.tests.helpers import save_config_yaml
 
 if t.TYPE_CHECKING:
     from _pytest.logging import LogCaptureFixture
@@ -22,19 +23,13 @@
 
 @pytest.fixture(autouse=True)
 def setup_teardown_test_config_dir_fs() -> None:
+    """Set up and clean up test config directory."""
     if not TEST_CONFIG_DIR_FS.exists():
         TEST_CONFIG_DIR_FS.mkdir()
     yield
     if TEST_CONFIG_DIR_FS.exists():
-        for item in TEST_CONFIG_DIR_FS.iterdir():
-            if item.is_file():
-                item.unlink()
-            elif item.is_dir():  # Basic cleanup for dirs made by tests
-                for sub_item in item.iterdir():
-                    if sub_item.is_file():
-                        sub_item.unlink()
-                item.rmdir()
-        TEST_CONFIG_DIR_FS.rmdir()
+        import shutil
+        shutil.rmtree(TEST_CONFIG_DIR_FS)
 
 
 @pytest.fixture
@@ -166,6 +161,7 @@ def test_add_from_fs_one_repo_found_no_config_exists(
     caplog: LogCaptureFixture,
 ) -> None:
     """Test finding one repo and creating a new config file."""
+    caplog.set_level(logging.INFO)
     mock_find_home_config_files_fs.return_value = []
     scan_dir = cwd_path_fs / "projects_to_scan"
     scan_dir.mkdir(exist_ok=True)

tests/helpers.py

@@ -61,3 +61,11 @@ def write_config(config_path: pathlib.Path, content: str) -> pathlib.Path:
 def load_raw(data: str, fmt: t.Literal["yaml", "json"]) -> dict[str, t.Any]:
     """Load configuration data via string value. Accepts yaml or json."""
     return ConfigReader._load(fmt=fmt, content=data)
+
+
+def save_config_yaml(config_file_path: pathlib.Path, data: dict[t.Any, t.Any]) -> None:
+    """Save a dictionary to a YAML file."""
+    import yaml
+
+    yaml_content = yaml.dump(data, sort_keys=False, indent=2, default_flow_style=False)
+    write_config(config_file_path, yaml_content)