rhiza 0.6.1__py3-none-any.whl → 0.7.1__py3-none-any.whl

rhiza/commands/init.py

@@ -87,12 +87,12 @@ Next steps:
 
     # Bootstrap basic Python project structure if it doesn't exist
     # Get the name of the parent directory to use as package name
-    parent = target.parent.name
+    parent = target.name
     logger.debug(f"Parent directory name: {parent}")
 
     # Create src/{parent} directory structure following src-layout
     src_folder = target / "src" / parent
-    if not src_folder.exists():
+    if not (target / "src").exists():
         logger.info(f"Creating Python package structure: {src_folder}")
         src_folder.mkdir(parents=True)
 

rhiza/commands/materialize.py

@@ -320,13 +320,52 @@ def materialize(target: Path, branch: str, target_branch: str | None, force: boo
         )
         logger.info(f"Workflow files affected: {len(workflow_files)}")
 
+    # -----------------------
+    # Clean up orphaned files
+    # -----------------------
+    # Read the old .rhiza.history file to find files that are no longer
+    # part of the current materialization and should be deleted
+    history_file = target / ".rhiza.history"
+    previously_tracked_files: set[Path] = set()
+
+    if history_file.exists():
+        logger.debug("Reading existing .rhiza.history file")
+        with history_file.open("r", encoding="utf-8") as f:
+            for line in f:
+                line = line.strip()
+                # Skip comments and empty lines
+                if line and not line.startswith("#"):
+                    previously_tracked_files.add(Path(line))
+
+        logger.debug(f"Found {len(previously_tracked_files)} file(s) in previous .rhiza.history")
+
+    # Convert materialized_files list to a set for comparison
+    currently_materialized_files = set(materialized_files)
+
+    # Find orphaned files (in old history but not in new materialization)
+    orphaned_files = previously_tracked_files - currently_materialized_files
+
+    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):
+            full_path = target / file_path
+            if full_path.exists():
+                try:
+                    full_path.unlink()
+                    logger.success(f"[DEL] {file_path}")
+                except Exception as e:
+                    logger.warning(f"Failed to delete {file_path}: {e}")
+            else:
+                logger.debug(f"Skipping {file_path} (already deleted)")
+    else:
+        logger.debug("No orphaned files to clean up")
+
     # -----------------------
     # Write .rhiza.history
     # -----------------------
     # This file tracks which files were materialized by Rhiza
     # Useful for understanding which files came from the template
     logger.debug("Writing .rhiza.history file")
-    history_file = target / ".rhiza.history"
     with history_file.open("w", encoding="utf-8") as f:
         f.write("# Rhiza Template History\n")
         f.write("# This file lists all files managed by the Rhiza template.\n")
@@ -338,7 +377,7 @@ def materialize(target: Path, branch: str, target_branch: str | None, force: boo
         for file_path in sorted(materialized_files):
             f.write(f"{file_path}\n")
 
-    logger.info(f"Created {history_file.relative_to(target)} with {len(materialized_files)} file(s)")
+    logger.info(f"Updated {history_file.relative_to(target)} with {len(materialized_files)} file(s)")
 
     logger.success("Rhiza templates materialized successfully")
 

{rhiza-0.6.1.dist-info → rhiza-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhiza
-Version: 0.6.1
+Version: 0.7.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.6.1.dist-info → rhiza-0.7.1.dist-info}/RECORD

@@ -3,12 +3,12 @@ rhiza/__main__.py,sha256=Lx0GqVZo6ymm0f18_uYB6E7_SOWwJNYjb73Vr31oLoM,236
 rhiza/cli.py,sha256=faCIOKDzEDRvL4doLZhiIAyHUUGESGrwWLtjLjimCUY,5111
 rhiza/models.py,sha256=fW9lofkkid-bghk2bXEgBdGbZ4scSqG726fMrVfKX_M,3454
 rhiza/commands/__init__.py,sha256=Z5CeMh7ylX27H6dvwqRbEKzYo5pwQq-5TyTxABUSaQg,1848
-rhiza/commands/init.py,sha256=Hrox_o8hnyWMkx4SuE0rd4jqGIBEl_V_wh7BAiW9IFU,5726
-rhiza/commands/materialize.py,sha256=Sxuvh9GLDRkcl6LVTjvWo5bkYzQ5GLwlhOwLo2jNptI,14387
+rhiza/commands/init.py,sha256=3dAQmFYPVIdRXyJsv0-28RLpPcRh-0urMyd-3IxHnGw,5725
+rhiza/commands/materialize.py,sha256=jmXH9Fb3lkktxgdWtZ2cQk0wyURleWzHvQN6n_DNZ7U,16049
 rhiza/commands/validate.py,sha256=cxStfXbY_ifsc_yRDCg0TOnv8jG05hxE9rteta-X9hQ,8093
 rhiza/commands/welcome.py,sha256=w3BziR042o6oYincd3EqDsFzF6qqInU7iYhWjF3yJqY,2382
-rhiza-0.6.1.dist-info/METADATA,sha256=tx98rTT3r_muUBFnlZ_L8KxDbzhQqC_sAocefsoGLf8,22742
-rhiza-0.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-rhiza-0.6.1.dist-info/entry_points.txt,sha256=NAwZUpbXvfKv50a_Qq-PxMHl3lcjAyZO63IBeuUNgfY,45
-rhiza-0.6.1.dist-info/licenses/LICENSE,sha256=4m5X7LhqX-6D0Ks79Ys8CLpmza8cxDG34g4S9XSNAGY,1077
-rhiza-0.6.1.dist-info/RECORD,,
+rhiza-0.7.1.dist-info/METADATA,sha256=NUz6Ye9SW_JPrqjGmqSLBPJO8eDHvkE_Z4mtCw70Scc,22742
+rhiza-0.7.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+rhiza-0.7.1.dist-info/entry_points.txt,sha256=NAwZUpbXvfKv50a_Qq-PxMHl3lcjAyZO63IBeuUNgfY,45
+rhiza-0.7.1.dist-info/licenses/LICENSE,sha256=4m5X7LhqX-6D0Ks79Ys8CLpmza8cxDG34g4S9XSNAGY,1077
+rhiza-0.7.1.dist-info/RECORD,,