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

haraka/post_gen/service/fileOps/purge.py

@@ -23,6 +23,7 @@ from __future__ import annotations
 from pathlib import Path
 
 from pathspec import PathSpec
+from typing import Tuple, List
 
 from haraka.post_gen.service.fileOps.files import FileOps
 from haraka.utils import Logger, divider
@@ -34,6 +35,12 @@ _MANIFEST_DIR = Path(__file__).resolve().parent.parent.parent / "manifests"
 # --------------------------------------------------------------------------- #
 # main purger                                                                 #
 # --------------------------------------------------------------------------- #
+def is_dir_protected(rel: str, spec: PathSpec) -> bool:
+    """True if *rel* (or an ancestor) is matched by keep spec."""
+    # `spec.match_file` already walks ancestors for dirs
+    return spec.match_file(rel)
+
+
 class ResourcePurger:
     """Filesystem cleaner driven by variant manifest files."""
 
@@ -70,61 +77,94 @@ class ResourcePurger:
         for pattern in keep_patterns:
             self._log.debug(f"Keep pattern: {pattern}")
 
-        self._purge_unrelated(project_dir, spec)
+        all_paths = self._walk_tree(project_dir)
+
+        matched, non_dirs, non_files, _ = self.classify_paths(all_paths, project_dir, spec)
+
+        self.print_summary(matched, non_dirs, non_files)
+
         self._log.debug(f"Finished purging unrelated paths in project directory: {project_dir}")
 
         divider("Project tree after purge…")
         self._f.print_tree(project_dir)
 
+
+    # ----------------------------- internals ------------------------------ #
+
+    def _walk_tree(self, root: Path) -> List[Path]:
+        """Return every file/dir under *root*, logging the walk."""
+        paths = list(root.rglob("*"))
+        self._log.debug(f"📋 All paths under {root} (total {len(paths)}:")
+        for p in paths:
+            self._log.debug(f"   {p.relative_to(root)}")
+        return paths
+
+
     # --------------------------------------------------------------------------- #
-    # internals                                                                   #
+    # Classification helpers                                                      #
     # --------------------------------------------------------------------------- #
-    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.
-        """
-        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] = []
 
-        for path in all_paths:
+    def classify_paths(
+            self,
+            paths: List[Path], root: Path, spec: PathSpec
+    ) -> Tuple[List[str], List[str], List[str], List[str]]:
+        """Split paths into keep/delete buckets."""
+        matched: List[str] = []
+        non_matched_files: List[str] = []
+        non_matched_dirs: List[str] = []
+        directories_skipped: List[str] = []
+
+        for path in paths:
             rel = path.relative_to(root).as_posix()
 
             if spec.match_file(rel):
-                keep.append(rel)
+                self._log.debug(f"✅ KEEP      {rel}")
+                matched.append(rel)
                 continue
 
             if path.is_dir():
-                if self._dir_has_kept_ancestor(rel, spec):
-                    self._log.debug("⏭️  SKIP DIR (kept ancestor): %s", rel)
+                if is_dir_protected(rel, spec):
+                    self._log.debug(f"⏭️  SKIPPING DELETE: Protected ancestor found: {path}")
+                    directories_skipped.append(rel)
                 else:
-                    self._log.debug("❌ DELETE DIR: %s", rel)
-                    delete_dirs.append(rel)
+                    self._log.debug(f"❌ DELETE DIR: {rel}")
+                    non_matched_dirs.append(rel)
             else:
-                self._log.debug("❌ DELETE FILE: %s", rel)
-                delete_files.append(rel)
+                non_matched_files.append(rel)
 
-        # -- perform deletions -------------------------------------------------- #
-        for f in delete_files:
-            self._f.remove_file(root / f)
+        return matched, non_matched_dirs, non_matched_files, directories_skipped
 
-        # 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()
-
-        # -- 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))
+    # --------------------------------------------------------------------------- #
+    # Summary printing helpers                                                    #
+    # --------------------------------------------------------------------------- #
+    def _print_section(self, title: str, items: List[str]) -> None:
+        self._log.info(f"{title} — {len(items)}")
+        if items:
+            for p in sorted(items):
+                self._log.info("  • %s", p)
+        else:
+            self._log.info("  (none)")
+        self._log.info("-" * 70)
+
+    def print_summary(
+            self,
+            matched: List[str],
+            non_matched_dirs: List[str],
+            non_matched_files: List[str],
+    ) -> None:
+        """Human-friendly digest of keep/delete results."""
+        self._log.info("\n" + "=" * 70)
+        self._print_section("✅ MATCHED (keep)", matched)
+        self._print_section("🗂️  NON-MATCHED DIRECTORIES (delete)", non_matched_dirs)
+        self._print_section("📄 NON-MATCHED FILES (delete)", non_matched_files)
+        self._log.info("=" * 70)
 
     @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.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haraka
-Version: 0.2.31
+Version: 0.2.33
 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.33.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=DA0BRmn01jBMv4DScjRk95KMCE1n_DbeD468YqgVFB0,6298
 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.33.dist-info/METADATA,sha256=i4dTqI3SMwj6Gn_4_YHtutOGW_o_aga1VXNyS_4knOU,579
+haraka-0.2.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+haraka-0.2.33.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
+haraka-0.2.33.dist-info/RECORD,,