zrb 0.22.0__py3-none-any.whl → 0.23.1__py3-none-any.whl

zrb/helper/file/copy_tree.py

@@ -26,6 +26,9 @@ async def copy_tree(
         excludes = []
     if skip_parsing is None:
         skip_parsing = []
+    if os.path.isfile(src):
+        await _copy_file(src, dst, replacements, excludes, skip_parsing)
+        return
     names = os.listdir(src)
     new_dst = parse_replacement(dst, replacements)
     if not os.path.exists(new_dst):
@@ -38,13 +41,26 @@ async def copy_tree(
         if os.path.isdir(src_name):
             await copy_tree(src_name, dst_name, replacements, excludes, skip_parsing)
             continue
-        new_dst_name = parse_replacement(dst_name, replacements)
-        shutil.copy2(src_name, new_dst_name)
-        try:
-            if any(fnmatch.fnmatch(new_dst_name, pattern) for pattern in skip_parsing):
-                continue
-            file_content = await read_text_file_async(new_dst_name)
-            new_file_content = parse_replacement(file_content, replacements)
-            await write_text_file_async(new_dst_name, new_file_content)
-        except Exception:
-            logger.error(f"Cannot parse file: {new_dst_name}")
+        await _copy_file(src_name, dst_name, replacements, excludes, skip_parsing)
+
+
+async def _copy_file(
+    src: str,
+    dst: str,
+    replacements: Optional[Mapping[str, str]] = None,
+    excludes: Optional[Iterable[str]] = None,
+    skip_parsing: Optional[Iterable[str]] = None,
+):
+    if any(fnmatch.fnmatch(src, pattern) for pattern in excludes):
+        return
+    new_dst_name = parse_replacement(dst, replacements)
+    if any(fnmatch.fnmatch(new_dst_name, pattern) for pattern in skip_parsing):
+        return
+    if new_dst_name != src:
+        shutil.copy2(src, new_dst_name)
+    try:
+        file_content = await read_text_file_async(new_dst_name)
+        new_file_content = parse_replacement(file_content, replacements)
+        await write_text_file_async(new_dst_name, new_file_content)
+    except Exception:
+        logger.error(f"Cannot parse file: {new_dst_name}")

zrb/helper/string/parse_replacement.py

@@ -1,3 +1,5 @@
+import re
+
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
@@ -10,5 +12,10 @@ logger.debug(colored("Loading zrb.helper.string.parse_replacment", attrs=["dark"
 def parse_replacement(text: str, replacement: Mapping[str, str]):
     new_text = text
     for old, new in replacement.items():
+        if len(new.strip().split("\n")) > 1:
+            pattern = "".join(["^([ \\t]+)", old])
+            new_replacement = "".join(["\\1", new.replace("\n", "\n\\1")])
+            new_text = re.sub(pattern, new_replacement, new_text, flags=re.MULTILINE)
+            continue
         new_text = new_text.replace(old, new)
     return new_text

zrb/task_input/multiline_input.py

@@ -120,6 +120,6 @@ class MultilineInput(BaseInput):
 
     def _get_mark_comment(self):
         prompt = self._prompt if isinstance(self._prompt, str) else self.get_name()
-        if self._comment_suffix.strip() != "":
+        if self._comment_suffix.strip() == "":
             return " ".join([self._comment_prefix, prompt])
         return " ".join([self._comment_prefix, prompt, self._comment_suffix])

{zrb-0.22.0.dist-info → zrb-0.23.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.22.0
+Version: 0.23.1
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: jsons (>=1.6.3,<1.7.0)
 Requires-Dist: libcst (>=0.4.9,<0.5.0)
 Requires-Dist: python-dotenv (>=1.0.1,<1.1.0)
 Requires-Dist: ruamel.yaml (>=0.18.6,<0.19.0)
-Requires-Dist: setuptools (>=69.1.1,<69.2.0)
+Requires-Dist: setuptools (>=70.0.0,<70.1.0)
 Requires-Dist: termcolor (>=2.4.0,<2.5.0)
 Requires-Dist: tomlkit (>=0.12.4,<0.13.0)
 Project-URL: Documentation, https://github.com/state-alchemists/zrb

{zrb-0.22.0.dist-info → zrb-0.23.1.dist-info}/RECORD

@@ -1322,7 +1322,7 @@ zrb/helper/docstring.py,sha256=kU3nZFYtCrrxNsLxmx2UofHav09VB5y0VeY_Blux6FQ,4970
 zrb/helper/env_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/env_map/fetch.py,sha256=wzOO58LmhQsgFVsVrUhdGbQmu6igOE1x6SR2SbRnuTA,2335
 zrb/helper/file/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/helper/file/copy_tree.py,sha256=Tuk4qej7ToZQqEmeiSADiFjWq7xyh-Nfzk1z2fjHZK0,1854
+zrb/helper/file/copy_tree.py,sha256=tOzM3VJXRTBprgZ-YNfTURlkxm5udFer9Yggtq3CXNU,2312
 zrb/helper/file/match.py,sha256=73uypJq5EnFAhA7kaNodW9vBLZ0MQVwZDh8CD3x52kw,721
 zrb/helper/file/text.py,sha256=7JqNbk8hC7Y4UopEmhiGYkxDAauepvI1tEkbfpzcI84,963
 zrb/helper/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1340,7 +1340,7 @@ zrb/helper/string/constant.py,sha256=kAwuNW9hC3xc24t5NoeUX5tautZMvWNzZdREKMMbXm8
 zrb/helper/string/conversion.py,sha256=pnhlhKwvXUR38jvtSo1HZNedl-7KtHoKaWl4OVIaEv0,772
 zrb/helper/string/jinja.py,sha256=FyYtsJjEDqk3atmaU2TdNWtA4qD88x-lmtF5BOa23KY,487
 zrb/helper/string/modification.py,sha256=sYPewGp72l2AhWXr-Wy3FfzO9aTLCULw-JgQzSmXQmI,308
-zrb/helper/string/parse_replacement.py,sha256=DzL1QM3-WCysdXi1qfxTPRudMwW4V1MxuIEIlbT5cq4,459
+zrb/helper/string/parse_replacement.py,sha256=2ulUKRnvoPFpbeoq84jLEbNGaGYRzH2n4tblCMIM0Pk,748
 zrb/helper/string/untyped_conversion.py,sha256=0hxwbyMz4psglAH5KnjfXBmgptJq34P9ltueQntBx4Y,1366
 zrb/helper/task.py,sha256=Z8p2urrTuABCFrsefR3u250Gdi1dtf7bABE4yR3oLZU,394
 zrb/helper/typecheck.py,sha256=Sb5lCiMfxppycj3nqUSxkyRPBdxdTRRnvaCCAb6mGrI,436
@@ -1401,12 +1401,12 @@ zrb/task_input/choice_input.py,sha256=qfrEzbs2g0CZeE2TzvfN0IOla_1B8Tikn-eIgMpLuP
 zrb/task_input/constant.py,sha256=VEsnrI0BDdCJ1Z58EJgxXUhZBe5CA8TfURo0cNu5CaQ,200
 zrb/task_input/float_input.py,sha256=bf2dhmbpmHMQiJFKYQEfTYmqpwyOEFh6CFM1r1dGTuw,4302
 zrb/task_input/int_input.py,sha256=P7lDQ0-x5lP_ZTfFeyc-aybub9oikBN4J13HZvWuw0A,4355
-zrb/task_input/multiline_input.py,sha256=K0qEWRAp3azV9gBH1cGnE2l3-eX7Bue_bQ9GvMdmjHs,5609
+zrb/task_input/multiline_input.py,sha256=kP2VQ4c42-d6P4RB3AA2eGTrFRLwvFlZxc7vGwjTeZA,5609
 zrb/task_input/password_input.py,sha256=3xxWHKJCDGbyl_5MmyyB2t_yRjwFKpIIbS10aq73ktk,4370
 zrb/task_input/str_input.py,sha256=0BJP3SQ8y0TRYPrwEy5pYv4N7jq8KlmRSVwByIFqIvI,4360
 zrb/task_input/task_input.py,sha256=WTj_qIQyRs-04-VotjNTcVyIuf6b2afInVoCQHoRmr0,2327
-zrb-0.22.0.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
-zrb-0.22.0.dist-info/METADATA,sha256=LqnDhX1dESGPkFwz105U_NsKKViYl0nhqTuM-jd0Ens,17076
-zrb-0.22.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-zrb-0.22.0.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
-zrb-0.22.0.dist-info/RECORD,,
+zrb-0.23.1.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
+zrb-0.23.1.dist-info/METADATA,sha256=JrxkQFGJnggG-omBTS1mdwgTYa_1COlzVrNYZF5zh34,17076
+zrb-0.23.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+zrb-0.23.1.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
+zrb-0.23.1.dist-info/RECORD,,