zrb 1.0.0a6__tar.gz → 1.0.0a7__tar.gz

{zrb-1.0.0a6 → zrb-1.0.0a7}/PKG-INFO

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

{zrb-1.0.0a6 → zrb-1.0.0a7}/pyproject.toml

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

{zrb-1.0.0a6 → zrb-1.0.0a7}/src/zrb/builtin/git.py

@@ -11,6 +11,7 @@ from zrb.util.git import (
     get_branches,
     get_current_branch,
     get_diff,
+    get_repo_dir,
     pull,
     push,
 )
@@ -55,7 +56,8 @@ from zrb.util.git import (
     alias="diff",
 )
 def get_git_diff(ctx: AnyContext):
-    diff = get_diff(ctx.input.source, ctx.input.current)
+    repo_dir = get_repo_dir()
+    diff = get_diff(repo_dir, ctx.input.source, ctx.input.current)
     result = []
     decorated = []
     if ctx.input.created and diff.created:
@@ -82,14 +84,15 @@ def get_git_diff(ctx: AnyContext):
     alias="prune",
 )
 def prune_local_branches(ctx: AnyContext):
-    branches = get_branches()
-    current_branch = get_current_branch()
+    repo_dir = get_repo_dir()
+    branches = get_branches(repo_dir)
+    current_branch = get_current_branch(repo_dir)
     for branch in branches:
         if branch == current_branch or branch == "main" or branch == "master":
             continue
         ctx.print(stylize_yellow(f"Removing local branch: {branch}"))
         try:
-            delete_branch(branch)
+            delete_branch(repo_dir, branch)
         except Exception as e:
             ctx.log_error(e)
 
@@ -107,11 +110,12 @@ def prune_local_branches(ctx: AnyContext):
     alias="commit",
 )
 def git_commit(ctx: AnyContext):
+    repo_dir = get_repo_dir()
     ctx.print("Add changes to staging")
-    add()
+    add(repo_dir)
     ctx.print("Commit changes")
     try:
-        commit(ctx.input.message)
+        commit(repo_dir, ctx.input.message)
     except Exception as e:
         ctx.log_error(e)
 
@@ -130,10 +134,11 @@ def git_commit(ctx: AnyContext):
     alias="pull",
 )
 def git_pull(ctx: AnyContext):
+    repo_dir = get_repo_dir()
     remote = ctx.input.remote
-    current_branch = get_current_branch()
+    current_branch = get_current_branch(repo_dir)
     ctx.print(f"Pulling from {remote}/{current_branch}")
-    pull(remote, current_branch)
+    pull(repo_dir, remote, current_branch)
 
 
 @make_task(
@@ -150,7 +155,8 @@ def git_pull(ctx: AnyContext):
     alias="push",
 )
 def git_push(ctx: AnyContext):
+    repo_dir = get_repo_dir()
     remote = ctx.input.remote
-    current_branch = get_current_branch()
+    current_branch = get_current_branch(repo_dir)
     ctx.print(f"Pushing to {remote}/{current_branch}")
-    push(remote, current_branch)
+    push(repo_dir, remote, current_branch)

{zrb-1.0.0a6 → zrb-1.0.0a7}/src/zrb/builtin/git_subtree.py

@@ -3,6 +3,7 @@ from zrb.builtin.group import git_subtree_group
 from zrb.context.any_context import AnyContext
 from zrb.input.str_input import StrInput
 from zrb.task.make_task import make_task
+from zrb.util.git import get_repo_dir
 from zrb.util.git_subtree import add_subtree, load_config, pull_subtree, push_subtree
 
 
@@ -32,7 +33,9 @@ from zrb.util.git_subtree import add_subtree, load_config, pull_subtree, push_su
     alias="add",
 )
 def git_add_subtree(ctx: AnyContext):
+    repo_dir = get_repo_dir()
     add_subtree(
+        repo_dir=repo_dir,
         name=ctx.input.name,
         repo_url=ctx.input["repo-url"],
         branch=ctx.input["repo-branch"],
@@ -48,14 +51,20 @@ def git_add_subtree(ctx: AnyContext):
     alias="pull",
 )
 def git_pull_subtree(ctx: AnyContext):
-    config = load_config()
+    repo_dir = get_repo_dir()
+    config = load_config(repo_dir)
     if not config.data:
         raise ValueError("No subtree config found")
     first_err: Exception | None = None
     for name, detail in config.data.items():
         try:
             ctx.print(f"Pull from subtree {name}")
-            pull_subtree(detail.prefix, detail.repo_url, detail.branch)
+            pull_subtree(
+                repo_dir=repo_dir,
+                prefix=detail.prefix,
+                repo_url=detail.repo_url,
+                branch=detail.branch,
+            )
         except Exception as e:
             if first_err is None:
                 first_err = e
@@ -72,14 +81,20 @@ def git_pull_subtree(ctx: AnyContext):
     alias="push",
 )
 def git_push_subtree(ctx: AnyContext):
-    config = load_config()
+    repo_dir = get_repo_dir()
+    config = load_config(repo_dir)
     if not config.data:
         raise ValueError("No subtree config found")
     first_err: Exception | None = None
     for name, detail in config.data.items():
         try:
             ctx.print(f"Push to subtree {name}")
-            push_subtree(detail.prefix, detail.repo_url, detail.branch)
+            push_subtree(
+                repo_dir=repo_dir,
+                prefix=detail.prefix,
+                repo_url=detail.repo_url,
+                branch=detail.branch,
+            )
         except Exception as e:
             if first_err is None:
                 first_err = e

{zrb-1.0.0a6 → zrb-1.0.0a7}/src/zrb/builtin/group.py

@@ -32,3 +32,12 @@ add_to_project_group = project_group.add_group(
 add_fastapp_to_project_group = add_to_project_group.add_group(
     Group(name="fastapp", description="🚀 Add Fastapp resources")
 )
+
+setup_group = cli.add_group(Group(name="setup", description="🛠️ Setup"))
+setup_system_group = setup_group.add_group(
+    Group(name="system", description="🛠️ Setup system")
+)
+setup_dev_group = setup_group.add_group(Group(name="dev", description="🧑‍💻 Setup dev"))
+setup_service_group = setup_group.add_group(
+    Group(name="services", description="🌐 Setup services")
+)

{zrb-1.0.0a6 → zrb-1.0.0a7}/src/zrb/config.py

@@ -77,7 +77,7 @@ BANNER = f"""
    zzzzz rr     bbbbbb   {VERSION} Janggala
    _ _ . .  . _ .  _ . . .
 
-A Framework to Enhance Your Workflow
+Your Automation Powerhouse
 
 ☕ Donate at: https://stalchmst.com/donation
 🐙 Submit issues/PR at: https://github.com/state-alchemists/zrb

{zrb-1.0.0a6 → zrb-1.0.0a7}/src/zrb/util/git.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 
 from pydantic import BaseModel
@@ -9,14 +10,19 @@ class DiffResult(BaseModel):
     updated: list[str]
 
 
-def get_diff(source_commit: str, current_commit: str) -> DiffResult:
-    # git show b176b5a main
-    exit_status, output = subprocess.getstatusoutput(
-        f"git diff {source_commit} {current_commit}"
-    )
-    if exit_status != 0:
-        raise Exception(output)
-    lines = output.split("\n")
+def get_diff(repo_dir: str, source_commit: str, current_commit: str) -> DiffResult:
+    try:
+        result = subprocess.run(
+            ["git", "diff", source_commit, current_commit],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            cwd=repo_dir,
+            text=True,
+            check=True,
+        )
+    except subprocess.CalledProcessError as e:
+        raise Exception(e.stderr or e.stdout)
+    lines = result.stdout.strip().split("\n")
     diff: dict[str, dict[str, bool]] = {}
     for line in lines:
         if not line.startswith("---") and not line.startswith("+++"):
@@ -55,17 +61,18 @@ def get_repo_dir() -> str:
             check=True,
         )
         # Return the directory path
-        return result.stdout.strip()
+        return os.path.abspath(result.stdout.strip())
     except subprocess.CalledProcessError as e:
         raise Exception(e.stderr or e.stdout)
 
 
-def get_current_branch() -> str:
+def get_current_branch(repo_dir: str) -> str:
     try:
         result = subprocess.run(
             ["git", "rev-parse", "--abbrev-ref", "HEAD"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )
@@ -74,12 +81,13 @@ def get_current_branch() -> str:
         raise Exception(e.stderr or e.stdout)
 
 
-def get_branches() -> list[str]:
+def get_branches(repo_dir: str) -> list[str]:
     try:
         result = subprocess.run(
             ["git", "branch"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )
@@ -90,12 +98,13 @@ def get_branches() -> list[str]:
         raise Exception(e.stderr or e.stdout)
 
 
-def delete_branch(branch_name: str) -> str:
+def delete_branch(repo_dir: str, branch_name: str) -> str:
     try:
         result = subprocess.run(
             ["git", "branch", "-D", branch_name],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )
@@ -104,12 +113,13 @@ def delete_branch(branch_name: str) -> str:
         raise Exception(e.stderr or e.stdout)
 
 
-def add() -> str:
+def add(repo_dir: str) -> str:
     try:
         subprocess.run(
             ["git", "add", ".", "-A"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )
@@ -117,25 +127,28 @@ def add() -> str:
         raise Exception(e.stderr or e.stdout)
 
 
-def commit(message: str) -> str:
+def commit(repo_dir: str, message: str) -> str:
     try:
         subprocess.run(
             ["git", "commit", "-m", message],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )
     except subprocess.CalledProcessError as e:
-        raise Exception(e.stderr or e.stdout)
+        if "nothing to commit, working tree clean" not in e.stderr:
+            raise Exception(e.stderr or e.stdout)
 
 
-def pull(remote: str, branch: str) -> str:
+def pull(repo_dir: str, remote: str, branch: str) -> str:
     try:
         subprocess.run(
             ["git", "pull", remote, branch],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )
@@ -143,12 +156,13 @@ def pull(remote: str, branch: str) -> str:
         raise Exception(e.stderr or e.stdout)
 
 
-def push(remote: str, branch: str) -> str:
+def push(repo_dir: str, remote: str, branch: str) -> str:
     try:
         subprocess.run(
             ["git", "push", "-u", remote, branch],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )

{zrb-1.0.0a6 → zrb-1.0.0a7}/src/zrb/util/git_subtree.py

@@ -3,8 +3,6 @@ import subprocess
 
 from pydantic import BaseModel
 
-from zrb.util.git import get_repo_dir
-
 
 class SingleSubTreeConfig(BaseModel):
     repo_url: str
@@ -16,21 +14,21 @@ class SubTreeConfig(BaseModel):
     data: dict[str, SingleSubTreeConfig]
 
 
-def load_config() -> SubTreeConfig:
-    file_path = os.path.join(get_repo_dir(), "subtrees.json")
+def load_config(repo_dir: str) -> SubTreeConfig:
+    file_path = os.path.join(repo_dir, "subtrees.json")
     if not os.path.exists(file_path):
         return SubTreeConfig(data={})
     with open(file_path, "r") as f:
         return SubTreeConfig.model_validate_json(f.read())
 
 
-def save_config(config: SubTreeConfig):
-    file_path = os.path.join(get_repo_dir(), "subtrees.json")
+def save_config(repo_dir: str, config: SubTreeConfig):
+    file_path = os.path.join(repo_dir, "subtrees.json")
     with open(file_path, "w") as f:
         f.write(config.model_dump_json(indent=2))
 
 
-def add_subtree(name: str, repo_url: str, branch: str, prefix: str):
+def add_subtree(repo_dir: str, name: str, repo_url: str, branch: str, prefix: str):
     config = load_config()
     if os.path.isdir(prefix):
         raise ValueError(f"Directory exists: {prefix}")
@@ -41,6 +39,7 @@ def add_subtree(name: str, repo_url: str, branch: str, prefix: str):
             ["git", "subtree", "add", "--prefix", prefix, repo_url, branch],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )
@@ -49,10 +48,10 @@ def add_subtree(name: str, repo_url: str, branch: str, prefix: str):
     config.data[name] = SingleSubTreeConfig(
         repo_url=repo_url, branch=branch, prefix=prefix
     )
-    save_config(config)
+    save_config(repo_dir, config)
 
 
-def pull_subtree(prefix: str, repo_url: str, branch: str):
+def pull_subtree(repo_dir: str, prefix: str, repo_url: str, branch: str):
     try:
         subprocess.run(
             [
@@ -66,6 +65,7 @@ def pull_subtree(prefix: str, repo_url: str, branch: str):
             ],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )
@@ -73,7 +73,7 @@ def pull_subtree(prefix: str, repo_url: str, branch: str):
         raise Exception(e.stderr or e.stdout)
 
 
-def push_subtree(prefix: str, repo_url: str, branch: str):
+def push_subtree(repo_dir: str, prefix: str, repo_url: str, branch: str):
     try:
         subprocess.run(
             [
@@ -87,6 +87,7 @@ def push_subtree(prefix: str, repo_url: str, branch: str):
             ],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=repo_dir,
             text=True,
             check=True,
         )