style: Apply ruff linting and formatting fixes

Applied automatic fixes from ruff including:
- Remove unused variables and replace with underscore prefix
- Fix import ordering
- Remove trailing whitespace
- Add trailing commas
- Fix type annotation formatting
- Simplify conditional logic

Author: tony

src/vcspull/cli/fmt.py

@@ -56,17 +56,16 @@ def normalize_repo_config(repo_data: t.Any) -> dict[str, t.Any]:
     if isinstance(repo_data, str):
         # Convert compact format to verbose format
         return {"repo": repo_data}
-    elif isinstance(repo_data, dict):
+    if isinstance(repo_data, dict):
         # If it has 'url' key but not 'repo', convert to use 'repo'
         if "url" in repo_data and "repo" not in repo_data:
             normalized = repo_data.copy()
             normalized["repo"] = normalized.pop("url")
             return normalized
         # Already in correct format or has other fields
         return repo_data
-    else:
-        # Return as-is for other types
-        return t.cast(dict[str, t.Any], repo_data)
+    # Return as-is for other types
+    return t.cast("dict[str, t.Any]", repo_data)
 
 
 def format_config(config_data: dict[str, t.Any]) -> tuple[dict[str, t.Any], int]:
@@ -202,7 +201,7 @@ def format_single_config(
 
     for directory, repos in raw_config.items():
         if isinstance(repos, dict):
-            for repo_name, repo_data in repos.items():
+            for repo_data in repos.values():
                 if isinstance(repo_data, str):
                     compact_to_verbose += 1
                 elif isinstance(repo_data, dict):
@@ -273,7 +272,7 @@ def format_single_config(
             Fore.CYAN,
             Style.RESET_ALL,
         )
-    
+
     return True
 
 
@@ -296,25 +295,25 @@ def format_config_file(
     if format_all:
         # Format all discovered config files
         config_files = find_config_files(include_home=True)
-        
+
         # Also check for local .vcspull.yaml
         local_yaml = pathlib.Path.cwd() / ".vcspull.yaml"
         if local_yaml.exists() and local_yaml not in config_files:
             config_files.append(local_yaml)
-        
+
         # Also check for local .vcspull.json
         local_json = pathlib.Path.cwd() / ".vcspull.json"
         if local_json.exists() and local_json not in config_files:
             config_files.append(local_json)
-        
+
         if not config_files:
             log.error(
                 "%s✗%s No configuration files found.",
                 Fore.RED,
                 Style.RESET_ALL,
             )
             return
-        
+
         log.info(
             "%si%s Found %s%d%s configuration %s to format:",
             Fore.CYAN,
@@ -324,7 +323,7 @@ def format_config_file(
             Style.RESET_ALL,
             "file" if len(config_files) == 1 else "files",
         )
-        
+
         for config_file in config_files:
             log.info(
                 "  %s•%s %s%s%s",
@@ -334,14 +333,14 @@ def format_config_file(
                 config_file,
                 Style.RESET_ALL,
             )
-        
+
         log.info("")  # Empty line for readability
-        
+
         success_count = 0
         for config_file in config_files:
             if format_single_config(config_file, write):
                 success_count += 1
-        
+
         # Summary
         if success_count == len(config_files):
             log.info(
@@ -385,5 +384,5 @@ def format_config_file(
                 return
             else:
                 config_file_path = home_configs[0]
-        
+
         format_single_config(config_file_path, write)

tests/cli/test_fmt.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import logging
-import pathlib
 import typing as t
 
 import pytest
@@ -12,6 +11,8 @@
 from vcspull.cli.fmt import format_config, format_config_file, normalize_repo_config
 
 if t.TYPE_CHECKING:
+    import pathlib
+
     from _pytest.logging import LogCaptureFixture
 
 
@@ -31,9 +32,9 @@ def reset_logging() -> t.Generator[None, None, None]:
         logger = logging.getLogger(logger_name)
         logger.handlers.clear()
         logger.propagate = True  # Re-enable propagation so pytest can capture logs
-    
+
     yield
-    
+
     # Clear again after test
     for logger_name in cli_loggers:
         logger = logging.getLogger(logger_name)
@@ -107,7 +108,7 @@ def test_sort_repositories(self) -> None:
                 "zebra": "url1",
                 "alpha": "url2",
                 "beta": "url3",
-            }
+            },
         }
         formatted, changes = format_config(config)
         assert list(formatted["~/projects/"].keys()) == ["alpha", "beta", "zebra"]
@@ -120,21 +121,21 @@ def test_compact_format_conversion(self) -> None:
                 "repo1": "git+https://github.com/user/repo1.git",
                 "repo2": {"url": "git+https://github.com/user/repo2.git"},
                 "repo3": {"repo": "git+https://github.com/user/repo3.git"},
-            }
+            },
         }
         formatted, changes = format_config(config)
 
         # repo1 should be converted from compact to verbose
         assert formatted["~/projects/"]["repo1"] == {
-            "repo": "git+https://github.com/user/repo1.git"
+            "repo": "git+https://github.com/user/repo1.git",
         }
         # repo2 should have url converted to repo
         assert formatted["~/projects/"]["repo2"] == {
-            "repo": "git+https://github.com/user/repo2.git"
+            "repo": "git+https://github.com/user/repo2.git",
         }
         # repo3 should stay the same
         assert formatted["~/projects/"]["repo3"] == {
-            "repo": "git+https://github.com/user/repo3.git"
+            "repo": "git+https://github.com/user/repo3.git",
         }
         assert changes == 2  # repo1 and repo2 changed
 
@@ -362,40 +363,42 @@ def test_format_all_configs(
         # Create test config directory structure
         config_dir = tmp_path / ".config" / "vcspull"
         config_dir.mkdir(parents=True)
-        
+
         # Create home config (already formatted correctly)
         home_config = tmp_path / ".vcspull.yaml"
         home_config.write_text(
             yaml.dump({"~/projects/": {"repo1": {"repo": "url1"}}}),
             encoding="utf-8",
         )
-        
+
         # Create config in config directory (needs sorting)
         config1 = config_dir / "work.yaml"
         config1_content = """~/work/:
   repo2: url2
   repo1: url1
 """
         config1.write_text(config1_content, encoding="utf-8")
-        
+
         # Create local config
         local_config = tmp_path / "project" / ".vcspull.yaml"
         local_config.parent.mkdir()
         local_config.write_text(
             yaml.dump({"./": {"repo3": {"url": "url3"}}}),
             encoding="utf-8",
         )
-        
+
         # Mock find functions to return our test configs
         def mock_find_config_files(include_home: bool = False) -> list[pathlib.Path]:
             files = [config1]
             if include_home:
                 files.insert(0, home_config)
             return files
-        
-        def mock_find_home_config_files(filetype: list[str] | None = None) -> list[pathlib.Path]:
+
+        def mock_find_home_config_files(
+            filetype: list[str] | None = None,
+        ) -> list[pathlib.Path]:
             return [home_config]
-        
+
         # Change to project directory
         monkeypatch.chdir(local_config.parent)
         monkeypatch.setattr(
@@ -406,19 +409,21 @@ def mock_find_home_config_files(filetype: list[str] | None = None) -> list[pathl
             "vcspull.cli.fmt.find_home_config_files",
             mock_find_home_config_files,
         )
-        
+
         with caplog.at_level(logging.INFO):
             format_config_file(None, write=False, format_all=True)
-        
+
         # Check that all configs were found
         assert "Found 3 configuration files to format" in caplog.text
         assert str(home_config) in caplog.text
         assert str(config1) in caplog.text
         assert str(local_config) in caplog.text
-        
+
         # Check processing messages
         assert "already formatted correctly" in caplog.text  # home_config
-        assert "3 formatting issues" in caplog.text  # config1 has 2 compact + needs sorting
+        assert (
+            "3 formatting issues" in caplog.text
+        )  # config1 has 2 compact + needs sorting
         assert "2 repositories from compact to verbose format" in caplog.text  # config1
         assert "Repositories in ~/work/ will be sorted" in caplog.text  # config1
         assert "1 repository from 'url' to 'repo' key" in caplog.text  # local_config