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

zrb/action/runner.py

@@ -5,6 +5,7 @@ from typing import Any, Union
 import click
 
 from zrb.helper.accessories.color import colored
+from zrb.helper.asyncio_task import stop_asyncio_sync
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
 from zrb.task.any_task import AnyTask
@@ -120,6 +121,7 @@ class Runner:
             try:
                 function(*args, **kwargs)
             except Exception:
+                stop_asyncio_sync()
                 sys.exit(1)
             finally:
                 task.clear_xcom()

zrb/builtin/__init__.py

@@ -24,6 +24,7 @@ from zrb.builtin.eval import evaluate
 from zrb.builtin.explain import explain_group, explain_tasks
 from zrb.builtin.git import clear_git_branch, get_git_file_changes, git_group
 from zrb.builtin.md5 import hash_text_md5, md5_group, sum_file_md5
+from zrb.builtin.monorepo import add_to_monorepo, pull_from_monorepo, push_to_monorepo
 from zrb.builtin.process import (
     get_process_pid_by_name,
     get_process_pid_by_port,
@@ -113,6 +114,9 @@ assert add_project_tasks
 assert add_cmd_task
 assert add_docker_compose_task
 assert add_python_task
+assert add_to_monorepo
+assert pull_from_monorepo
+assert push_to_monorepo
 assert ubuntu_group
 assert ubuntu_install_group
 assert update_ubuntu

zrb/builtin/docker/prune.py

@@ -1,15 +1,23 @@
 from zrb.builtin.docker._group import docker_group
 from zrb.runner import runner
 from zrb.task.cmd_task import CmdTask
+from zrb.task_input.bool_input import BoolInput
 
 prune_docker = CmdTask(
     name="prune",
     group=docker_group,
     description="Prune unused images and volumes",
+    inputs=[
+        BoolInput(
+            name="all", shortcut="a", prompt="Remove all unused images", default=False
+        ),
+        BoolInput(
+            name="volume", shortcut="v", prompt="Prune anonymous volume", default=False
+        ),
+    ],
     cmd=[
-        "docker system prune -af",
-        "docker image prune -af",
-        "docker system prune -af --volumes",
+        "docker system prune -f {% if input.all %}-a{% endif %} {% if input.volume %}--volumes{% endif %}",  # noqa
+        "docker image prune -f {% if input.all %}-a{% endif %}",
         "docker system df",
     ],
 )

zrb/builtin/monorepo/__init__.py

@@ -0,0 +1,7 @@
+from zrb.builtin.monorepo.add import add_to_monorepo
+from zrb.builtin.monorepo.pull import pull_from_monorepo
+from zrb.builtin.monorepo.push import push_to_monorepo
+
+assert add_to_monorepo
+assert pull_from_monorepo
+assert push_to_monorepo

zrb/builtin/monorepo/_config.py

@@ -0,0 +1,11 @@
+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")
+MONOREPO_CONFIG: Mapping[str, Mapping[str, str]] = {}
+
+if os.path.isfile(MONOREPO_CONFIG_FILE):
+    with open(MONOREPO_CONFIG_FILE, "r") as file:
+        MONOREPO_CONFIG = json.load(file)

zrb/builtin/monorepo/_group.py

@@ -0,0 +1,3 @@
+from zrb.task_group.group import Group
+
+monorepo_group = Group(name="monorepo", description="Monorepo management")

zrb/builtin/monorepo/_task.py

@@ -0,0 +1,99 @@
+import os
+from datetime import datetime
+
+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
+from zrb.task.cmd_task import CmdTask
+from zrb.task_group.group import Group
+from zrb.task_input.str_input import StrInput
+
+_pull_monorepo = CmdTask(
+    name="pull-monorepo",
+    inputs=[StrInput(name="message")],
+    cmd=[
+        "git add . -A",
+        'git commit -m "{{input.message}}"',
+        'git pull origin "$(git branch --show-current)"',
+    ],
+    cwd=PROJECT_DIR,
+    retry=0,
+)
+
+PULL_SUBREPO_UPSTREAM = _pull_monorepo
+PUSH_SUBREPO_UPSTREAM = _pull_monorepo
+for name, config in MONOREPO_CONFIG.items():
+    kebab_name = to_kebab_case(name)
+    group = Group(
+        name=kebab_name, parent=monorepo_group, description=f"Subrepo {name} management"
+    )
+    subrepo_origin = config.get("origin", "")
+    subrepo_folder = config.get("folder", "")
+    subrepo_branch = config.get("branch", "main")
+
+    # define pull subrepo
+    pull_subrepo = CmdTask(
+        name="pull",
+        group=group,
+        inputs=[
+            StrInput(
+                name="message",
+                shortcut="m",
+                prompt="Commit Messsage",
+                default=lambda m: f"Pulling from subrepo at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+            )
+        ],
+        cmd=[
+            f'if [ ! -d "{subrepo_folder}" ]',
+            "then",
+            "  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
+    linked_pull_subrepo = pull_subrepo.copy()
+    PULL_SUBREPO_UPSTREAM >> linked_pull_subrepo
+    PULL_SUBREPO_UPSTREAM = linked_pull_subrepo
+    runner.register(pull_subrepo)
+
+    # define push subrepo
+    push_subrepo = CmdTask(
+        name="push",
+        group=group,
+        inputs=[
+            StrInput(
+                name="message",
+                shortcut="m",
+                prompt="Commit Messsage",
+                default=lambda m: f"Pushing to subrepo at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+            )
+        ],
+        cmd=[
+            f'if [ ! -d "{subrepo_folder}" ]',
+            "then",
+            "  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
+            "set +e",
+            "git add . -A",
+            '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 >> linked_push_subrepo
+    PUSH_SUBREPO_UPSTREAM = linked_push_subrepo
+    runner.register(push_subrepo)

zrb/builtin/monorepo/add.py

@@ -0,0 +1,48 @@
+import json
+import os
+from collections.abc import Mapping
+
+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
+from zrb.task.decorator import python_task
+from zrb.task_input.str_input import StrInput
+
+
+@python_task(
+    name="add",
+    group=monorepo_group,
+    inputs=[
+        StrInput(name="alias", shortcut="a", prompt="Repo Alias", prompt_required=True),
+        StrInput(name="folder", shortcut="d", prompt="Directory", prompt_required=True),
+        StrInput(name="origin", shortcut="o", prompt="Repo URL", prompt_required=True),
+        StrInput(
+            name="branch",
+            shortcut="b",
+            prompt="Repo Branch",
+            prompt_required=True,
+            default="main",
+        ),
+    ],
+    description="Add repo to monorepo",
+    runner=runner,
+)
+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", ""),
+        "branch": input_map.get("branch", ""),
+        "origin": input_map.get("origin", ""),
+    }
+    with open(MONOREPO_CONFIG_FILE, "w") as file:
+        json.dump(config, file, indent=2)

zrb/builtin/monorepo/pull.py

@@ -0,0 +1,23 @@
+from datetime import datetime
+
+from zrb.builtin.monorepo._group import monorepo_group
+from zrb.builtin.monorepo._task import PULL_SUBREPO_UPSTREAM
+from zrb.runner import runner
+from zrb.task.task import Task
+from zrb.task_input.str_input import StrInput
+
+pull_from_monorepo = Task(
+    name="pull",
+    group=monorepo_group,
+    description="Pulling from subrepos",
+    inputs=[
+        StrInput(
+            name="message",
+            shortcut="m",
+            prompt="Commit Messsage",
+            default=lambda m: f"Pulling from subrepos at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+        )
+    ],
+)
+PULL_SUBREPO_UPSTREAM >> pull_from_monorepo
+runner.register(pull_from_monorepo)

zrb/builtin/monorepo/push.py

@@ -0,0 +1,38 @@
+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
+from zrb.task.cmd_task import CmdTask
+from zrb.task.task import Task
+from zrb.task_input.str_input import StrInput
+
+_push_monorepo = CmdTask(
+    name="push-monorepo",
+    inputs=[StrInput(name="message")],
+    cmd=[
+        "git add . -A",
+        'git commit -m "{{input.message}}"',
+        'git push origin "$(git branch --show-current)"',
+    ],
+    cwd=PROJECT_DIR,
+    retry=0,
+)
+
+push_to_monorepo = Task(
+    name="push",
+    group=monorepo_group,
+    description="Pushing to subrepos",
+    inputs=[
+        StrInput(
+            name="message",
+            shortcut="m",
+            prompt="Commit Messsage",
+            default=lambda m: f"Pushing to subrepos at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+        )
+    ],
+)
+PUSH_SUBREPO_UPSTREAM >> _push_monorepo >> push_to_monorepo
+runner.register(push_to_monorepo)

zrb/builtin/project/_input.py

@@ -2,12 +2,12 @@ import os
 
 from zrb.task_input.str_input import StrInput
 
-SYSTEM_USER = os.getenv("USER", "incognito")
+_PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
 
 project_dir_input = StrInput(
     name="project-dir",
     shortcut="d",
     description="Project directory",
     prompt="Project directory",
-    default=".",
+    default=_PROJECT_DIR,
 )