rhiza 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

rhiza/__main__.py

@@ -11,7 +11,7 @@ import typer
 from rhiza.cli import app
 
 
-def load_plugins(app: typer.Typer):
+def load_plugins(app: typer.Typer) -> None:
     """Load plugins from entry points."""
     # 'rhiza.plugins' matches the group we defined in rhiza-tools
     plugin_entries = entry_points(group="rhiza.plugins")

rhiza/cli.py

@@ -23,14 +23,14 @@ app = typer.Typer(
         """
         Rhiza - Manage reusable configuration templates for Python projects
 
-        \x1b]8;;https://jebel-quant.github.io/rhiza-cli/\x1b\\https://jebel-quant.github.io/rhiza-cli/\x1b]8;;\x1b\\
+        https://jebel-quant.github.io/rhiza-cli/
         """
     ),
     add_completion=True,
 )
 
 
-def version_callback(value: bool):
+def version_callback(value: bool) -> None:
     """Print version information and exit.
 
     Args:
@@ -54,7 +54,7 @@ def main(
         callback=version_callback,
         is_eager=True,
     ),
-):
+) -> None:
     """Rhiza CLI main callback.
 
     This callback is executed before any command. It handles global options
@@ -107,7 +107,7 @@ def init(
         "--template-branch",
         help="Custom template branch. Defaults to 'main'.",
     ),
-):
+) -> None:
     r"""Initialize or validate .rhiza/template.yml.
 
     Creates a default `.rhiza/template.yml` configuration file if one
@@ -157,7 +157,7 @@ def materialize(
         help="Create and checkout a new branch in the target repository for changes",
     ),
     force: bool = typer.Option(False, "--force", "-y", help="Overwrite existing files"),
-):
+) -> None:
     r"""Inject Rhiza configuration templates into a target repository.
 
     Materializes configuration files from the template repository specified
@@ -190,7 +190,7 @@ def validate(
             help="Target git repository (defaults to current directory)",
         ),
     ] = Path("."),
-):
+) -> None:
     r"""Validate Rhiza template configuration.
 
     Validates the .rhiza/template.yml file to ensure it is syntactically
@@ -227,7 +227,7 @@ def migrate(
             help="Target git repository (defaults to current directory)",
         ),
     ] = Path("."),
-):
+) -> None:
     r"""Migrate project to the new .rhiza folder structure.
 
     This command helps transition projects to use the new `.rhiza/` folder
@@ -253,7 +253,7 @@ def migrate(
 
 
 @app.command()
-def welcome():
+def welcome() -> None:
     r"""Display a friendly welcome message and explain what Rhiza is.
 
     Shows a welcome message, explains Rhiza's purpose, key features,
@@ -282,7 +282,7 @@ def uninstall(
         "-y",
         help="Skip confirmation prompt and proceed with deletion",
     ),
-):
+) -> None:
     r"""Remove all Rhiza-managed files from the repository.
 
     Reads the `.rhiza.history` file and removes all files that were
@@ -327,7 +327,7 @@ def summarise(
             help="Output file path (defaults to stdout)",
         ),
     ] = None,
-):
+) -> None:
     r"""Generate a summary of staged changes for PR descriptions.
 
     Analyzes staged git changes and generates a structured PR description

rhiza/commands/__init__.py

@@ -50,6 +50,8 @@ For more detailed usage examples and workflows, see the USAGE.md guide
 or try rhiza <command> --help
 """
 
-from .init import init  # noqa: F401
-from .materialize import materialize  # noqa: F401
-from .validate import validate  # noqa: F401
+from .init import init
+from .materialize import materialize
+from .validate import validate
+
+__all__ = ["init", "materialize", "validate"]

rhiza/commands/init.py

@@ -81,7 +81,7 @@ def _prompt_git_host() -> str:
         git_host = "github"
         logger.debug("Non-interactive mode detected, defaulting to github")
 
-    return git_host
+    return str(git_host)
 
 
 def _get_include_paths_for_host(git_host: str) -> list[str]:
@@ -263,7 +263,7 @@ def init(
     git_host: str | None = None,
     template_repository: str | None = None,
     template_branch: str | None = None,
-):
+) -> bool:
     """Initialize or validate .rhiza/template.yml in the target repository.
 
     Creates a default .rhiza/template.yml file if it doesn't exist,

rhiza/commands/materialize.py

@@ -20,6 +20,22 @@ from rhiza.models import RhizaTemplate
 from rhiza.subprocess_utils import get_git_executable
 
 
+def _log_git_stderr_errors(stderr: str | None) -> None:
+    """Extract and log only relevant error messages from git stderr.
+
+    Args:
+        stderr: Git command stderr output.
+    """
+    if stderr:
+        # Extract relevant error message from git stderr
+        stderr_lines = stderr.strip().split("\n")
+        # Show only the most relevant error lines, skip verbose git output
+        for line in stderr_lines:
+            line = line.strip()
+            if line and (line.startswith("fatal:") or line.startswith("error:")):
+                logger.error(line)
+
+
 def _handle_target_branch(
     target: Path, target_branch: str | None, git_executable: str, git_env: dict[str, str]
 ) -> None:
@@ -52,6 +68,8 @@ def _handle_target_branch(
                 [git_executable, "checkout", target_branch],
                 cwd=target,
                 check=True,
+                capture_output=True,
+                text=True,
                 env=git_env,
             )
         else:
@@ -61,10 +79,14 @@ def _handle_target_branch(
                 [git_executable, "checkout", "-b", target_branch],
                 cwd=target,
                 check=True,
+                capture_output=True,
+                text=True,
                 env=git_env,
             )
     except subprocess.CalledProcessError as e:
-        logger.error(f"Failed to create/checkout branch '{target_branch}': {e}")
+        logger.error(f"Failed to create/checkout branch '{target_branch}'")
+        _log_git_stderr_errors(e.stderr)
+        logger.error("Please ensure you have no uncommitted changes or conflicts")
         sys.exit(1)
 
 
@@ -91,6 +113,9 @@ def _validate_and_load_template(target: Path, branch: str) -> tuple[RhizaTemplat
 
     # Extract template configuration settings
     rhiza_repo = template.template_repository
+    if not rhiza_repo:
+        logger.error("template-repository is not configured in template.yml")
+        raise RuntimeError("template-repository is required")  # noqa: TRY003
     rhiza_branch = template.template_branch or branch
     include_paths = template.include
     excluded_paths = template.exclude
@@ -181,11 +206,13 @@ def _clone_template_repository(
         )
         logger.debug("Git clone completed successfully")
     except subprocess.CalledProcessError as e:
-        logger.error(f"Failed to clone repository: {e}")
-        if e.stderr:
-            logger.error(f"Git error: {e.stderr.strip()}")
-        logger.error(f"Check that the repository exists and branch '{rhiza_branch}' is valid")
-        raise
+        logger.error(f"Failed to clone repository from {git_url}")
+        _log_git_stderr_errors(e.stderr)
+        logger.error("Please check that:")
+        logger.error("  - The repository exists and is accessible")
+        logger.error(f"  - Branch '{rhiza_branch}' exists in the repository")
+        logger.error("  - You have network access to the git hosting service")
+        sys.exit(1)
 
     # Initialize sparse checkout in cone mode
     try:
@@ -200,10 +227,9 @@ def _clone_template_repository(
         )
         logger.debug("Sparse checkout initialized")
     except subprocess.CalledProcessError as e:
-        logger.error(f"Failed to initialize sparse checkout: {e}")
-        if e.stderr:
-            logger.error(f"Git error: {e.stderr.strip()}")
-        raise
+        logger.error("Failed to initialize sparse checkout")
+        _log_git_stderr_errors(e.stderr)
+        sys.exit(1)
 
     # Set sparse checkout paths
     try:
@@ -218,10 +244,9 @@ def _clone_template_repository(
         )
         logger.debug("Sparse checkout paths configured")
     except subprocess.CalledProcessError as e:
-        logger.error(f"Failed to set sparse checkout paths: {e}")
-        if e.stderr:
-            logger.error(f"Git error: {e.stderr.strip()}")
-        raise
+        logger.error("Failed to configure sparse checkout paths")
+        _log_git_stderr_errors(e.stderr)
+        sys.exit(1)
 
 
 def _copy_files_to_target(

rhiza/commands/summarise.py

@@ -46,7 +46,7 @@ def get_staged_changes(repo_path: Path) -> dict[str, list[str]]:
     Returns:
         Dictionary with keys 'added', 'modified', 'deleted' containing file lists
     """
-    changes = {
+    changes: dict[str, list[str]] = {
         "added": [],
         "modified": [],
         "deleted": [],

rhiza/commands/validate.py

@@ -5,8 +5,9 @@ This module provides functionality to validate template.yml files in the
 """
 
 from pathlib import Path
+from typing import Any
 
-import yaml
+import yaml  # type: ignore[import-untyped]
 from loguru import logger
 
 
@@ -98,7 +99,7 @@ def _check_template_file_exists(target: Path) -> tuple[bool, Path]:
     return True, template_file
 
 
-def _parse_yaml_file(template_file: Path) -> tuple[bool, dict | None]:
+def _parse_yaml_file(template_file: Path) -> tuple[bool, dict[str, Any] | None]:
     """Parse YAML file and return configuration.
 
     Args:
@@ -125,7 +126,7 @@ def _parse_yaml_file(template_file: Path) -> tuple[bool, dict | None]:
     return True, config
 
 
-def _validate_required_fields(config: dict) -> bool:
+def _validate_required_fields(config: dict[str, Any]) -> bool:
     """Validate required fields exist and have correct types.
 
     Args:
@@ -159,7 +160,7 @@ def _validate_required_fields(config: dict) -> bool:
     return validation_passed
 
 
-def _validate_repository_format(config: dict) -> bool:
+def _validate_repository_format(config: dict[str, Any]) -> bool:
     """Validate template-repository format.
 
     Args:
@@ -186,7 +187,7 @@ def _validate_repository_format(config: dict) -> bool:
         return True
 
 
-def _validate_include_paths(config: dict) -> bool:
+def _validate_include_paths(config: dict[str, Any]) -> bool:
     """Validate include paths.
 
     Args:
@@ -218,7 +219,7 @@ def _validate_include_paths(config: dict) -> bool:
         return True
 
 
-def _validate_optional_fields(config: dict) -> None:
+def _validate_optional_fields(config: dict[str, Any]) -> None:
     """Validate optional fields if present.
 
     Args:

rhiza/commands/welcome.py

@@ -10,7 +10,7 @@ and explains what Rhiza is and how it can help manage configuration templates.
 from rhiza import __version__
 
 
-def welcome():
+def welcome() -> None:
     """Display a welcome message and explain what Rhiza is.
 
     Shows a friendly greeting, explains Rhiza's purpose, and provides

rhiza/models.py

@@ -7,12 +7,13 @@ YAML parsing.
 
 from dataclasses import dataclass, field
 from pathlib import Path
+from typing import Any
 
-import yaml
+import yaml  # type: ignore[import-untyped]
 
 
 def _normalize_to_list(value: str | list[str] | None) -> list[str]:
-    """Convert a value to a list of strings.
+    r"""Convert a value to a list of strings.
 
     Handles the case where YAML multi-line strings (using |) are parsed as
     a single string instead of a list. Splits the string by newlines and
@@ -23,6 +24,20 @@ def _normalize_to_list(value: str | list[str] | None) -> list[str]:
 
     Returns:
         A list of strings. Empty list if value is None or empty.
+
+    Examples:
+        >>> _normalize_to_list(None)
+        []
+        >>> _normalize_to_list([])
+        []
+        >>> _normalize_to_list(['a', 'b', 'c'])
+        ['a', 'b', 'c']
+        >>> _normalize_to_list('single line')
+        ['single line']
+        >>> _normalize_to_list('line1\\n' + 'line2\\n' + 'line3')
+        ['line1', 'line2', 'line3']
+        >>> _normalize_to_list('  item1  \\n' + '  item2  ')
+        ['item1', 'item2']
     """
     if value is None:
         return []
@@ -30,7 +45,14 @@ def _normalize_to_list(value: str | list[str] | None) -> list[str]:
         return value
     if isinstance(value, str):
         # Split by newlines and filter out empty strings
-        return [item.strip() for item in value.strip().split("\n") if item.strip()]
+        # Handle both actual newlines (\n) and literal backslash-n (\\n)
+        if "\\n" in value and "\n" not in value:
+            # Contains literal \n but not actual newlines
+            items = value.split("\\n")
+        else:
+            # Contains actual newlines or neither
+            items = value.split("\n")
+        return [item.strip() for item in items if item.strip()]
     return []
 
 
@@ -94,7 +116,7 @@ class RhizaTemplate:
         file_path.parent.mkdir(parents=True, exist_ok=True)
 
         # Convert to dictionary with YAML-compatible keys
-        config = {}
+        config: dict[str, Any] = {}
 
         # Only include template-repository if it's not None
         if self.template_repository:

{rhiza-0.9.0.dist-info → rhiza-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhiza
-Version: 0.9.0
+Version: 0.9.1
 Summary: Reusable configuration templates for modern Python projects
 Project-URL: Homepage, https://github.com/jebel-quant/rhiza-cli
 Project-URL: Repository, https://github.com/jebel-quant/rhiza-cli

rhiza-0.9.1.dist-info/RECORD

@@ -0,0 +1,21 @@
+rhiza/__init__.py,sha256=4-Dy7AKbJneQNBfv30WhSsUin4y-g4Yp4veO6-YdjVg,1926
+rhiza/__main__.py,sha256=GlTahVC8F6fKEpMw_nZyhp4PB-fyC9UQ_RjTZcpD9P4,837
+rhiza/cli.py,sha256=y2qzFbrd29-j5OXslM96hZB9vDLvLv5FBnR9SnDdQWE,10613
+rhiza/models.py,sha256=39oWJM13D_5FupCFUguiB8VMe5Mk4O8CPEpjPftNUjs,5039
+rhiza/subprocess_utils.py,sha256=Pr5TysIKP76hc64fmqhTd6msMGn5DU43hOSR_v_GFb8,745
+rhiza/_templates/basic/__init__.py.jinja2,sha256=gs8qN4LAKcdFd6iO9gZVLuVetODmZP_TGuEjWrbinC0,27
+rhiza/_templates/basic/main.py.jinja2,sha256=uTCahxf9Bftao1IghHue4cSZ9YzBYmBEXeIhEmK9UXQ,362
+rhiza/_templates/basic/pyproject.toml.jinja2,sha256=Mizpnnd_kFQd-pCWOxG-KWhvg4_ZhZaQppTt2pz0WOc,695
+rhiza/commands/__init__.py,sha256=DV1nlcXxeeHXmHobVcfOsGeiZBZ55Xz1mud073AXDGc,1839
+rhiza/commands/init.py,sha256=4pjNblghF8zFxKJUfw_wA5Ne_xKbovHR7iPxOPQ8zHg,9798
+rhiza/commands/materialize.py,sha256=f6B6luANF089Wn4WzXq7V6oGeFdV6UiMY_-JxUyNfwQ,19741
+rhiza/commands/migrate.py,sha256=A5t4nw7CrdtILCwuSoAqtmM0LpMK8KmX87gzlNgi7fQ,7522
+rhiza/commands/summarise.py,sha256=vgc7M3dwuGjUuVs3XKQr2_g3qURnQH_R3eFoSSrnOro,11758
+rhiza/commands/uninstall.py,sha256=6oO7kdv11Bq4JXjrBg9rsFtoRgttQ4m30zGr6NhZrkQ,7479
+rhiza/commands/validate.py,sha256=z3ePMPYm2nYOYSxbVNWVU4cz52MNjCIz8ChAMnCsIes,10906
+rhiza/commands/welcome.py,sha256=VknKaUh-bD6dM-zcD1eP4H-D_npyezpfF3bTSl_0Dio,2383
+rhiza-0.9.1.dist-info/METADATA,sha256=5gMfSF0HgsGGEpE2IlblyWJwXxdzjzAZt6-rzExvkQk,26298
+rhiza-0.9.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+rhiza-0.9.1.dist-info/entry_points.txt,sha256=NAwZUpbXvfKv50a_Qq-PxMHl3lcjAyZO63IBeuUNgfY,45
+rhiza-0.9.1.dist-info/licenses/LICENSE,sha256=4m5X7LhqX-6D0Ks79Ys8CLpmza8cxDG34g4S9XSNAGY,1077
+rhiza-0.9.1.dist-info/RECORD,,

rhiza-0.9.0.dist-info/RECORD

@@ -1,21 +0,0 @@
-rhiza/__init__.py,sha256=4-Dy7AKbJneQNBfv30WhSsUin4y-g4Yp4veO6-YdjVg,1926
-rhiza/__main__.py,sha256=Q02upTGaJceknkDABdCwq5_vdMdGY8Cg3ej6WZIHs_s,829
-rhiza/cli.py,sha256=uU0tenEgTe0Wz5lIj0SZIeXy5n_9-8xtUMMP_i71CWA,10609
-rhiza/models.py,sha256=f4TT3XPMEE7ciyrpsXllje4eGJRkYOgpZOoFeRC-rVI,4225
-rhiza/subprocess_utils.py,sha256=Pr5TysIKP76hc64fmqhTd6msMGn5DU43hOSR_v_GFb8,745
-rhiza/_templates/basic/__init__.py.jinja2,sha256=gs8qN4LAKcdFd6iO9gZVLuVetODmZP_TGuEjWrbinC0,27
-rhiza/_templates/basic/main.py.jinja2,sha256=uTCahxf9Bftao1IghHue4cSZ9YzBYmBEXeIhEmK9UXQ,362
-rhiza/_templates/basic/pyproject.toml.jinja2,sha256=Mizpnnd_kFQd-pCWOxG-KWhvg4_ZhZaQppTt2pz0WOc,695
-rhiza/commands/__init__.py,sha256=QWEEVvdW3gKV-FpKgHRJL_H8FpQqvfck9JvnFMDz3gY,1834
-rhiza/commands/init.py,sha256=dpLwFbURyndkgw-v4O6gD0gg6ov6q023uOmaWGup2oA,9785
-rhiza/commands/materialize.py,sha256=1YmzlPz9-IxnV4znDZQijZ3cjfbBXdepmps963z4Hsg,18668
-rhiza/commands/migrate.py,sha256=A5t4nw7CrdtILCwuSoAqtmM0LpMK8KmX87gzlNgi7fQ,7522
-rhiza/commands/summarise.py,sha256=KJ8v4lHSbn8AIt3tJM_lSCizzZ2Bv2mqTfI0z7-kyxI,11736
-rhiza/commands/uninstall.py,sha256=6oO7kdv11Bq4JXjrBg9rsFtoRgttQ4m30zGr6NhZrkQ,7479
-rhiza/commands/validate.py,sha256=VriXJxyuhvGJajw0qiAUmXYKRMbpgKiZ5_MMtE6WlSo,10801
-rhiza/commands/welcome.py,sha256=u197cIlY1tXm-CN6YpyUX4Eq06pLeV0hGyNvT35tE8U,2375
-rhiza-0.9.0.dist-info/METADATA,sha256=6AIK6bVC54vxBE0NB9jdLkBuTUcn9W0jod6ixm1-EB0,26298
-rhiza-0.9.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-rhiza-0.9.0.dist-info/entry_points.txt,sha256=NAwZUpbXvfKv50a_Qq-PxMHl3lcjAyZO63IBeuUNgfY,45
-rhiza-0.9.0.dist-info/licenses/LICENSE,sha256=4m5X7LhqX-6D0Ks79Ys8CLpmza8cxDG34g4S9XSNAGY,1077
-rhiza-0.9.0.dist-info/RECORD,,