rhiza 0.8.6__py3-none-any.whl → 0.8.8__py3-none-any.whl

rhiza/commands/materialize.py

@@ -251,6 +251,19 @@ def _copy_files_to_target(
     # Create set of excluded files
     logger.debug("Expanding excluded paths to individual files")
     excluded_files = {f.resolve() for f in __expand_paths(tmp_dir, excluded_paths)}
+
+    # Always exclude .rhiza/template.yml to prevent overwriting local configuration
+    # Also exclude .rhiza/history to prevent overwriting local history with template history
+    rhiza_dir = tmp_dir / ".rhiza"
+    template_config = (rhiza_dir / "template.yml").resolve()
+    upstream_history = (rhiza_dir / "history").resolve()
+
+    if template_config.is_file():
+        excluded_files.add(template_config)
+
+    if upstream_history.is_file():
+        excluded_files.add(upstream_history)
+
     if excluded_files:
         logger.info(f"Excluding {len(excluded_files)} file(s) based on exclude patterns")
 
@@ -336,9 +349,17 @@ def _clean_orphaned_files(target: Path, materialized_files: list[Path]) -> None:
     currently_materialized_files = set(materialized_files)
     orphaned_files = previously_tracked_files - currently_materialized_files
 
+    # Protected files that should never be deleted automatically
+    # even if they are orphaned (e.g. user chose to stop tracking them)
+    protected_files = {Path(".rhiza/template.yml")}
+
     if orphaned_files:
         logger.info(f"Found {len(orphaned_files)} orphaned file(s) no longer maintained by template")
         for file_path in sorted(orphaned_files):
+            if file_path in protected_files:
+                logger.info(f"Skipping protected file: {file_path}")
+                continue
+
             full_path = target / file_path
             if full_path.exists():
                 try:

rhiza/models.py

@@ -11,6 +11,29 @@ from pathlib import Path
 import yaml
 
 
+def _normalize_to_list(value: str | list[str] | None) -> list[str]:
+    """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
+    strips whitespace from each item.
+
+    Args:
+        value: A string, list of strings, or None.
+
+    Returns:
+        A list of strings. Empty list if value is None or empty.
+    """
+    if value is None:
+        return []
+    if isinstance(value, list):
+        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()]
+    return []
+
+
 @dataclass
 class RhizaTemplate:
     """Represents the structure of .github/rhiza/template.yml.
@@ -57,8 +80,8 @@ class RhizaTemplate:
             template_repository=config.get("template-repository"),
             template_branch=config.get("template-branch"),
             template_host=config.get("template-host", "github"),
-            include=config.get("include", []),
-            exclude=config.get("exclude", []),
+            include=_normalize_to_list(config.get("include")),
+            exclude=_normalize_to_list(config.get("exclude")),
         )
 
     def to_yaml(self, file_path: Path) -> None:

{rhiza-0.8.6.dist-info → rhiza-0.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhiza
-Version: 0.8.6
+Version: 0.8.8
 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.8.6.dist-info → rhiza-0.8.8.dist-info}/RECORD

@@ -1,20 +1,20 @@
 rhiza/__init__.py,sha256=iW3niLBjwRKxcMhIV_1eb78putjUTo2tbZsadofluJk,1939
 rhiza/__main__.py,sha256=Q02upTGaJceknkDABdCwq5_vdMdGY8Cg3ej6WZIHs_s,829
 rhiza/cli.py,sha256=xIsyfKjSFjVLjCS7o2om5o_YLZx9lIhsI0MTMI5Zs2k,8594
-rhiza/models.py,sha256=fW9lofkkid-bghk2bXEgBdGbZ4scSqG726fMrVfKX_M,3454
+rhiza/models.py,sha256=o_iD8P7d7RAHH6J91tSPmD6lY-2HUsCaIl8auWqm2NM,4216
 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=Z5CeMh7ylX27H6dvwqRbEKzYo5pwQq-5TyTxABUSaQg,1848
 rhiza/commands/init.py,sha256=73MLPLp-M8U4fP8J5RXghS6FsZjx2PpeeBbKRZvLQ7U,8882
-rhiza/commands/materialize.py,sha256=CgT6x1huRCWKrRQ_-YUoRFGHSB_mpt6M6shObKna_rY,17716
+rhiza/commands/materialize.py,sha256=U6MouBNrg_GjYIPD0vBb3nacFBKGP4l8RD-HH0u-mYk,18538
 rhiza/commands/migrate.py,sha256=pT8izKuX2eXCAkmNfcy4AU5HTB1DoOZoBXcZo2AOpXs,7520
 rhiza/commands/uninstall.py,sha256=MJbQtmdTgbzMvQz0gGLW3aw6S1dSV8nLv0SqWSDpyPk,7469
 rhiza/commands/validate.py,sha256=pg7SpgavvrjDyuZIphJ_GOMnXkwdVs9WtL2caa1XjcM,10811
 rhiza/commands/welcome.py,sha256=w3BziR042o6oYincd3EqDsFzF6qqInU7iYhWjF3yJqY,2382
-rhiza-0.8.6.dist-info/METADATA,sha256=kZiCjxnt3NmW_qR6XM_i04RxPUqz0LRlXOegNsafOh0,25395
-rhiza-0.8.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-rhiza-0.8.6.dist-info/entry_points.txt,sha256=NAwZUpbXvfKv50a_Qq-PxMHl3lcjAyZO63IBeuUNgfY,45
-rhiza-0.8.6.dist-info/licenses/LICENSE,sha256=4m5X7LhqX-6D0Ks79Ys8CLpmza8cxDG34g4S9XSNAGY,1077
-rhiza-0.8.6.dist-info/RECORD,,
+rhiza-0.8.8.dist-info/METADATA,sha256=PGkXXTlS2XGjxAm5ODJmDvrRerXnEmG1ZoUcJvYhiyo,25395
+rhiza-0.8.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+rhiza-0.8.8.dist-info/entry_points.txt,sha256=NAwZUpbXvfKv50a_Qq-PxMHl3lcjAyZO63IBeuUNgfY,45
+rhiza-0.8.8.dist-info/licenses/LICENSE,sha256=4m5X7LhqX-6D0Ks79Ys8CLpmza8cxDG34g4S9XSNAGY,1077
+rhiza-0.8.8.dist-info/RECORD,,