haraka 0.2.17__py3-none-any.whl → 0.2.19__py3-none-any.whl

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/post_gen/service/{files.py → 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/post_gen/service/{purge.py → 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/post_gen/service/{gitops.py → 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.dist-info → haraka-0.2.19.dist-info}/METADATA

@@ -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.dist-info → haraka-0.2.19.dist-info}/RECORD

@@ -8,15 +8,18 @@ haraka/art/ascii/frame/border.py,sha256=n7qaLxzzBmf8ewatbe5gN97DO4afZM67bBjpU1Oq
 haraka/art/ascii/frame/framer.py,sha256=s_-lsb-hGhlH_73q5iTtk8KHW0MSeSHSAvNFVmL1c9A,3951
 haraka/art/ascii/frame/width_utils.py,sha256=in4AV3gTBBXUX6N01j67Icu9vsHFomybBN8rpL3sQ5s,810
 haraka/post_gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-haraka/post_gen/runner.py,sha256=OLdB3ugDkBzeGBoVZ8RgxOHEy4aNT4icD10a1WwnyOo,3248
+haraka/post_gen/runner.py,sha256=MRb5y30FbGTImYEV7ZomwBdHFNz3ycFr7e16TMN3gb0,3268
 haraka/post_gen/config/__init__.py,sha256=-_XkJ_Dni28yJCMfIceQSiH1wa_hHsZMoBTyvR9Ikbc,62
 haraka/post_gen/config/config.py,sha256=nmsQ19ONWE76GFQtah_PUO1HygE-ZCCOfK03M-t-kMs,1310
+haraka/post_gen/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+haraka/post_gen/resources/assets.py,sha256=-oz3vlBaVOjeCOO2QHRvOmfyurR1KgihqXqbTtxDNG4,461
 haraka/post_gen/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-haraka/post_gen/service/assets.py,sha256=-oz3vlBaVOjeCOO2QHRvOmfyurR1KgihqXqbTtxDNG4,461
 haraka/post_gen/service/command.py,sha256=yvEzW9rMSXWeQ_2DXuQNtGH6sRuZnK6viMud-amFQXw,2348
-haraka/post_gen/service/files.py,sha256=7AKGNqW19BkQfYgds2FDjtIsWLSNPaoqEqqZKUsK68k,3203
-haraka/post_gen/service/gitops.py,sha256=UHJFEGrz88NTB0-WKge_AiKO_yLFci6A7AM5kBIy0VQ,4029
-haraka/post_gen/service/purge.py,sha256=eDH5DLwaViu3jsqtPXeJWxS_Fs7RIEq6RKD8A8ny2vE,3536
+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=6MOUrwXojr2qQxebT_tczVlquVE-D0jlP67toR6oIIs,3765
+haraka/post_gen/service/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+haraka/post_gen/service/git/gitops.py,sha256=clWny1m9qB4yr8asba8JwqBjewlMVsJUmIOCLtAL8RI,4052
 haraka/utils/__init__.py,sha256=3Cp4u0dyAGcmqes-tIr95KFsNsJx5Ji5Yzkto9546Hs,168
 haraka/utils/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haraka/utils/common/utils.py,sha256=kMnMXe_hcxGkD0MKGmR1lIwsRND7BaFPRbGN4PwonfM,360
@@ -26,7 +29,7 @@ haraka/utils/manifests/go-grpc-gateway-buf.yml,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 haraka/utils/manifests/go-grpc-protoc.yml,sha256=aR-Tv6iIcBzni3jbTg10wvceydBdk07fM7y3QcK1B8k,948
 haraka/utils/manifests/java-springboot.yml,sha256=WzcaStDgzyWmBhV2TUiYEkxHhYwydN9ww2yjZYyhSmw,929
 haraka/utils/manifests/python-fastapi.yml,sha256=FKHV0G53I0hoqAVmvoB18rVxw7PiVB_yjSwd_urXgn0,860
-haraka-0.2.17.dist-info/METADATA,sha256=fpze37OyA_UIRC5cZcjQfo7vi-07ljcqBVr4-Egb2ig,579
-haraka-0.2.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-haraka-0.2.17.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
-haraka-0.2.17.dist-info/RECORD,,
+haraka-0.2.19.dist-info/METADATA,sha256=9uxOPhqqwdRdQuROHuHdlLT3oW012AhllHQyokBkPbQ,579
+haraka-0.2.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+haraka-0.2.19.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
+haraka-0.2.19.dist-info/RECORD,,