zrb 0.26.0__tar.gz → 0.26.1__tar.gz

{zrb-0.26.0 → zrb-0.26.1}/PKG-INFO

@@ -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 → zrb-0.26.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "0.26.0"
+version = "0.26.1"
 description = "A Framework to Enhance Your Workflow"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-0.26.0 → zrb-0.26.1}/src/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-0.26.0 → zrb-0.26.1}/src/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-0.26.0 → zrb-0.26.1}/src/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-0.26.0 → zrb-0.26.1}/src/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-0.26.0 → zrb-0.26.1}/src/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-0.26.0 → zrb-0.26.1}/src/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")