haraka 0.2.38__py3-none-any.whl → 0.2.40__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. haraka/post_gen/config/config.py +11 -3
  2. haraka/post_gen/service/fileOps/files.py +4 -4
  3. haraka/post_gen/service/fileOps/purge.py +2 -2
  4. haraka/utils/manifests/java-springboot.yml +1 -2
  5. {haraka-0.2.38.dist-info → haraka-0.2.40.dist-info}/METADATA +1 -1
  6. {haraka-0.2.38.dist-info → haraka-0.2.40.dist-info}/RECORD +8 -8
  7. {haraka-0.2.38.dist-info → haraka-0.2.40.dist-info}/WHEEL +0 -0
  8. {haraka-0.2.38.dist-info → haraka-0.2.40.dist-info}/top_level.txt +0 -0
haraka/post_gen/config/config.py CHANGED
@@ -27,14 +27,22 @@ def load_manifest(variant: str) -> Tuple[List[str], List[str]]:
27
27
  f"(expected {manifest_path})"
28
28
  )
29
29
  doc = yaml.safe_load(manifest_path.read_text())
30
- if not isinstance(doc, dict) or "keep" not in doc or "protected_dirs" not in doc:
31
- raise ValueError(f"Manifest {manifest_path} missing a `keep:` section")
30
+ if not isinstance(doc, dict):
31
+ if "keep" not in doc:
32
+ raise ValueError(f"Manifest {manifest_path} missing a `keep:` section")
33
+
34
+ if "protected" not in doc:
35
+ raise ValueError(f"Manifest {manifest_path} missing a `protected:` section")
36
+
32
37
  keep_patterns = doc["keep"]
33
- protected_dirs = doc.get("protected_dirs", [])
38
+ protected_dirs = doc.get("protected", [])
39
+
34
40
  if not isinstance(keep_patterns, Iterable):
35
41
  raise TypeError(f"`keep` section in {manifest_path} must be a list")
42
+
36
43
  if not isinstance(protected_dirs, Iterable):
37
44
  raise TypeError(f"`protected` section in {manifest_path} must be a list")
45
+
38
46
  return list(keep_patterns), list(protected_dirs)
39
47
 
40
48
 
haraka/post_gen/service/fileOps/files.py CHANGED
@@ -21,8 +21,8 @@ class FileOps:
21
21
  self.logger.debug(f"Confirmed {self._relpath(path)} is a file")
22
22
 
23
23
  path.unlink()
24
- self.logger.debug(f"File {self._relpath(path)} successfully unlinked")
25
- self.logger.info(f"Removed file: {self._relpath(path)}")
24
+ self.logger.debug(f" 🗑️ File {self._relpath(path)} successfully unlinked")
25
+ self.logger.info(f" 🗑️ DELETED FILE: {self._relpath(path)}")
26
26
  elif path.is_dir():
27
27
  self.logger.debug(f"{self._relpath(path)} is a directory, not a file. Proceeding to remove it as a directory")
28
28
 
@@ -40,8 +40,8 @@ class FileOps:
40
40
  self.logger.debug(f"Confirmed {self._relpath(path)} exists")
41
41
  try:
42
42
  shutil.rmtree(path, ignore_errors=True)
43
- self.logger.debug(f"Directory {self._relpath(path)} successfully removed")
44
- self.logger.info(f"Removed directory: {self._relpath(path)}")
43
+ self.logger.debug(f" 🗑️ Directory {self._relpath(path)} successfully removed")
44
+ self.logger.info(f" 🗑️ DELETED DIR: {self._relpath(path)}")
45
45
  except Exception as e:
46
46
  self.logger.error(f"Error occurred while attempting to remove directory {self._relpath(path)}: {e}")
47
47
  self.logger.warn(f"Could not remove directory {self._relpath(path)}: {e}")
haraka/post_gen/service/fileOps/purge.py CHANGED
@@ -155,7 +155,8 @@ class ResourcePurger:
155
155
  if not protected_spec.match_file(p):
156
156
  full_path = root / Path(p)
157
157
  self._f.remove_dir(full_path)
158
- self._log.debug(f" 🗑️ DELETED DIR {p}")
158
+ else:
159
+ self._log.debug(f" 🛡️ PROTECTED DIRECTORY DIR {p}")
159
160
  else:
160
161
  self._log.info(" (none)")
161
162
  self._log.info("-" * 70)
@@ -166,7 +167,6 @@ class ResourcePurger:
166
167
  for p in sorted(items):
167
168
  full_path = root / Path(p)
168
169
  self._f.remove_file(full_path)
169
- self._log.debug(f" 🗑️ DELETED DIR {p}")
170
170
  else:
171
171
  self._log.info(" (none)")
172
172
  self._log.info("-" * 70)
haraka/utils/manifests/java-springboot.yml CHANGED
@@ -29,5 +29,4 @@ keep:
29
29
  - infra/**
30
30
 
31
31
  protected:
32
- - src
33
- - src/main
32
+ - src
{haraka-0.2.38.dist-info → haraka-0.2.40.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: haraka
3
- Version: 0.2.38
3
+ Version: 0.2.40
4
4
  Summary: Reusable post-generation helper for Cookiecutter micro-service templates
5
5
  Author-email: Will Burks <will@example.com>
6
6
  License: MIT
{haraka-0.2.38.dist-info → haraka-0.2.40.dist-info}/RECORD RENAMED
@@ -10,14 +10,14 @@ haraka/art/ascii/frame/width_utils.py,sha256=in4AV3gTBBXUX6N01j67Icu9vsHFomybBN8
10
10
  haraka/post_gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
11
11
  haraka/post_gen/runner.py,sha256=CgC3-mOA6dOovJBCLykrec_Segitbu0XesMH6jsl6lM,3271
12
12
  haraka/post_gen/config/__init__.py,sha256=-_XkJ_Dni28yJCMfIceQSiH1wa_hHsZMoBTyvR9Ikbc,62
13
- haraka/post_gen/config/config.py,sha256=XexywLrjD2cR0K-9J8ObVCSchHnQuoQfW0-YIElG8ig,1652
13
+ haraka/post_gen/config/config.py,sha256=G6Y3a_kjDXjynYi-d3z2oQ8rsp0WSn68TcyNaJZrpN8,1758
14
14
  haraka/post_gen/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
15
15
  haraka/post_gen/resources/assets.py,sha256=-oz3vlBaVOjeCOO2QHRvOmfyurR1KgihqXqbTtxDNG4,461
16
16
  haraka/post_gen/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
17
17
  haraka/post_gen/service/command.py,sha256=yvEzW9rMSXWeQ_2DXuQNtGH6sRuZnK6viMud-amFQXw,2348
18
18
  haraka/post_gen/service/fileOps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
19
- haraka/post_gen/service/fileOps/files.py,sha256=Jm_0bhvVnNqSPGKQ2RnMpx8JLV74M-IXMmwly9fpmVw,3020
20
- haraka/post_gen/service/fileOps/purge.py,sha256=lZ7I98J0UTxU0VAM5pNLjImUluIyzhyLN0Skh4quQ0o,7562
19
+ haraka/post_gen/service/fileOps/files.py,sha256=qsNftbLoo8HHARBwNSHe6dUVPCoqzgv1SHUOH56gj00,3058
20
+ haraka/post_gen/service/fileOps/purge.py,sha256=vUX95vYb6JTWJ8r-o3_2QWQyCjCiLf9DOf07UBWucJI,7530
21
21
  haraka/post_gen/service/gitOps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
22
22
  haraka/post_gen/service/gitOps/gitops.py,sha256=clWny1m9qB4yr8asba8JwqBjewlMVsJUmIOCLtAL8RI,4052
23
23
  haraka/utils/__init__.py,sha256=3Cp4u0dyAGcmqes-tIr95KFsNsJx5Ji5Yzkto9546Hs,168
@@ -27,9 +27,9 @@ haraka/utils/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
27
27
  haraka/utils/logging/log_util.py,sha256=UQq2E24q3brvXqcyGCjfSxxHH48JF_BMg54TKdl1SHk,1049
28
28
  haraka/utils/manifests/go-grpc-gateway-buf.yml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
29
29
  haraka/utils/manifests/go-grpc-protoc.yml,sha256=OaQlfW_S_OguhW_UcpBVdqdEtUMlg-SrT4bqLhQrY7Y,936
30
- haraka/utils/manifests/java-springboot.yml,sha256=AF4ebSqKj2AG4dlTfgJJjzG7Nke4wknRshROHbSL_dc,961
30
+ haraka/utils/manifests/java-springboot.yml,sha256=j9WAJCgfm2Hhq2sv-YM1rIHYNYwD7_CnLjcYiov5mVw,948
31
31
  haraka/utils/manifests/python-fastapi.yml,sha256=nhO6S9j_r-S10nM8nuw7PtR247-ePhBXHvaXg74CjWw,922
32
- haraka-0.2.38.dist-info/METADATA,sha256=A5nj60d9nrUhfK061R74gQkTzh8M72qa5JWLEB2ijWM,579
33
- haraka-0.2.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
34
- haraka-0.2.38.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
35
- haraka-0.2.38.dist-info/RECORD,,
32
+ haraka-0.2.40.dist-info/METADATA,sha256=WKtak8RAPDBMXSmaTU1PbqrdVS96g2U3zs4N3yafYcg,579
33
+ haraka-0.2.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
34
+ haraka-0.2.40.dist-info/top_level.txt,sha256=1khpwypLKWoklVd_CgFiwAfcctVSXRoRPc3BI9lyIXo,7
35
+ haraka-0.2.40.dist-info/RECORD,,