easy-worktree 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

easy_worktree/__init__.py

@@ -28,8 +28,16 @@ MESSAGES = {
         "ja": "使用方法: wt clone <repository_url>",
     },
     "usage_add": {
-        "en": "Usage: wt add (ad) <work_name> [<base_branch>] [--no-setup] [--select]",
-        "ja": "使用方法: wt add (ad) <作業名> [<base_branch>] [--no-setup] [--select]",
+        "en": "Usage: wt add (ad) <work_name> [<base_branch>] [--no-setup] [--select [<command>...]]",
+        "ja": "使用方法: wt add (ad) <作業名> [<base_branch>] [--no-setup] [--select [<コマンド>...]]",
+    },
+    "usage_select": {
+        "en": "Usage: wt select (sl) [<name>|-] [<command>...]",
+        "ja": "使用方法: wt select (sl) [<名前>|-] [<コマンド>...]",
+    },
+    "usage_run": {
+        "en": "Usage: wt run <name> <command>...",
+        "ja": "使用方法: wt run <名前> <コマンド>...",
     },
     "usage_rm": {"en": "Usage: wt rm <work_name>", "ja": "使用方法: wt rm <作業名>"},
     "base_not_found": {
@@ -864,15 +872,30 @@ def cmd_add(args: list[str]):
     clean_args = []
     skip_setup = False
     select = False
+    select_command = None
     
-    for arg in args:
+    i = 0
+    while i < len(args):
+        arg = args[i]
         if arg in ["--skip-setup", "--no-setup"]:
             skip_setup = True
         elif arg == "--select":
             select = True
+            if i + 1 < len(args):
+                select_command = args[i+1:]
+            break # Consume everything after --select as command
         else:
             clean_args.append(arg)
-            
+        i += 1
+
+    # Heuristic: if clean_args is empty but we have select_command,
+    # it likely means the user put --select before the work_name.
+    if not clean_args and select_command:
+        # Take the first one as work_name
+        clean_args.append(select_command.pop(0))
+        if not select_command:
+            select_command = None
+
     if not clean_args:
         print(msg("usage_add"), file=sys.stderr)
         sys.exit(1)
@@ -901,7 +924,7 @@ def cmd_add(args: list[str]):
                     current_sel = "main" if p == resolved_base else p.name
                     break
         
-        switch_selection(work_name, base_dir, current_sel, last_sel_file)
+        switch_selection(work_name, base_dir, current_sel, last_sel_file, command=select_command)
 
 
 def cmd_stash(args: list[str]):
@@ -1504,6 +1527,7 @@ def cmd_select(args: list[str]):
         return
 
     target = args[0]
+    command = args[1:] if len(args) > 1 else None
 
     if target == "-":
         if not last_sel_file.exists():
@@ -1518,7 +1542,46 @@ def cmd_select(args: list[str]):
         print(msg("error", msg("select_not_found", target)), file=sys.stderr)
         sys.exit(1)
 
-    switch_selection(target, base_dir, current_sel, last_sel_file)
+    switch_selection(target, base_dir, current_sel, last_sel_file, command=command)
+
+
+def cmd_run(args: list[str]):
+    """wt run <work_name> <command>... - Run command in worktree and exit"""
+    if len(args) < 2:
+        print(msg("usage_run"), file=sys.stderr)
+        sys.exit(1)
+
+    work_name = args[0]
+    command = args[1:]
+
+    base_dir = find_base_dir()
+    if not base_dir:
+        print(msg("error", msg("base_not_found")), file=sys.stderr)
+        sys.exit(1)
+
+    # find target path
+    target_path = base_dir
+    if work_name != "main":
+        config = load_config(base_dir)
+        worktrees_dir_name = config.get("worktrees_dir", ".worktrees")
+        target_path = base_dir / worktrees_dir_name / work_name
+
+    if not target_path.exists():
+        print(msg("error", msg("select_not_found", work_name)), file=sys.stderr)
+        sys.exit(1)
+
+    # set environment variables
+    env = os.environ.copy()
+    env["WT_SESSION_NAME"] = work_name
+
+    # run command
+    try:
+        subprocess.run(command, cwd=target_path, env=env, check=True)
+    except subprocess.CalledProcessError as e:
+        sys.exit(e.returncode)
+    except Exception as e:
+        print(msg("error", str(e)), file=sys.stderr)
+        sys.exit(1)
 
 
 def cmd_current(args: list[str]):
@@ -1540,7 +1603,7 @@ def cmd_current(args: list[str]):
         print(name)
 
 
-def switch_selection(target, base_dir, current_sel, last_sel_file):
+def switch_selection(target, base_dir, current_sel, last_sel_file, command: list[str] = None):
     """Switch selection and update last_selection"""
     # Calculate target path
     target_path = base_dir
@@ -1599,10 +1662,19 @@ def switch_selection(target, base_dir, current_sel, last_sel_file):
         if os.environ.get("TMUX"):
             subprocess.run(["tmux", "rename-window", f"wt:{target}"], check=False)
 
-        os.execl(shell, shell)
+        if command:
+            cmd_str = " ".join(command)
+            # コマンド実行後にシェルを維持するために "cmd; exec shell" を実行
+            os.execl(shell, shell, "-c", f"{cmd_str}; exec {shell}")
+        else:
+            os.execl(shell, shell)
     else:
         # Output path for script/backtick use
         print(str(target_path.absolute()))
+        if command:
+            # 非 TTY の場合でもコマンドがあれば実行しておく (パイプなどでの利用を想定)
+            import subprocess
+            subprocess.run(command, cwd=target_path, check=True)
 
 
 def cmd_setup(args: list[str]):
@@ -1944,7 +2016,7 @@ def show_help():
 
 def show_version():
     """Show version information"""
-    print("easy-worktree version 0.1.6")
+    print("easy-worktree version 0.1.8")
 
 
 def main():
@@ -1991,6 +2063,8 @@ def main():
         cmd_current(args)
     elif command in ["co", "checkout"]:
         cmd_checkout(args)
+    elif command == "run":
+        cmd_run(args)
     else:
         # その他のコマンドは git worktree にパススルー
         cmd_passthrough([command] + args)

{easy_worktree-0.1.6.dist-info → easy_worktree-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy-worktree
-Version: 0.1.6
+Version: 0.1.8
 Summary: Git worktree を簡単に管理するための CLI ツール
 Project-URL: Homepage, https://github.com/igtm/easy-worktree
 Project-URL: Repository, https://github.com/igtm/easy-worktree

easy_worktree-0.1.8.dist-info/RECORD

@@ -0,0 +1,6 @@
+easy_worktree/__init__.py,sha256=47agzeavmQHhGxyYwVTG4JzPHzho4SUFXpadhuMM_qk,68504
+easy_worktree-0.1.8.dist-info/METADATA,sha256=nEVPV5FiwfPj8K2A_96VA_dZ6-ZJ40nWA5bkq9BqNsA,6520
+easy_worktree-0.1.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+easy_worktree-0.1.8.dist-info/entry_points.txt,sha256=Mf6MYDS2obZLvIJJFl-BbU8-SL0QGu5UWcC0FWnqtbg,42
+easy_worktree-0.1.8.dist-info/licenses/LICENSE,sha256=7MGvWFDxXPqW2nrr9D7KHT0vWFiGwIUL5SQCj0IiAPc,1061
+easy_worktree-0.1.8.dist-info/RECORD,,

easy_worktree-0.1.6.dist-info/RECORD

@@ -1,6 +0,0 @@
-easy_worktree/__init__.py,sha256=ubOIvRctUMf_OqG6Y0Vd7PMQ3jKDS_F8PeLM9GIi5ZY,65812
-easy_worktree-0.1.6.dist-info/METADATA,sha256=zicOjRw1QPuLUIL0kyU4FSvR-y0W6mnj3FF_F2jeoxU,6520
-easy_worktree-0.1.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-easy_worktree-0.1.6.dist-info/entry_points.txt,sha256=Mf6MYDS2obZLvIJJFl-BbU8-SL0QGu5UWcC0FWnqtbg,42
-easy_worktree-0.1.6.dist-info/licenses/LICENSE,sha256=7MGvWFDxXPqW2nrr9D7KHT0vWFiGwIUL5SQCj0IiAPc,1061
-easy_worktree-0.1.6.dist-info/RECORD,,