haraka 0.2.42__py3-none-any.whl → 0.2.43__py3-none-any.whl

haraka/post_gen/service/fileOps/purge.py

@@ -21,9 +21,9 @@ Requires:  pip install pathspec PyYAML
 from __future__ import annotations
 
 from pathlib import Path
+from typing import Tuple, List
 
 from pathspec import PathSpec
-from typing import Tuple, List
 
 from haraka.post_gen.service.fileOps.files import FileOps
 from haraka.utils import Logger, divider
@@ -35,12 +35,6 @@ _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."""
 
@@ -48,6 +42,7 @@ class ResourcePurger:
         self._f = fops
         self._log = logger or Logger("ResourcePurger")
         self._log.debug("ResourcePurger initialized with FileOps instance and Logger.")
+        self._protected_dirs: List[str] = []
 
     # ------------------------------ public API ----------------------------- #
     def purge(self, variant: str, project_dir: Path) -> None:
@@ -67,12 +62,11 @@ class ResourcePurger:
 
         raw_patterns, raw_protected_dirs = config.load_manifest(variant)
         keep_patterns = [p.rstrip("/") for p in raw_patterns]
-        protected_dirs = [p.rstrip("/") for p in raw_protected_dirs]
+        self._protected_dirs = [p.rstrip("/") for p in raw_protected_dirs]
 
         self._log.debug(f"Loaded manifest for variant '{variant}': {keep_patterns}")
 
         spec = config.build_spec(keep_patterns)
-        protected_spec = config.build_spec(protected_dirs)
         self._log.debug(f"Built PathSpec for keep patterns. Total patterns: {len(keep_patterns)}")
 
         self._log.info(f"Keeping {len(keep_patterns)} pattern(s)")
@@ -81,9 +75,15 @@ class ResourcePurger:
 
         all_paths = self._walk_tree(project_dir)
 
-        matched, non_dirs, non_files, _ = self.classify_paths(all_paths, project_dir, spec)
+        matched, non_matched_dirs, non_matched_files, directories_skipped = \
+            self.classify_paths(all_paths, project_dir, spec)
 
-        self._purge_unrelated(project_dir, matched, non_dirs, non_files, protected_spec, spec)
+        self._purge_unrelated(
+            project_dir,
+            matched,
+            non_matched_dirs,
+            non_matched_files
+        )
 
         self._log.debug(f"Finished purging unrelated paths in project directory: {project_dir}")
 
@@ -108,7 +108,9 @@ class ResourcePurger:
 
     def classify_paths(
             self,
-            paths: List[Path], root: Path, spec: PathSpec
+            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] = []
@@ -125,7 +127,8 @@ class ResourcePurger:
                 continue
 
             if path.is_dir():
-                if is_dir_protected(rel, spec):
+                # skip deletion if this dir is exactly in protected list
+                if rel in self._protected_dirs:
                     self._log.debug(f"⏭️  SKIPPING DELETE: Protected ancestor found: {path}")
                     directories_skipped.append(rel)
                 else:
@@ -148,11 +151,12 @@ class ResourcePurger:
             self._log.info("  (none)")
         self._log.info("-" * 70)
 
-    def _dir_batch_delete(self, title: str, items: List[str], root: Path, protected_spec: PathSpec, keep_spec: PathSpec) -> None:
+    def _dir_batch_delete(self, title: str, items: List[str], root: Path) -> None:
         self._log.info(f"{title} — {len(items)}")
         if items:
             for p in sorted(items):
-                if protected_spec.match_file(p) and keep_spec.match_file(p):
+                # only protect exact matches
+                if p in self._protected_dirs:
                     self._log.debug(f"  🛡️  PROTECTED DIRECTORY  DIR {p}")
                 else:
                     full_path = root / Path(p)
@@ -162,37 +166,25 @@ class ResourcePurger:
         self._log.info("-" * 70)
 
     def _file_batch_delete(self, title: str, items: List[str], root: Path) -> None:
-            self._log.info(f"{title} — {len(items)}")
-            if items:
-                for p in sorted(items):
-                    full_path = root / Path(p)
-                    self._f.remove_file(full_path)
-            else:
-                self._log.info("  (none)")
-            self._log.info("-" * 70)
+        self._log.info(f"{title} — {len(items)}")
+        if items:
+            for p in sorted(items):
+                full_path = root / Path(p)
+                self._f.remove_file(full_path)
+        else:
+            self._log.info("  (none)")
+        self._log.info("-" * 70)
 
     def _purge_unrelated(
             self,
             root: Path,
             matched: List[str],
             non_matched_dirs: List[str],
-            non_matched_files: List[str],
-            protected_spec: PathSpec,
-            keep_spec: PathSpec,
+            non_matched_files: List[str]
     ) -> None:
         """Human-friendly digest of keep/delete results."""
         self._log.info("\n" + "=" * 70)
         self._print_matches("✅ MATCHED (keep)", matched)
-        self._dir_batch_delete("🗂️  NON-MATCHED DIRECTORIES (delete)", non_matched_dirs, root, protected_spec, keep_spec)
+        self._dir_batch_delete("🗂️  NON-MATCHED DIRECTORIES (delete)", non_matched_dirs, root)
         self._file_batch_delete("📄 NON-MATCHED FILES (delete)", non_matched_files, root)
         self._log.info("=" * 70)
-
-    @staticmethod
-    def _is_dir_protected(relative_path: str, spec: PathSpec) -> bool:
-        """
-        Walks from `path` up to `root`, and returns True if any ancestor
-        is matched by the spec.
-        """
-        if spec.match_file(relative_path):
-            return True
-        return False

haraka/utils/manifests/java-springboot.yml

@@ -2,14 +2,12 @@ variant: java-springboot
 
 keep:
   # ── application source ────────────────────────────
-  - src/src/main
   - src/main/java/
   - src/main/java/**
   - src/main/resources/
   - src/main/resources/**
 
   # ── tests ─────────────────────────────────────────
-  - src/test
   - src/test/java/
   - src/test/java/**
 
@@ -31,4 +29,6 @@ keep:
   - infra/**
 
 protected:
-  - src/**
+  - src
+  - src/main
+  - src/test

{haraka-0.2.42.dist-info → haraka-0.2.43.dist-info}/METADATA

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

{haraka-0.2.42.dist-info → haraka-0.2.43.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=qsNftbLoo8HHARBwNSHe6dUVPCoqzgv1SHUOH56gj00,3058
-haraka/post_gen/service/fileOps/purge.py,sha256=dLwQal1uXgZaayTZkbgBSD-dA3mdz1HEYHaxVCjMD-Y,7625
+haraka/post_gen/service/fileOps/purge.py,sha256=HWc9lUtmLtiTp7dVAO0YHXoHbWa6HVstc7XfmONQ470,7132
 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
@@ -27,9 +27,9 @@ haraka/utils/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 haraka/utils/logging/log_util.py,sha256=UQq2E24q3brvXqcyGCjfSxxHH48JF_BMg54TKdl1SHk,1049
 haraka/utils/manifests/go-grpc-gateway-buf.yml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haraka/utils/manifests/go-grpc-protoc.yml,sha256=OaQlfW_S_OguhW_UcpBVdqdEtUMlg-SrT4bqLhQrY7Y,936
-haraka/utils/manifests/java-springboot.yml,sha256=rR9SvbqggfCNER_4iMbrg-oOG1fwCMIiqrDUYg2zT6s,981
+haraka/utils/manifests/java-springboot.yml,sha256=AfdfyYFKGg_860RmNhx3kVqffZdoKvpc01sk_ovY45s,974
 haraka/utils/manifests/python-fastapi.yml,sha256=nhO6S9j_r-S10nM8nuw7PtR247-ePhBXHvaXg74CjWw,922
-haraka-0.2.42.dist-info/METADATA,sha256=VdOQtgoaTKrtLDowkuse9yU1pYXfZ6SzgLIPDz-_PIs,579
-haraka-0.2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-haraka-0.2.42.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
-haraka-0.2.42.dist-info/RECORD,,
+haraka-0.2.43.dist-info/METADATA,sha256=9pOC1_BAmPK5cX2aH_4Dbfi9KPVfL4-dKxEo0sSryDI,579
+haraka-0.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+haraka-0.2.43.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
+haraka-0.2.43.dist-info/RECORD,,