haraka 0.2.31__py3-none-any.whl → 0.2.32__py3-none-any.whl

haraka/post_gen/service/fileOps/purge.py

@@ -76,55 +76,72 @@ class ResourcePurger:
         divider("Project tree after purge…")
         self._f.print_tree(project_dir)
 
-    # --------------------------------------------------------------------------- #
-    # internals                                                                   #
-    # --------------------------------------------------------------------------- #
+    # ----------------------------- internals ------------------------------ #
     def _purge_unrelated(self, root: Path, spec: PathSpec) -> None:
         """
-        Walk *root* recursively and delete every path **not** matched by *spec*.
-        A directory is preserved if **it or any ancestor** is matched.
+        Walk the project tree; delete every path NOT matched by *spec*.
+
+        Updated to align with the `test_java_manifest` logic for cleaner organization.
         """
-        all_paths = list(root.rglob("*"))
-        self._log.debug("📋 Scanning %d paths under %s", len(all_paths), root)
 
-        keep: list[str] = []
-        delete_files: list[str] = []
-        delete_dirs: list[str] = []
+        # Dictionaries to separate matches and non-matches for logging
 
+        # 1) Dump every path under root or state what was found
+        all_paths = list(root.rglob("*"))
+        if self._log.evm:
+            self._log.debug(f"📋 All paths under {root} (total {len(all_paths)}):")
+            for p in all_paths:
+                print(f"{p.relative_to(root)}")
+        else:
+            self._log.debug(f"Found {len(all_paths)} paths under {root})")
+
+        matches, non_matched_files, directories_skipped, non_matched_dirs = [], [], [], []
         for path in all_paths:
+            self._log.debug(f"\nScanning path: {path}")
             rel = path.relative_to(root).as_posix()
-
+            self._log.debug(f"Relative path for inspection: {rel}")
+            # Match file against the PathSpec
             if spec.match_file(rel):
-                keep.append(rel)
-                continue
-
-            if path.is_dir():
-                if self._dir_has_kept_ancestor(rel, spec):
-                    self._log.debug("⏭️  SKIP DIR (kept ancestor): %s", rel)
-                else:
-                    self._log.debug("❌ DELETE DIR: %s", rel)
-                    delete_dirs.append(rel)
+                self._log.debug(f"✅ KEEP: Path matches keep patterns: {rel}")
+                matches.append(path)  # Collect paths to keep
             else:
-                self._log.debug("❌ DELETE FILE: %s", rel)
-                delete_files.append(rel)
+                if path.is_dir():
+                    if self._is_dir_protected(rel, spec):
+                        self._log.debug(f"{"⏭️ SKIPPING DELETE: Protected ancestor found: %s", path}")
+                        directories_skipped.append(rel)
+                    else:
+                        self._log.debug(f"{"❌ DELETE DIR: %s", rel}")
+                        self._f.remove_dir(path)
+                        non_matched_dirs.append(rel)
+                else:
+                    non_matched_files.append(rel)
+                    self._f.remove_file(path)
+                    self._log.debug(f"{"❌ DELETE FILE: %s", rel}")
 
-        # -- perform deletions -------------------------------------------------- #
-        for f in delete_files:
-            self._f.remove_file(root / f)
+            # Non-matching paths: collect and delete
+            self._log.debug(f"❌ DELETE: Path does not match keep patterns: {rel}")
+
+            if path.is_dir():
+                directories_skipped.append(path)
+                self._log.debug(f"⏭️ SKIPPING DELETE: Path is a directory: {path}")
 
-        # delete directories bottom-up to avoid “directory not empty” errors
-        for d in sorted(delete_dirs, key=lambda p: p.count("/"), reverse=True):
-            (root / d).rmdir()
+        # Print results cleanly for debugging/logging purposes
+        self._log.info("\nMATCHED PATHS:")
+        self._log.info("=" * 80)
+        for match in matches:
+            self._log.info(f"✅ {match}")
 
-        # -- summary ------------------------------------------------------------ #
-        self._log.info("✅ kept  : %d", len(keep))
-        self._log.info("🗂️ dirs  : %d deleted", len(delete_dirs))
-        self._log.info("📄 files : %d deleted", len(delete_files))
+        self._log.info("\nNOT MATCHED PATHS:")
+        self._log.info("=" * 80)
+        for non_match in non_matched_files:
+            self._log.info(f"❌ {non_match}")
 
     @staticmethod
-    def _dir_has_kept_ancestor(rel: str, spec: PathSpec) -> bool:
+    def _is_dir_protected(relative_path: str, spec: PathSpec) -> bool:
         """
-        Return True if *rel* **or any of its ancestors** is matched by *spec*.
+        Walks from `path` up to `root`, and returns True if any ancestor
+        is matched by the spec.
         """
-        parts = rel.split("/")
-        return any(spec.match_file("/".join(parts[: i + 1])) for i in range(len(parts)))
+        if spec.match_file(relative_path):
+            return True
+        return False

{haraka-0.2.31.dist-info → haraka-0.2.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haraka
-Version: 0.2.31
+Version: 0.2.32
 Summary: Reusable post-generation helper for Cookiecutter micro-service templates
 Author-email: Will Burks <will@example.com>
 License: MIT

{haraka-0.2.31.dist-info → haraka-0.2.32.dist-info}/RECORD

@@ -17,7 +17,7 @@ haraka/post_gen/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 haraka/post_gen/service/command.py,sha256=yvEzW9rMSXWeQ_2DXuQNtGH6sRuZnK6viMud-amFQXw,2348
 haraka/post_gen/service/fileOps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haraka/post_gen/service/fileOps/files.py,sha256=Jm_0bhvVnNqSPGKQ2RnMpx8JLV74M-IXMmwly9fpmVw,3020
-haraka/post_gen/service/fileOps/purge.py,sha256=fU-sQ0ThjW9op0e0gfEgmrqodyt50aSw_Xy-qJP1Kjs,4970
+haraka/post_gen/service/fileOps/purge.py,sha256=UY4aq_o_lRi81ZNCPTl3DzmauOpn--WPhZ3BRFMXTL8,5686
 haraka/post_gen/service/gitOps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haraka/post_gen/service/gitOps/gitops.py,sha256=clWny1m9qB4yr8asba8JwqBjewlMVsJUmIOCLtAL8RI,4052
 haraka/utils/__init__.py,sha256=3Cp4u0dyAGcmqes-tIr95KFsNsJx5Ji5Yzkto9546Hs,168
@@ -29,7 +29,7 @@ haraka/utils/manifests/go-grpc-gateway-buf.yml,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 haraka/utils/manifests/go-grpc-protoc.yml,sha256=OaQlfW_S_OguhW_UcpBVdqdEtUMlg-SrT4bqLhQrY7Y,936
 haraka/utils/manifests/java-springboot.yml,sha256=DTZoVrIDNVpq2AuuXjL2jAvPggeKWVuKJEKwFb90cz4,989
 haraka/utils/manifests/python-fastapi.yml,sha256=nhO6S9j_r-S10nM8nuw7PtR247-ePhBXHvaXg74CjWw,922
-haraka-0.2.31.dist-info/METADATA,sha256=zqfs-3D99QSYiPBh9Qea6NkfMxf8VNPSB_o9UJDAB3Q,579
-haraka-0.2.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-haraka-0.2.31.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
-haraka-0.2.31.dist-info/RECORD,,
+haraka-0.2.32.dist-info/METADATA,sha256=V5jL8pP4EBK4gORP9ikwBzon51MnwsS4RB90aZTL-ns,579
+haraka-0.2.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+haraka-0.2.32.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
+haraka-0.2.32.dist-info/RECORD,,