easy-worktree 0.1.3__tar.gz → 0.1.5__tar.gz

{easy_worktree-0.1.3 → easy_worktree-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy-worktree
-Version: 0.1.3
+Version: 0.1.5
 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.3 → easy_worktree-0.1.5}/easy_worktree/__init__.py

@@ -28,8 +28,8 @@ MESSAGES = {
         "ja": "使用方法: wt clone <repository_url>",
     },
     "usage_add": {
-        "en": "Usage: wt add (ad) <work_name> [<base_branch>]",
-        "ja": "使用方法: wt add (ad) <作業名> [<base_branch>]",
+        "en": "Usage: wt add (ad) <work_name> [<base_branch>] [--no-setup] [--select]",
+        "ja": "使用方法: wt add (ad) <作業名> [<base_branch>] [--no-setup] [--select]",
     },
     "usage_rm": {"en": "Usage: wt rm <work_name>", "ja": "使用方法: wt rm <作業名>"},
     "base_not_found": {
@@ -340,7 +340,7 @@ def create_hook_template(base_dir: Path):
     # .gitignore
     gitignore_file = wt_dir / ".gitignore"
     
-    ignores = ["post-add.local", "config.local.toml"]
+    ignores = ["post-add.local", "config.local.toml", "last_selection"]
     
     if not gitignore_file.exists():
         gitignore_content = "\n".join(ignores) + "\n"
@@ -855,7 +855,7 @@ def add_worktree(
 
 
 def cmd_add(args: list[str]):
-    """wt add <work_name> [<base_branch>] [--skip-setup] - Add a worktree"""
+    """wt add <work_name> [<base_branch>] [--no-setup] [--select] - Add a worktree"""
     if len(args) < 1:
         print(msg("usage_add"), file=sys.stderr)
         sys.exit(1)
@@ -863,10 +863,13 @@ def cmd_add(args: list[str]):
     # parse options
     clean_args = []
     skip_setup = False
+    select = False
     
     for arg in args:
-        if arg == "--skip-setup":
+        if arg in ["--skip-setup", "--no-setup"]:
             skip_setup = True
+        elif arg == "--select":
+            select = True
         else:
             clean_args.append(arg)
             
@@ -877,7 +880,28 @@ def cmd_add(args: list[str]):
     work_name = clean_args[0]
     branch_to_use = clean_args[1] if len(clean_args) >= 2 else None
 
-    add_worktree(work_name, branch_to_use=branch_to_use, skip_setup=skip_setup)
+    base_dir = find_base_dir()
+    wt_path = add_worktree(work_name, branch_to_use=branch_to_use, skip_setup=skip_setup, base_dir=base_dir)
+
+    if select and wt_path:
+        wt_dir = base_dir / ".wt"
+        # Ensure .wt directory and its management files exists
+        create_hook_template(base_dir)
+        last_sel_file = wt_dir / "last_selection"
+        
+        # Get current selection name
+        current_sel = os.environ.get("WT_SESSION_NAME")
+        if not current_sel:
+            cwd = Path.cwd().resolve()
+            worktrees = get_worktree_info(base_dir)
+            resolved_base = base_dir.resolve()
+            for wt in worktrees:
+                p = Path(wt["path"]).resolve()
+                if cwd == p or cwd.is_relative_to(p):
+                    current_sel = "main" if p == resolved_base else p.name
+                    break
+        
+        switch_selection(work_name, base_dir, current_sel, last_sel_file)
 
 
 def cmd_stash(args: list[str]):
@@ -1415,7 +1439,8 @@ def cmd_select(args: list[str]):
         sys.exit(1)
 
     wt_dir = base_dir / ".wt"
-    wt_dir.mkdir(exist_ok=True)
+    # Ensure .wt directory and its management files (.gitignore etc) exist
+    create_hook_template(base_dir)
     last_sel_file = wt_dir / "last_selection"
 
     # Get current selection name based on CWD or environment

{easy_worktree-0.1.3 → easy_worktree-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "easy-worktree"
-version = "0.1.3"
+version = "0.1.5"
 description = "Git worktree を簡単に管理するための CLI ツール"
 readme = "README.md"
 requires-python = ">=3.10"

{easy_worktree-0.1.3 → easy_worktree-0.1.5}/tests/test_integration.py

@@ -732,5 +732,89 @@ touch hook_ran.txt
         self.assertFalse((wt_dir / "base.txt").exists(), "Should NOT have copied base.txt (overridden)")
 
 
+    def test_19_wt_gitignore_last_selection(self):
+        """Test if .wt/.gitignore contains last_selection after wt select"""
+        project_dir = self.test_dir / "wt-gitignore-test"
+        if project_dir.exists():
+            shutil.rmtree(project_dir)
+        project_dir.mkdir()
+        subprocess.run(["git", "init"], cwd=project_dir)
+        (project_dir / "README.md").write_text("Hello")
+        subprocess.run(["git", "add", "."], cwd=project_dir)
+        subprocess.run(["git", "commit", "-m", "Initial commit"], cwd=project_dir)
+        
+        # wt init
+        self.run_wt(["init"], cwd=project_dir)
+        
+        # Verify .wt/.gitignore exists and contains last_selection
+        wt_gitignore = project_dir / ".wt" / ".gitignore"
+        self.assertTrue(wt_gitignore.exists())
+        self.assertIn("last_selection", wt_gitignore.read_text())
+        
+        # Test wt select also triggers it (though init already does)
+        # Remove .wt to test re-creation/initialization by select
+        shutil.rmtree(project_dir / ".wt")
+        self.assertFalse((project_dir / ".wt").exists())
+        
+        # Run wt select main
+        self.run_wt(["select", "main"], cwd=project_dir)
+        
+        self.assertTrue(wt_gitignore.exists())
+        self.assertIn("last_selection", wt_gitignore.read_text())
+
+    def test_20_add_no_setup(self):
+        """Test 'wt add --no-setup' (alias for --skip-setup)"""
+        project_dir = self.test_dir / "no-setup-test"
+        if project_dir.exists():
+            shutil.rmtree(project_dir)
+        project_dir.mkdir()
+        subprocess.run(["git", "init"], cwd=project_dir)
+        (project_dir / "README.md").write_text("Hello")
+        subprocess.run(["git", "add", "."], cwd=project_dir)
+        subprocess.run(["git", "commit", "-m", "Initial commit"], cwd=project_dir)
+        self.run_wt(["init"], cwd=project_dir)
+
+        # Config setup files
+        config_file = project_dir / ".wt" / "config.toml"
+        with open(config_file, "r") as f:
+            config = toml.load(f)
+        config["setup_files"] = ["setup_me.txt"]
+        with open(config_file, "w") as f:
+            toml.dump(config, f)
+
+        # Create the setup file
+        (project_dir / "setup_me.txt").write_text("setup content")
+
+        print("\nTesting wt add --no-setup...")
+        self.run_wt(["add", "wt-no-setup", "--no-setup"], cwd=project_dir)
+        
+        wt_dir = project_dir / ".worktrees" / "wt-no-setup"
+        
+        # Verify setup file NOT copied
+        self.assertFalse((wt_dir / "setup_me.txt").exists(), "Setup file should NOT be copied with --no-setup")
+
+    def test_21_add_select(self):
+        """Test 'wt add --select' (auto switch)"""
+        # Note: In non-TTY environment, switch_selection prints the absolute path.
+        project_dir = self.test_dir / "add-select-test"
+        if project_dir.exists():
+            shutil.rmtree(project_dir)
+        project_dir.mkdir()
+        subprocess.run(["git", "init"], cwd=project_dir)
+        (project_dir / "README.md").write_text("Hello")
+        subprocess.run(["git", "add", "."], cwd=project_dir)
+        subprocess.run(["git", "commit", "-m", "Initial commit"], cwd=project_dir)
+        self.run_wt(["init"], cwd=project_dir)
+
+        print("\nTesting wt add --select...")
+        # Since this is non-TTY, it should output the path
+        result = self.run_wt(["add", "wt-select", "--select"], cwd=project_dir)
+        
+        self.assertEqual(result.returncode, 0)
+        
+        # Check if output contains the path to the new worktree
+        expected_path = str((project_dir / ".worktrees" / "wt-select").absolute())
+        self.assertIn(expected_path, result.stdout.strip())
+
 if __name__ == "__main__":
     unittest.main()

{easy_worktree-0.1.3 → easy_worktree-0.1.5}/uv.lock

@@ -4,7 +4,7 @@ requires-python = ">=3.10"
 
 [[package]]
 name = "easy-worktree"
-version = "0.1.3"
+version = "0.1.4"
 source = { editable = "." }
 dependencies = [
     { name = "toml" },