haraka 0.2.17__tar.gz → 0.2.19__tar.gz

{haraka-0.2.17 → haraka-0.2.19}/PKG-INFO

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

{haraka-0.2.17 → haraka-0.2.19}/haraka/post_gen/runner.py

@@ -3,9 +3,9 @@ from haraka.art.ascii.assets import *
 from .config import PostGenConfig
 from haraka.utils import divider, Logger
 from haraka.post_gen.service.command import CommandRunner
-from haraka.post_gen.service.files import FileOps
-from haraka.post_gen.service.purge import ResourcePurger
-from haraka.post_gen.service.gitops import GitOps
+from haraka.post_gen.service.fileOps.files import FileOps
+from haraka.post_gen.service.fileOps.purge import ResourcePurger
+from haraka.post_gen.service.git.gitops import GitOps
 
 
 def main(cfg: PostGenConfig) -> None:

{haraka-0.2.17/haraka/post_gen/service → haraka-0.2.19/haraka/post_gen/service/fileOps}/files.py

@@ -47,14 +47,12 @@ class FileOps:
                 self.logger.warn(f"Could not remove directory {self._relpath(path)}: {e}")
 
     def print_tree(self, path: Path, prefix: str = "") -> None:
-        self.logger.debug(f"Printing directory tree starting at: {self._relpath(path)}")
 
         if not path.exists():
             self.logger.debug(f"Path {self._relpath(path)} does not exist")
             self.logger.warn(f"Path does not exist: {path}")
             return
         entries = sorted(path.iterdir(), key=lambda p: (p.is_file(), p.name.lower()))
-        self.logger.debug(f"Found {len(entries)} entries in directory {self._relpath(path)}")
         for i, entry in enumerate(entries):
             branch = "└── " if i == len(entries) - 1 else "├── "
             print(prefix + branch + entry.name)

{haraka-0.2.17/haraka/post_gen/service → haraka-0.2.19/haraka/post_gen/service/fileOps}/purge.py

@@ -21,14 +21,12 @@ Requires:  pip install pathspec PyYAML
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Iterable
 
-import yaml
 from pathspec import PathSpec
 
-from .files import FileOps
+from haraka.post_gen.service.fileOps.files import FileOps
 from haraka.utils import Logger, divider
-from ..config import config
+from haraka.post_gen.config import config
 
 _MANIFEST_DIR = Path(__file__).resolve().parent.parent.parent / "manifests"
 
@@ -89,7 +87,11 @@ class ResourcePurger:
 
             if spec.match_file(rel):
                 self._log.debug(f"Path matches keep patterns: {rel}")
-                self._log.debug(f"Keeping: {rel}")
+                self._log.debug(f"Keeping file: {rel}")
+                continue
+            elif path.is_dir() and spec.match_file(f"{rel}/"):
+                self._log.debug(f"Path matches keep patterns: {rel}")
+                self._log.debug(f"Keeping directory: {rel}")
                 continue
 
             if path.is_dir():

{haraka-0.2.17/haraka/post_gen/service → haraka-0.2.19/haraka/post_gen/service/git}/gitops.py

@@ -1,7 +1,7 @@
 import shutil
 import sys
 from pathlib import Path
-from .command import CommandRunner
+from haraka.post_gen.service.command import CommandRunner
 import subprocess
 from haraka.utils import Logger
 

{haraka-0.2.17 → haraka-0.2.19}/haraka.egg-info/PKG-INFO

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

{haraka-0.2.17 → haraka-0.2.19}/haraka.egg-info/SOURCES.txt

@@ -17,12 +17,15 @@ haraka/post_gen/__init__.py
 haraka/post_gen/runner.py
 haraka/post_gen/config/__init__.py
 haraka/post_gen/config/config.py
+haraka/post_gen/resources/__init__.py
+haraka/post_gen/resources/assets.py
 haraka/post_gen/service/__init__.py
-haraka/post_gen/service/assets.py
 haraka/post_gen/service/command.py
-haraka/post_gen/service/files.py
-haraka/post_gen/service/gitops.py
-haraka/post_gen/service/purge.py
+haraka/post_gen/service/fileOps/__init__.py
+haraka/post_gen/service/fileOps/files.py
+haraka/post_gen/service/fileOps/purge.py
+haraka/post_gen/service/git/__init__.py
+haraka/post_gen/service/git/gitops.py
 haraka/utils/__init__.py
 haraka/utils/common/__init__.py
 haraka/utils/common/utils.py

{haraka-0.2.17 → haraka-0.2.19}/pyproject.toml

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