zrb 1.0.0b7__tar.gz → 1.0.0b8__tar.gz

{zrb-1.0.0b7 → zrb-1.0.0b8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.0.0b7
+Version: 1.0.0b8
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.0.0b7 → zrb-1.0.0b8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.0.0b7"
+version = "1.0.0b8"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-1.0.0b7 → zrb-1.0.0b8}/src/zrb/builtin/git.py

@@ -57,9 +57,9 @@ from zrb.util.git import (
 )
 async def get_git_diff(ctx: AnyContext):
     ctx.print(stylize_faint("Get directory"))
-    repo_dir = await get_repo_dir(log_method=ctx.print)
+    repo_dir = await get_repo_dir(print_method=ctx.print)
     diff = await get_diff(
-        repo_dir, ctx.input.source, ctx.input.current, log_method=ctx.print
+        repo_dir, ctx.input.source, ctx.input.current, print_method=ctx.print
     )
     result = []
     decorated = []
@@ -88,17 +88,17 @@ async def get_git_diff(ctx: AnyContext):
 )
 async def prune_local_branches(ctx: AnyContext):
     ctx.print(stylize_faint("Get directory"))
-    repo_dir = await get_repo_dir(log_method=ctx.print)
+    repo_dir = await get_repo_dir(print_method=ctx.print)
     ctx.print(stylize_faint("Get existing branches"))
-    branches = await get_branches(repo_dir, log_method=ctx.print)
+    branches = await get_branches(repo_dir, print_method=ctx.print)
     ctx.print(stylize_faint("Get current branch"))
-    current_branch = await get_current_branch(repo_dir, log_method=ctx.print)
+    current_branch = await get_current_branch(repo_dir, print_method=ctx.print)
     for branch in branches:
         if branch == current_branch or branch == "main" or branch == "master":
             continue
         ctx.print(stylize_faint(f"Removing local branch: {branch}"))
         try:
-            await delete_branch(repo_dir, branch, log_method=ctx.print)
+            await delete_branch(repo_dir, branch, print_method=ctx.print)
         except Exception as e:
             ctx.log_error(e)
 
@@ -117,11 +117,11 @@ async def prune_local_branches(ctx: AnyContext):
 )
 async def git_commit(ctx: AnyContext):
     ctx.print(stylize_faint("Get directory"))
-    repo_dir = await get_repo_dir(log_method=ctx.print)
+    repo_dir = await get_repo_dir(print_method=ctx.print)
     ctx.print(stylize_faint("Add changes to staging"))
-    await add(repo_dir, log_method=ctx.print)
+    await add(repo_dir, print_method=ctx.print)
     ctx.print(stylize_faint("Commit changes"))
-    await commit(repo_dir, ctx.input.message, log_method=ctx.print)
+    await commit(repo_dir, ctx.input.message, print_method=ctx.print)
 
 
 @make_task(
@@ -139,12 +139,12 @@ async def git_commit(ctx: AnyContext):
 )
 async def git_pull(ctx: AnyContext):
     ctx.print(stylize_faint("Get directory"))
-    repo_dir = await get_repo_dir(log_method=ctx.print)
+    repo_dir = await get_repo_dir(print_method=ctx.print)
     ctx.print(stylize_faint("Get current branch"))
-    current_branch = await get_current_branch(repo_dir, log_method=ctx.print)
+    current_branch = await get_current_branch(repo_dir, print_method=ctx.print)
     remote = ctx.input.remote
     ctx.print(stylize_faint(f"Pulling from {remote}/{current_branch}"))
-    await pull(repo_dir, remote, current_branch, log_method=ctx.print)
+    await pull(repo_dir, remote, current_branch, print_method=ctx.print)
 
 
 @make_task(
@@ -161,9 +161,9 @@ async def git_pull(ctx: AnyContext):
     alias="push",
 )
 async def git_push(ctx: AnyContext):
-    repo_dir = await get_repo_dir(log_method=ctx.print)
+    repo_dir = await get_repo_dir(print_method=ctx.print)
     ctx.print(stylize_faint("Get current branch"))
-    current_branch = await get_current_branch(repo_dir, log_method=ctx.print)
+    current_branch = await get_current_branch(repo_dir, print_method=ctx.print)
     remote = ctx.input.remote
     ctx.print(stylize_faint(f"Pushing to {remote}/{current_branch}"))
-    await push(repo_dir, remote, current_branch, log_method=ctx.print)
+    await push(repo_dir, remote, current_branch, print_method=ctx.print)

{zrb-1.0.0b7 → zrb-1.0.0b8}/src/zrb/builtin/git_subtree.py

@@ -35,7 +35,7 @@ from zrb.util.git_subtree import add_subtree, load_config, pull_subtree, push_su
 )
 async def git_add_subtree(ctx: AnyContext):
     ctx.print(stylize_faint("Get directory"))
-    repo_dir = await get_repo_dir(log_method=ctx.print)
+    repo_dir = await get_repo_dir(print_method=ctx.print)
     ctx.print(stylize_faint("Add subtree"))
     await add_subtree(
         repo_dir=repo_dir,
@@ -43,7 +43,7 @@ async def git_add_subtree(ctx: AnyContext):
         repo_url=ctx.input["repo-url"],
         branch=ctx.input["repo-branch"],
         prefix=ctx.input["repo-prefix"],
-        log_method=ctx.print,
+        print_method=ctx.print,
     )
 
 
@@ -56,7 +56,7 @@ async def git_add_subtree(ctx: AnyContext):
 )
 async def git_pull_subtree(ctx: AnyContext):
     ctx.print(stylize_faint("Get directory"))
-    repo_dir = await get_repo_dir(log_method=ctx.print)
+    repo_dir = await get_repo_dir(print_method=ctx.print)
     config = load_config(repo_dir)
     if not config.data:
         raise ValueError("No subtree config found")
@@ -69,7 +69,7 @@ async def git_pull_subtree(ctx: AnyContext):
                 prefix=detail.prefix,
                 repo_url=detail.repo_url,
                 branch=detail.branch,
-                log_method=ctx.print,
+                print_method=ctx.print,
             )
         except Exception as e:
             if first_err is None:
@@ -88,7 +88,7 @@ async def git_pull_subtree(ctx: AnyContext):
 )
 async def git_push_subtree(ctx: AnyContext):
     ctx.print(stylize_faint("Get directory"))
-    repo_dir = await get_repo_dir(log_method=ctx.print)
+    repo_dir = await get_repo_dir(print_method=ctx.print)
     config = load_config(repo_dir)
     if not config.data:
         raise ValueError("No subtree config found")
@@ -101,7 +101,7 @@ async def git_push_subtree(ctx: AnyContext):
                 prefix=detail.prefix,
                 repo_url=detail.repo_url,
                 branch=detail.branch,
-                log_method=ctx.print,
+                print_method=ctx.print,
             )
         except Exception as e:
             if first_err is None:

{zrb-1.0.0b7 → zrb-1.0.0b8}/src/zrb/task/cmd_task.py

@@ -126,7 +126,7 @@ class CmdTask(BaseTask):
         if self._get_should_warn_unrecommended_commands():
             self._check_unrecommended_commands(ctx, shell, cmd_script)
         ctx.log_info("Running script")
-        log_method = (
+        print_method = (
             partial(ctx.print, plain=True) if self._should_plain_print else ctx.print
         )
         xcom_pid_key = f"{self.name}-pid"
@@ -135,7 +135,7 @@ class CmdTask(BaseTask):
             cmd=[shell, shell_flag, cmd_script],
             cwd=cwd,
             env_map=env_map,
-            print_method=log_method,
+            print_method=print_method,
             register_pid_method=lambda pid: ctx.xcom.get(xcom_pid_key).push(pid),
             max_output_line=self._max_output_line,
             max_error_line=self._max_error_line,

{zrb-1.0.0b7 → zrb-1.0.0b8}/src/zrb/util/cmd/command.py

@@ -65,7 +65,7 @@ async def run_command(
     max_error_line: int = 1000,
 ) -> tuple[CmdResult, int]:
     async def __read_stream(
-        stream, log_method: Callable[..., None], max_lines: int
+        stream, print_method: Callable[..., None], max_lines: int
     ) -> str:
         lines = []
         while True:
@@ -76,7 +76,7 @@ async def run_command(
             lines.append(line)
             if len(lines) > max_lines:
                 lines.pop(0)  # Keep only the last max_lines
-            log_method(line)
+            print_method(line)
         return "\n".join(lines)
 
     actual_print_method = print_method if print_method is not None else print

{zrb-1.0.0b7 → zrb-1.0.0b8}/src/zrb/util/git.py

@@ -17,12 +17,12 @@ async def get_diff(
     repo_dir: str,
     source_commit: str,
     current_commit: str,
-    log_method: Callable[..., Any] = print,
+    print_method: Callable[..., Any] = print,
 ) -> DiffResult:
     cmd_result, exit_code = await run_command(
         cmd=["git", "diff", source_commit, current_commit],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -54,10 +54,10 @@ async def get_diff(
     )
 
 
-async def get_repo_dir(log_method: Callable[..., Any] = print) -> str:
+async def get_repo_dir(print_method: Callable[..., Any] = print) -> str:
     cmd_result, exit_code = await run_command(
         cmd=["git", "rev-parse", "--show-toplevel"],
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -65,12 +65,12 @@ async def get_repo_dir(log_method: Callable[..., Any] = print) -> str:
 
 
 async def get_current_branch(
-    repo_dir: str, log_method: Callable[..., Any] = print
+    repo_dir: str, print_method: Callable[..., Any] = print
 ) -> str:
     cmd_result, exit_code = await run_command(
         cmd=["git", "rev-parse", "--abbrev-ref", "HEAD"],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -78,12 +78,12 @@ async def get_current_branch(
 
 
 async def get_branches(
-    repo_dir: str, log_method: Callable[..., Any] = print
+    repo_dir: str, print_method: Callable[..., Any] = print
 ) -> list[str]:
     cmd_result, exit_code = await run_command(
         cmd=["git", "rev-parse", "--abbrev-ref", "HEAD"],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -93,35 +93,35 @@ async def get_branches(
 
 
 async def delete_branch(
-    repo_dir: str, branch_name: str, log_method: Callable[..., Any] = print
+    repo_dir: str, branch_name: str, print_method: Callable[..., Any] = print
 ) -> str:
     cmd_result, exit_code = await run_command(
         cmd=["git", "branch", "-D", branch_name],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
     return cmd_result.output.strip()
 
 
-async def add(repo_dir: str, log_method: Callable[..., Any] = print):
+async def add(repo_dir: str, print_method: Callable[..., Any] = print):
     _, exit_code = await run_command(
         cmd=["git", "add", ".", "-A"],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
 
 
 async def commit(
-    repo_dir: str, message: str, log_method: Callable[..., Any] = print
+    repo_dir: str, message: str, print_method: Callable[..., Any] = print
 ) -> str:
     cmd_result, exit_code = await run_command(
         cmd=["git", "commit", "-m", message],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         ignored_error_message = "nothing to commit, working tree clean"
@@ -133,24 +133,24 @@ async def commit(
 
 
 async def pull(
-    repo_dir: str, remote: str, branch: str, log_method: Callable[..., Any] = print
+    repo_dir: str, remote: str, branch: str, print_method: Callable[..., Any] = print
 ) -> str:
     _, exit_code = await run_command(
         cmd=["git", "pull", remote, branch],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
 
 
 async def push(
-    repo_dir: str, remote: str, branch: str, log_method: Callable[..., Any] = print
+    repo_dir: str, remote: str, branch: str, print_method: Callable[..., Any] = print
 ) -> str:
     _, exit_code = await run_command(
         cmd=["git", "push", "-u", remote, branch],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")

{zrb-1.0.0b7 → zrb-1.0.0b8}/src/zrb/util/git_subtree.py

@@ -36,7 +36,7 @@ async def add_subtree(
     repo_url: str,
     branch: str,
     prefix: str,
-    log_method: Callable[..., Any] = print,
+    print_method: Callable[..., Any] = print,
 ):
     config = load_config()
     if os.path.isdir(prefix):
@@ -54,7 +54,7 @@ async def add_subtree(
             branch,
         ],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -69,7 +69,7 @@ async def pull_subtree(
     prefix: str,
     repo_url: str,
     branch: str,
-    log_method: Callable[..., Any] = print,
+    print_method: Callable[..., Any] = print,
 ):
     _, exit_code = await run_command(
         cmd=[
@@ -82,7 +82,7 @@ async def pull_subtree(
             branch,
         ],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -93,7 +93,7 @@ async def push_subtree(
     prefix: str,
     repo_url: str,
     branch: str,
-    log_method: Callable[..., Any] = print,
+    print_method: Callable[..., Any] = print,
 ):
     _, exit_code = await run_command(
         cmd=[
@@ -106,7 +106,7 @@ async def push_subtree(
             branch,
         ],
         cwd=repo_dir,
-        print_method=log_method,
+        print_method=print_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")