haraka 0.2.38__tar.gz → 0.2.40__tar.gz

{haraka-0.2.38 → haraka-0.2.40}/PKG-INFO

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

{haraka-0.2.38 → haraka-0.2.40}/haraka/post_gen/config/config.py

@@ -27,14 +27,22 @@ def load_manifest(variant: str) -> Tuple[List[str], List[str]]:
             f"(expected {manifest_path})"
         )
     doc = yaml.safe_load(manifest_path.read_text())
-    if not isinstance(doc, dict) or "keep" not in doc or "protected_dirs" not in doc:
-        raise ValueError(f"Manifest {manifest_path} missing a `keep:` section")
+    if not isinstance(doc, dict):
+        if "keep" not in doc:
+            raise ValueError(f"Manifest {manifest_path} missing a `keep:` section")
+
+        if "protected" not in doc:
+            raise ValueError(f"Manifest {manifest_path} missing a `protected:` section")
+
     keep_patterns = doc["keep"]
-    protected_dirs = doc.get("protected_dirs", [])
+    protected_dirs = doc.get("protected", [])
+
     if not isinstance(keep_patterns, Iterable):
         raise TypeError(f"`keep` section in {manifest_path} must be a list")
+
     if not isinstance(protected_dirs, Iterable):
             raise TypeError(f"`protected` section in {manifest_path} must be a list")
+
     return list(keep_patterns), list(protected_dirs)
 
 

{haraka-0.2.38 → haraka-0.2.40}/haraka/post_gen/service/fileOps/files.py

@@ -21,8 +21,8 @@ class FileOps:
                 self.logger.debug(f"Confirmed {self._relpath(path)} is a file")
 
                 path.unlink()
-                self.logger.debug(f"File {self._relpath(path)} successfully unlinked")
-                self.logger.info(f"Removed file: {self._relpath(path)}")
+                self.logger.debug(f"  🗑️  File {self._relpath(path)} successfully unlinked")
+                self.logger.info(f"  🗑️  DELETED FILE: {self._relpath(path)}")
             elif path.is_dir():
                 self.logger.debug(f"{self._relpath(path)} is a directory, not a file. Proceeding to remove it as a directory")
 
@@ -40,8 +40,8 @@ class FileOps:
             self.logger.debug(f"Confirmed {self._relpath(path)} exists")
             try:
                 shutil.rmtree(path, ignore_errors=True)
-                self.logger.debug(f"Directory {self._relpath(path)} successfully removed")
-                self.logger.info(f"Removed directory: {self._relpath(path)}")
+                self.logger.debug(f"  🗑️  Directory {self._relpath(path)} successfully removed")
+                self.logger.info(f"  🗑️  DELETED DIR: {self._relpath(path)}")
             except Exception as e:
                 self.logger.error(f"Error occurred while attempting to remove directory {self._relpath(path)}: {e}")
                 self.logger.warn(f"Could not remove directory {self._relpath(path)}: {e}")

{haraka-0.2.38 → haraka-0.2.40}/haraka/post_gen/service/fileOps/purge.py

@@ -155,7 +155,8 @@ class ResourcePurger:
                 if not protected_spec.match_file(p):
                     full_path = root / Path(p)
                     self._f.remove_dir(full_path)
-                    self._log.debug(f"  🗑️  DELETED DIR {p}")
+                else:
+                    self._log.debug(f"  🛡️  PROTECTED DIRECTORY  DIR {p}")
         else:
             self._log.info("  (none)")
         self._log.info("-" * 70)
@@ -166,7 +167,6 @@ class ResourcePurger:
                 for p in sorted(items):
                     full_path = root / Path(p)
                     self._f.remove_file(full_path)
-                    self._log.debug(f"  🗑️  DELETED DIR {p}")
             else:
                 self._log.info("  (none)")
             self._log.info("-" * 70)

{haraka-0.2.38 → haraka-0.2.40}/haraka/utils/manifests/java-springboot.yml

@@ -29,5 +29,4 @@ keep:
   - infra/**
 
 protected:
-  - src
-  - src/main
+  - src

{haraka-0.2.38 → haraka-0.2.40}/haraka.egg-info/PKG-INFO

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

{haraka-0.2.38 → haraka-0.2.40}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "haraka"
-version         = "0.2.38"
+version         = "0.2.40"
 description     = "Reusable post-generation helper for Cookiecutter micro-service templates"
 readme          = "README.md"
 license         = {text = "MIT"}