zrb 0.26.0__py3-none-any.whl → 0.26.1__py3-none-any.whl

zrb/builtin/monorepo/_config.py

@@ -2,8 +2,8 @@ import json
 import os
 from collections.abc import Mapping
 
-_PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
-MONOREPO_CONFIG_FILE = os.path.join(_PROJECT_DIR, "monorepo.zrb.json")
+PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
+MONOREPO_CONFIG_FILE = os.path.join(PROJECT_DIR, "monorepo.zrb.json")
 MONOREPO_CONFIG: Mapping[str, Mapping[str, str]] = {}
 
 if os.path.isfile(MONOREPO_CONFIG_FILE):

zrb/builtin/monorepo/_task.py

@@ -1,7 +1,7 @@
 import os
 from datetime import datetime
 
-from zrb.builtin.monorepo._config import MONOREPO_CONFIG
+from zrb.builtin.monorepo._config import MONOREPO_CONFIG, PROJECT_DIR
 from zrb.builtin.monorepo._group import monorepo_group
 from zrb.helper.util import to_kebab_case
 from zrb.runner import runner
@@ -9,17 +9,15 @@ from zrb.task.cmd_task import CmdTask
 from zrb.task_group.group import Group
 from zrb.task_input.str_input import StrInput
 
-_PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
-
 _pull_monorepo = CmdTask(
     name="pull-monorepo",
     inputs=[StrInput(name="message")],
-    cwd=_PROJECT_DIR,
     cmd=[
         "git add . -A",
         'git commit -m "{{input.message}}"',
         'git pull origin "$(git branch --show-current)"',
     ],
+    cwd=PROJECT_DIR,
     retry=0,
 )
 
@@ -49,13 +47,14 @@ for name, config in MONOREPO_CONFIG.items():
         cmd=[
             f'if [ ! -d "{subrepo_folder}" ]',
             "then",
-            "   echo Run subtree add",
+            "  echo Run subtree add",
             f'  git subtree add --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
             "fi",
             "echo Run subtree pull",
             "set -e",
             f'git subtree pull --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
         ],
+        cwd=PROJECT_DIR,
         retry=0,
     )
     _pull_monorepo >> pull_subrepo
@@ -79,7 +78,7 @@ for name, config in MONOREPO_CONFIG.items():
         cmd=[
             f'if [ ! -d "{subrepo_folder}" ]',
             "then",
-            "   echo Run subtree add",
+            "  echo Run subtree add",
             f'  git subtree add --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
             "fi",
             "echo Run subtree pull",
@@ -90,10 +89,11 @@ for name, config in MONOREPO_CONFIG.items():
             'git commit -m "{{input.message}}"',
             f'git subtree push --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
         ],
+        cwd=PROJECT_DIR,
         retry=0,
     )
     _pull_monorepo >> push_subrepo
     linked_push_subrepo = push_subrepo.copy()
-    PUSH_SUBREPO_UPSTREAM >> push_subrepo
+    PUSH_SUBREPO_UPSTREAM >> linked_push_subrepo
     PUSH_SUBREPO_UPSTREAM = linked_push_subrepo
     runner.register(push_subrepo)

zrb/builtin/monorepo/add.py

@@ -1,7 +1,12 @@
 import json
+import os
 from collections.abc import Mapping
 
-from zrb.builtin.monorepo._config import MONOREPO_CONFIG, MONOREPO_CONFIG_FILE
+from zrb.builtin.monorepo._config import (
+    MONOREPO_CONFIG,
+    MONOREPO_CONFIG_FILE,
+    PROJECT_DIR,
+)
 from zrb.builtin.monorepo._group import monorepo_group
 from zrb.runner import runner
 from zrb.task.any_task import AnyTask
@@ -30,6 +35,9 @@ from zrb.task_input.str_input import StrInput
 def add_to_monorepo(*args, **kwargs):
     task: AnyTask = kwargs.get("_task")
     input_map: Mapping[str, str] = task.get_input_map()
+    abs_folder = os.path.join(PROJECT_DIR, input_map.get("folder", ""))
+    if os.path.isdir(abs_folder):
+        raise ValueError(f"Directory exists: {abs_folder}")
     config = dict(MONOREPO_CONFIG)
     config[input_map.get("alias", "")] = {
         "folder": input_map.get("folder", ""),

zrb/builtin/monorepo/push.py

@@ -1,5 +1,7 @@
+import os
 from datetime import datetime
 
+from zrb.builtin.monorepo._config import PROJECT_DIR
 from zrb.builtin.monorepo._group import monorepo_group
 from zrb.builtin.monorepo._task import PUSH_SUBREPO_UPSTREAM
 from zrb.runner import runner
@@ -15,6 +17,7 @@ _push_monorepo = CmdTask(
         'git commit -m "{{input.message}}"',
         'git push origin "$(git branch --show-current)"',
     ],
+    cwd=PROJECT_DIR,
     retry=0,
 )
 

zrb/helper/asyncio_task.py

@@ -16,8 +16,11 @@ async def stop_asyncio():
 
 
 def stop_asyncio_sync():
-    loop = asyncio.get_event_loop()
-    if loop.is_running():
-        loop.create_task(stop_asyncio())
-    else:
-        loop.run_until_complete(stop_asyncio())
+    try:
+        loop = asyncio.get_event_loop()
+        if loop.is_running():
+            loop.create_task(stop_asyncio())
+        else:
+            loop.run_until_complete(stop_asyncio())
+    except Exception:
+        pass

zrb/helper/cli.py

@@ -58,7 +58,6 @@ def create_cli() -> click.Group:
                     attrs=["bold"],
                 )
             )
-            traceback.print_exc()
     # Load zrb_init.py
     project_dir = os.getenv("ZRB_PROJECT_DIR", os.getcwd())
     project_script = os.path.join(project_dir, "zrb_init.py")

{zrb-0.26.0.dist-info → zrb-0.26.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.26.0
+Version: 0.26.1
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-0.26.0.dist-info → zrb-0.26.1.dist-info}/RECORD

@@ -87,12 +87,12 @@ zrb/builtin/md5/_group.py,sha256=dimqCmJItc7qx7yRm64tL608oMAjOVXRycP7NTSSFi0,100
 zrb/builtin/md5/hash.py,sha256=futO_5AsXHdS5a7vuBLcgnKCpfEO9UeM-EqaIIBPCZE,572
 zrb/builtin/md5/sum.py,sha256=KZLsXIJrVxvbjyAiVv27-Y2ty-nBRRojsGxXyzQZaYE,688
 zrb/builtin/monorepo/__init__.py,sha256=AgzIDOcrW4FXxly5SqExyGRo-fIo0ocX_fCScLPDuR0,239
-zrb/builtin/monorepo/_config.py,sha256=ArqI0MZbuTkq2C3kdc6lVB2L2xjK5x2Z3IU-4_0YLJ8,367
+zrb/builtin/monorepo/_config.py,sha256=cTKOoDonkVXR-1SGUYtA8d5aUpDkhN4olhPQwfJhV4U,365
 zrb/builtin/monorepo/_group.py,sha256=idv_8MIE-TCNAvhE0urh7OxTx3qNZbBlE9wYJ-teqa8,115
-zrb/builtin/monorepo/_task.py,sha256=7QKgVNf6xqD6wAHjtVEE6CsHS12Yt_yqoalomPywY7A,3365
-zrb/builtin/monorepo/add.py,sha256=HhHLquFHbYvNja3foSstFAe_NBL1zSp2SWUBQuIiTYU,1374
+zrb/builtin/monorepo/_task.py,sha256=6KKlC1COqbv1fIfd7lT1GTg8zY0knFzwlbpkgf2OZpE,3382
+zrb/builtin/monorepo/add.py,sha256=MtPhTEJEdpfRsbdB-hln4hyGzPVWu9kdrmiCxqu0dTs,1580
 zrb/builtin/monorepo/pull.py,sha256=2wIrz1D6OJmuBkdVbWRDXUiz8W4aLo3GC601_ASVAb8,702
-zrb/builtin/monorepo/push.py,sha256=7I1OpjJjM-6aG6qQj2Tz584WngcY6yXYG8DjFgLqn08,999
+zrb/builtin/monorepo/push.py,sha256=ZvFHfOTVqSUj7gQ3D8mc19tdIoTz4gG2Iv6kui0neu8,1083
 zrb/builtin/process/__init__.py,sha256=dWM1zIehY65rkJvEAFvX6HGJHL8kb1gkzaSz0Woay8M,283
 zrb/builtin/process/_group.py,sha256=KY7iQ_pvqe5iVsRFeLWs-O-xuSyqlTXVj47_TCnu7zQ,118
 zrb/builtin/process/pid/__init__.py,sha256=Rcb3bYgR_oVNOlaggYjcRipHRehrumZuQyadrguXdR0,293
@@ -1328,9 +1328,9 @@ zrb/helper/accessories/icon.py,sha256=uKm3w5G1fV454MUhz_CZMy48AD99kBV9j2zRlJWzB1
 zrb/helper/accessories/name.py,sha256=e1uvU3MzuvDb5j6YIWBA048y4qeM-LfrxRKWlMehliE,1638
 zrb/helper/accessories/untyped_color.py,sha256=4wRbHSClbCzPRWtW-Cy2agOMozANVi7u4p8lMXMSuJg,194
 zrb/helper/advertisement.py,sha256=GOaCtWYL9Oj_tAg4jqsCuFsdinHaOSH_6d57y8BbsVU,912
-zrb/helper/asyncio_task.py,sha256=4OCXNwioMcQz7NgmXmNsS1Ege4Cp5Ld7MlwCmJNBuVs,622
+zrb/helper/asyncio_task.py,sha256=0CYQZcMnIO3514b8P0FJnTF9z7UasjJCf9TTDHfZLzM,686
 zrb/helper/callable.py,sha256=usatPKPkK_67G9dWreaGXskOaGHd_hE8MiTWAUhfojE,563
-zrb/helper/cli.py,sha256=S1j8hfW_zEDeycPRbJd0E8xkOZkuEZ5PNz6JO6EC8UI,2637
+zrb/helper/cli.py,sha256=cb82aZCX5NoOHQNTx3wtdKOAQJP79ky4HA6w0VjVBh0,2603
 zrb/helper/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/codemod/add_argument_to_function.py,sha256=Xh5Tlb4iO3cv4dRR12ms9kf0j-atVSnCh88TuqCof8I,1435
 zrb/helper/codemod/add_argument_to_function_call.py,sha256=dFFqQ885gG_ZCBgax6sjkWx7s7cIk1amLhTC0Ge_zZo,1186
@@ -1434,8 +1434,8 @@ zrb/task_input/multiline_input.py,sha256=KNto5k5X1C6KE_A-vX0OjpQyjgCRJ6BR2PwHXNQ
 zrb/task_input/password_input.py,sha256=95NlJ9xIq7z_evpAyR2XsBpeuWpBXd2Ezn3P7oDOttk,4360
 zrb/task_input/str_input.py,sha256=0nje7vI9fs_xqQBbmKB8Yn7wevlWp9Qebv7f8-GmiXs,4350
 zrb/task_input/task_input.py,sha256=WTj_qIQyRs-04-VotjNTcVyIuf6b2afInVoCQHoRmr0,2327
-zrb-0.26.0.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
-zrb-0.26.0.dist-info/METADATA,sha256=v5Q0BGRSOW4Hy5vvsMm8Mp4Tp5t-o1HK4PbM50YzlvA,17085
-zrb-0.26.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-zrb-0.26.0.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
-zrb-0.26.0.dist-info/RECORD,,
+zrb-0.26.1.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
+zrb-0.26.1.dist-info/METADATA,sha256=13sVwksJgQqxQn6tNs5nuZm0l_kFO6XgiHfjaP91O28,17085
+zrb-0.26.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+zrb-0.26.1.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
+zrb-0.26.1.dist-info/RECORD,,