rhiza 0.5.2__tar.gz → 0.5.3__tar.gz

{rhiza-0.5.2 → rhiza-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhiza
-Version: 0.5.2
+Version: 0.5.3
 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.5.2 → rhiza-0.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rhiza"
-version = "0.5.2"
+version = "0.5.3"
 description = "Reusable configuration templates for modern Python projects"
 readme = "README.md"
 requires-python = ">=3.11"

{rhiza-0.5.2 → rhiza-0.5.3}/src/rhiza/__init__.py

@@ -4,4 +4,12 @@ This package groups small, user-facing utilities that can be invoked from
 the command line or other automation scripts.
 """
 
+from importlib.metadata import PackageNotFoundError, version
+
+try:
+    __version__ = version("rhiza")
+except PackageNotFoundError:
+    # Package is not installed, use a fallback version
+    __version__ = "0.0.0+dev"
+
 __all__ = ["commands", "models"]

{rhiza-0.5.2 → rhiza-0.5.3}/src/rhiza/cli.py

@@ -8,6 +8,7 @@ from pathlib import Path
 
 import typer
 
+from rhiza import __version__
 from rhiza.commands import init as init_cmd
 from rhiza.commands import materialize as materialize_cmd
 from rhiza.commands import validate as validate_cmd
@@ -18,6 +19,41 @@ app = typer.Typer(
 )
 
 
+def version_callback(value: bool):
+    """Print version information and exit.
+
+    Args:
+        value: Whether the --version flag was provided.
+
+    Raises:
+        typer.Exit: Always exits after printing version.
+    """
+    if value:
+        typer.echo(f"rhiza version {__version__}")
+        raise typer.Exit()
+
+
+@app.callback()
+def main(
+    version: bool = typer.Option(
+        False,
+        "--version",
+        "-v",
+        help="Show version and exit",
+        callback=version_callback,
+        is_eager=True,
+    ),
+):
+    """Rhiza CLI main callback.
+
+    This callback is executed before any command. It handles global options
+    like --version.
+
+    Args:
+        version: Version flag (handled by callback).
+    """
+
+
 @app.command()
 def init(
     target: Path = typer.Argument(

{rhiza-0.5.2 → rhiza-0.5.3}/src/rhiza/commands/init.py

@@ -61,4 +61,4 @@ Next steps:
 """)
 
     # the template file exists, so validate it
-    validate(target)
+    return validate(target)

{rhiza-0.5.2 → rhiza-0.5.3}/src/rhiza/commands/materialize.py

@@ -1,5 +1,14 @@
+"""Command for materializing Rhiza template files into a repository.
+
+This module implements the `materialize` command. It performs a sparse
+checkout of the configured template repository, copies the selected files
+into the target Git repository, and records managed files in
+`.rhiza.history`. Use this to take a one-shot snapshot of template files.
+"""
+
 import shutil
 import subprocess
+import sys
 import tempfile
 from pathlib import Path
 
@@ -43,7 +52,11 @@ def materialize(target: Path, branch: str, force: bool) -> None:
     # -----------------------
     # Ensure Rhiza is initialized
     # -----------------------
-    init(target)
+    valid = init(target)
+
+    if not valid:
+        logger.error(f"Rhiza template is invalid. {target}")
+        sys.exit(1)
 
     template_file = target / ".github" / "template.yml"
     template = RhizaTemplate.from_yaml(template_file)
@@ -73,10 +86,12 @@ def materialize(target: Path, branch: str, force: bool) -> None:
             [
                 "git",
                 "clone",
-                "--depth", "1",
+                "--depth",
+                "1",
                 "--filter=blob:none",
                 "--sparse",
-                "--branch", rhiza_branch,
+                "--branch",
+                rhiza_branch,
                 f"https://github.com/{rhiza_repo}.git",
                 str(tmp_dir),
             ],
@@ -101,15 +116,9 @@ def materialize(target: Path, branch: str, force: bool) -> None:
         # -----------------------
         all_files = expand_paths(tmp_dir, include_paths)
 
-        excluded_files = {
-            f.resolve()
-            for f in expand_paths(tmp_dir, excluded_paths)
-        }
+        excluded_files = {f.resolve() for f in expand_paths(tmp_dir, excluded_paths)}
 
-        files_to_copy = [
-            f for f in all_files
-            if f.resolve() not in excluded_files
-        ]
+        files_to_copy = [f for f in all_files if f.resolve() not in excluded_files]
 
         # -----------------------
         # Copy files into target repo
@@ -121,9 +130,7 @@ def materialize(target: Path, branch: str, force: bool) -> None:
             materialized_files.append(relative_path)
 
             if dst_file.exists() and not force:
-                logger.warning(
-                    f"{relative_path} already exists — use --force to overwrite"
-                )
+                logger.warning(f"{relative_path} already exists — use --force to overwrite")
                 continue
 
             dst_file.parent.mkdir(parents=True, exist_ok=True)
@@ -136,10 +143,7 @@ def materialize(target: Path, branch: str, force: bool) -> None:
     # -----------------------
     # Warn about workflow files
     # -----------------------
-    workflow_files = [
-        p for p in materialized_files
-        if p.parts[:2] == (".github", "workflows")
-    ]
+    workflow_files = [p for p in materialized_files if p.parts[:2] == (".github", "workflows")]
 
     if workflow_files:
         logger.warning(
@@ -161,10 +165,7 @@ def materialize(target: Path, branch: str, force: bool) -> None:
         for file_path in sorted(materialized_files):
             f.write(f"{file_path}\n")
 
-    logger.info(
-        f"Created {history_file.relative_to(target)} "
-        f"with {len(materialized_files)} files"
-    )
+    logger.info(f"Created {history_file.relative_to(target)} with {len(materialized_files)} files")
 
     logger.success("Rhiza templates materialized successfully")
 

{rhiza-0.5.2 → rhiza-0.5.3}/src/rhiza/commands/validate.py

@@ -133,4 +133,5 @@ def validate(target: Path) -> bool:
         return True
     else:
         logger.error("✗ Validation failed: template.yml has errors")
+        # raise AssertionError("Invalid template.yml")
         return False

{rhiza-0.5.2 → rhiza-0.5.3}/tests/test_cli_commands.py

@@ -9,12 +9,35 @@ This module tests:
 import subprocess
 import sys
 
+from rhiza import __version__
 from rhiza.commands.materialize import expand_paths
 
 
 class TestCliApp:
     """Tests for the CLI Typer app."""
 
+    def test_version_flag(self):
+        """Test that --version flag shows version information."""
+        result = subprocess.run(
+            [sys.executable, "-m", "rhiza", "--version"],
+            capture_output=True,
+            text=True,
+        )
+        assert result.returncode == 0
+        assert "rhiza version" in result.stdout
+        assert __version__ in result.stdout
+
+    def test_version_short_flag(self):
+        """Test that -v flag shows version information."""
+        result = subprocess.run(
+            [sys.executable, "-m", "rhiza", "-v"],
+            capture_output=True,
+            text=True,
+        )
+        assert result.returncode == 0
+        assert "rhiza version" in result.stdout
+        assert __version__ in result.stdout
+
 
 class TestExpandPaths:
     """Tests for the expand_paths utility function."""

{rhiza-0.5.2 → rhiza-0.5.3}/uv.lock

@@ -771,7 +771,7 @@ wheels = [
 
 [[package]]
 name = "rhiza"
-version = "0.5.2"
+version = "0.5.3"
 source = { editable = "." }
 dependencies = [
     { name = "loguru" },