benchops 0.2.0__tar.gz → 0.3.0__tar.gz

{benchops-0.2.0 → benchops-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: benchops
-Version: 0.2.0
+Version: 0.3.0
 Summary: A CLI tool to synchronize local Frappe development environments with remote servers.
 Author-email: Mohammad Hamdan <mohammadasdev@gmail.com>
 Keywords: cli,deployment,erpnext,frappe,sync

{benchops-0.2.0 → benchops-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "benchops"
-version = "0.2.0"
+version = "0.3.0"
 description = "A CLI tool to synchronize local Frappe development environments with remote servers."
 readme = "README.md"
 requires-python = ">=3.14.6"

{benchops-0.2.0 → benchops-0.3.0}/src/benchops/cli.py

@@ -19,6 +19,13 @@ app.add_typer(server_app, name="server")
 console = Console()
 
 
+def _render_hook_count(config: dict, key: str) -> str:
+    commands = config.get(key) or []
+    if commands:
+        return f"[green]{len(commands)} cmds[/green]"
+    return "[dim]None[/dim]"
+
+
 @app.command()
 def init() -> None:
     """Initialize the benchops configuration."""
@@ -53,22 +60,20 @@ def list_servers() -> None:
     table.add_column("Port")
     table.add_column("User")
     table.add_column("Bench Path")
-    table.add_column("Post Commands")
+    table.add_column("Pre-Local", justify="center")
+    table.add_column("Pre-Remote", justify="center")
+    table.add_column("Post-Remote", justify="center")
 
     for alias, config in sorted(servers.items()):
-        post_cmds = config.get("post_commands")
-        if isinstance(post_cmds, list) and post_cmds:
-            cmds_display = "\n".join(post_cmds)
-        else:
-            cmds_display = "[dim]None[/dim]"
-
         table.add_row(
             alias,
             config.get("host", ""),
             str(config.get("port", "")),
             config.get("user", ""),
             config.get("bench_path", ""),
-            cmds_display,
+            _render_hook_count(config, "pre_local_commands"),
+            _render_hook_count(config, "pre_remote_commands"),
+            _render_hook_count(config, "post_remote_commands"),
         )
     console.print(table)
 
@@ -125,7 +130,8 @@ def remove_server(
 def deploy(
     app_name: str = typer.Argument(..., help="Name of the local Frappe app directory to sync."),
     server_alias: str = typer.Argument(..., help="Alias of the target server."),
+    site: str | None = typer.Option(None, help="Specific site to target for remote commands (e.g., test-16.akwad.qa)."),
 ) -> None:
     """Deploy a local Frappe app to a remote server."""
-    command = DeployCommand(app_name, server_alias)
+    command = DeployCommand(app_name, server_alias, site)
     command.execute()

{benchops-0.2.0 → benchops-0.3.0}/src/benchops/config.py

@@ -35,7 +35,9 @@ class ConfigManager:
         user: str,
         bench_path: str,
         private_key_path: str | None = None,
-        post_commands: list[str] | None = None,
+        pre_local_commands: list[str] | None = None,
+        pre_remote_commands: list[str] | None = None,
+        post_remote_commands: list[str] | None = None,
     ) -> None:
         """Add or update a server, preserving existing comments and formatting."""
         self.init_config()
@@ -49,11 +51,16 @@ class ConfigManager:
         entry["bench_path"] = bench_path
         if private_key_path is not None:
             entry["private_key_path"] = private_key_path
-        if post_commands is not None:
-            array = tomlkit.array()
-            for cmd in post_commands:
-                array.append(cmd)
-            entry["post_commands"] = array
+        for hook, commands in (
+            ("pre_local_commands", pre_local_commands),
+            ("pre_remote_commands", pre_remote_commands),
+            ("post_remote_commands", post_remote_commands),
+        ):
+            if commands is not None:
+                array = tomlkit.array()
+                for cmd in commands:
+                    array.append(cmd)
+                entry[hook] = array
 
         doc["servers"][alias] = entry
         TOMLFile(self.config_path).write(doc)

{benchops-0.2.0 → benchops-0.3.0}/src/benchops/deploy.py

@@ -1,6 +1,7 @@
 """Deployment command logic."""
 
 import os
+import shlex
 import subprocess
 import tempfile
 from pathlib import Path
@@ -19,9 +20,10 @@ console = Console()
 class DeployCommand:
     """Encapsulates the deployment pipeline logic."""
 
-    def __init__(self, app_name: str, server_alias: str) -> None:
+    def __init__(self, app_name: str, server_alias: str, site: str | None = None) -> None:
         self.app_name = app_name
         self.server_alias = server_alias
+        self.site = site
         self.config = ConfigManager()
         self.auth = AuthManager()
 
@@ -35,6 +37,17 @@ class DeployCommand:
             f"Local app directory '{self.app_name}' not found (looked in '{cwd / 'apps'}' and '{cwd}')."
         )
 
+    def _interpolate_cmd(self, cmd: str) -> str:
+        """Replace the {site} placeholder in a command with the target site."""
+        if "{site}" not in cmd:
+            return cmd
+        if self.site is None:
+            console.print(
+                f"[red]Error: Command '{cmd}' requires a --site argument, but none was provided.[/red]"
+            )
+            raise typer.Exit(1)
+        return cmd.replace("{site}", self.site)
+
     def execute(self) -> None:
         """Execute the full deployment pipeline."""
         server_config = self.config.get_server(self.server_alias)
@@ -67,8 +80,11 @@ class DeployCommand:
 
         try:
             app_dir = self._resolve_app_dir()
-            console.print("[yellow]Starting local builds...[/yellow]")
-            local_runner.run(["bench", "build", "--app", self.app_name], cwd=str(app_dir.parent))
+            console.print("[yellow]Starting local pre-deploy commands...[/yellow]")
+            pre_local_commands = server_config.get("pre_local_commands", [])
+            for cmd in pre_local_commands:
+                console.print(f"[cyan]Executing: {cmd}[/cyan]")
+                local_runner.run(shlex.split(cmd), cwd=str(app_dir.parent))
 
             with tempfile.TemporaryDirectory() as tmp_dir:
                 tarball = create_tarball(str(app_dir), os.path.join(tmp_dir, f"{self.app_name}.tar.gz"))
@@ -77,6 +93,12 @@ class DeployCommand:
                 console.print(
                     f"[yellow]Connecting to {server_config['user']}@{server_config['host']}:{server_config['port']}...[/yellow]"
                 )
+                pre_remote_commands = server_config.get("pre_remote_commands", [])
+                for cmd in pre_remote_commands:
+                    cmd = self._interpolate_cmd(cmd)
+                    console.print(f"[cyan]Executing: {cmd}[/cyan]")
+                    remote_runner.run(cmd, cwd=server_config["bench_path"])
+
                 remote_dest_dir = f"{server_config['bench_path']}/apps"
                 remote_tar_path = transfer_tarball(remote_runner, tarball, remote_dest_dir)
                 console.print(f"[green]Transferred tarball to {remote_tar_path}[/green]")
@@ -84,9 +106,10 @@ class DeployCommand:
                 extract_and_cleanup(remote_runner, remote_tar_path, remote_dest_dir)
                 console.print("[green]Extracted on remote server.[/green]")
 
-            console.print("[yellow]Starting remote operations...[/yellow]")
-            post_commands = server_config.get("post_commands", [])
-            for cmd in post_commands:
+            console.print("[yellow]Starting remote post-deploy commands...[/yellow]")
+            post_remote_commands = server_config.get("post_remote_commands", [])
+            for cmd in post_remote_commands:
+                cmd = self._interpolate_cmd(cmd)
                 console.print(f"[cyan]Executing: {cmd}[/cyan]")
                 remote_runner.run(cmd, cwd=server_config["bench_path"])