rhiza 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

rhiza/commands/init.py

@@ -85,6 +85,7 @@ def init(
             template_repository="jebel-quant/rhiza",
             template_branch="main",
             include=[
+                ".rhiza",  # .rhiza folder
                 ".github",  # GitHub configuration and workflows
                 ".editorconfig",  # Editor configuration
                 ".gitignore",  # Git ignore patterns

rhiza/commands/materialize.py

@@ -15,7 +15,7 @@ from pathlib import Path
 
 from loguru import logger
 
-from rhiza.commands import init
+from rhiza.commands.validate import validate
 from rhiza.models import RhizaTemplate
 
 
@@ -116,11 +116,11 @@ def materialize(target: Path, branch: str, target_branch: str | None, force: boo
             sys.exit(1)
 
     # -----------------------
-    # Ensure Rhiza is initialized
+    # Validate Rhiza configuration
     # -----------------------
-    # The init function creates template.yml if missing and validates it
+    # The validate function checks if template.yml exists and is valid
     # Returns True if valid, False otherwise
-    valid = init(target)
+    valid = validate(target)
 
     if not valid:
         logger.error(f"Rhiza template is invalid in: {target}")
@@ -128,21 +128,8 @@ def materialize(target: Path, branch: str, target_branch: str | None, force: boo
         sys.exit(1)
 
     # Load the template configuration from the validated file
-    # Check for template in new location first, then fall back to old location
-    migrated_template_file = target / ".rhiza" / "template.yml"
-    standard_template_file = target / ".github" / "rhiza" / "template.yml"
-
-    if migrated_template_file.exists():
-        template_file = migrated_template_file
-        logger.debug(f"Loading template configuration from migrated location: {template_file}")
-    elif standard_template_file.exists():
-        template_file = standard_template_file
-        logger.debug(f"Loading template configuration from standard location: {template_file}")
-    else:
-        logger.error("No template.yml file found")
-        logger.error("Run 'rhiza init' or 'rhiza migrate' to create one")
-        sys.exit(1)
-
+    # Validation ensures the file exists at .rhiza/template.yml
+    template_file = target / ".rhiza" / "template.yml"
     template = RhizaTemplate.from_yaml(template_file)
 
     # Extract template configuration settings

rhiza/commands/migrate.py

@@ -10,6 +10,8 @@ from pathlib import Path
 
 from loguru import logger
 
+from rhiza.models import RhizaTemplate
+
 
 def migrate(target: Path) -> None:
     """Migrate project to use the new .rhiza folder structure.
@@ -81,6 +83,23 @@ def migrate(target: Path) -> None:
             logger.warning("No existing template.yml file found in .github")
             logger.info("You may need to run 'rhiza init' to create a template configuration")
 
+    # Ensure the .rhiza folder is included in template.yml include list (if template exists)
+    template_file = new_template_file
+    if template_file.exists():
+        # Load existing template configuration
+        template = RhizaTemplate.from_yaml(template_file)
+        template_include = template.include or []
+        if ".rhiza" not in template_include:
+            logger.warning("The .rhiza folder is not included in your template.yml")
+            template_include.append(".rhiza")
+            logger.info("The .rhiza folder is added to your template.yml to ensure it's included in your repository")
+
+            # Save the updated template.yml
+            template.include = template_include
+            template.to_yaml(template_file)
+    else:
+        logger.debug("No template.yml present in .rhiza; skipping include update")
+
     # Migrate .rhiza.history to .rhiza/history if it exists
     old_history_file = target / ".rhiza.history"
     new_history_file = rhiza_dir / "history"

{rhiza-0.8.0.dist-info → rhiza-0.8.2.dist-info}/METADATA

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

@@ -6,14 +6,14 @@ rhiza/_templates/basic/__init__.py.jinja2,sha256=gs8qN4LAKcdFd6iO9gZVLuVetODmZP_
 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=RsYmomOq-00b4bAjseiHR7ljgJQ_XSjDX-ZWKYTPPN8,6787
-rhiza/commands/materialize.py,sha256=kzcpiKDN0HZQylZW-TZVlrJJctHnmBxq2JQQcNGyOV8,17951
-rhiza/commands/migrate.py,sha256=Zlu-Oq4MJCW3jcKqB2v1-wV3zEr2s6AqYV_btvGOjCE,5425
+rhiza/commands/init.py,sha256=hQTd1y4fcT6JVNVVAxnr463jnt0dNG_Ku-fny4DSIfI,6830
+rhiza/commands/materialize.py,sha256=AbVXJrR8faa3t7m_Xl5TR8VE3ODmkh2oiAwCYFA36wA,17343
+rhiza/commands/migrate.py,sha256=hhSkj2iafCCxKrrVOfnPWDjK7fTJ5ReAJsWNDGz71s0,6307
 rhiza/commands/uninstall.py,sha256=z95xqamV7wGPr8PBveWzaRmtD5bPhOrTLI0GcOvpnAo,5371
 rhiza/commands/validate.py,sha256=1HMQWF9Syv7JKC31AkaPYMTnqy8HOvAMxMLrYty36FQ,9112
 rhiza/commands/welcome.py,sha256=w3BziR042o6oYincd3EqDsFzF6qqInU7iYhWjF3yJqY,2382
-rhiza-0.8.0.dist-info/METADATA,sha256=k_wVNzEknv4GiXwVCxmeUvQ8ex0OXDVsfOkiWELyI9g,25156
-rhiza-0.8.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-rhiza-0.8.0.dist-info/entry_points.txt,sha256=NAwZUpbXvfKv50a_Qq-PxMHl3lcjAyZO63IBeuUNgfY,45
-rhiza-0.8.0.dist-info/licenses/LICENSE,sha256=4m5X7LhqX-6D0Ks79Ys8CLpmza8cxDG34g4S9XSNAGY,1077
-rhiza-0.8.0.dist-info/RECORD,,
+rhiza-0.8.2.dist-info/METADATA,sha256=YXsp3ECxAvgQUjWkksYpaRNTUbENYnhQPKcdDJKJJ_A,25156
+rhiza-0.8.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+rhiza-0.8.2.dist-info/entry_points.txt,sha256=NAwZUpbXvfKv50a_Qq-PxMHl3lcjAyZO63IBeuUNgfY,45
+rhiza-0.8.2.dist-info/licenses/LICENSE,sha256=4m5X7LhqX-6D0Ks79Ys8CLpmza8cxDG34g4S9XSNAGY,1077
+rhiza-0.8.2.dist-info/RECORD,,