build(deps): bump the cargo-dependencies group across 1 directory with 12 updates

Cargo.toml

@@ -12,9 +12,9 @@ repository = "https://github.com/lettertwo/git-workon"
 rust-version = "1.68.2"
 
 [workspace.dependencies]
-assert_cmd = { version = "2.0.14", features = ["color", "color-auto"] }
-assert_fs = { version = "1.1.1", features = ["color", "color-auto"] }
-clap = { version = "4.5.59", features = [
+assert_cmd = { version = "2.1.2", features = ["color", "color-auto"] }
+assert_fs = { version = "1.1.3", features = ["color", "color-auto"] }
+clap = { version = "4.5.60", features = [
   "derive",
   "color",
   "wrap_help",
@@ -24,8 +24,8 @@ clap = { version = "4.5.59", features = [
 clap-verbosity-flag = "3.0.4"
 clap_complete = { version = "4.5.66", features = ["unstable-dynamic"] }
 clap_mangen = "0.2.31"
-dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
-env_logger = "0.11.3"
+dialoguer = { version = "0.12.0", features = ["fuzzy-select"] }
+env_logger = "0.11.6"
 git-workon-lib = { version = "0.1.0", path = "./git-workon-lib" }
 git-workon-fixture = { version = "0.1.0", path = "./git-workon-fixture" }
 git2_credentials = { version = "0.15.0", features = ["ui4dialoguer"] }
@@ -34,13 +34,16 @@ git2 = { version = "0.20.4", default-features = false, features = [
   "https",
 ] }
 glob = "0.3"
-log = "0.4.17"
-miette = { version = "7.2.0", features = ["fancy"] }
+log = "0.4.29"
+miette = { version = "7.6.0", features = ["fancy"] }
 owo-colors = "4"
-predicates = { version = "3.1.0" }
+predicates = { version = "3.1.4" }
 supports-color = "3"
+expectrl = "0.8"
+pathdiff = "0.2.3"
 serde_json = "1.0"
-thiserror = "2.0.12"
+thiserror = "2.0.18"
+unicode-width = "0.2.2"
 
 # The profile that 'dist' will build with
 [profile.dist]

git-workon/Cargo.toml

@@ -35,16 +35,16 @@ log.workspace = true
 miette.workspace = true
 serde_json.workspace = true
 owo-colors.workspace = true
-pathdiff = "0.2.3"
+pathdiff.workspace = true
 supports-color.workspace = true
-unicode-width = "0.2.2"
+unicode-width.workspace = true
 
 [dev-dependencies]
 assert_cmd.workspace = true
 assert_fs.workspace = true
 git2.workspace = true
 git-workon-fixture.workspace = true
-expectrl = "0.7"
+expectrl.workspace = true
 predicates.workspace = true
 
 [build-dependencies]

git-workon/tests/clone.rs

@@ -1,4 +1,4 @@
-use assert_cmd::Command;
+use assert_cmd::cargo_bin_cmd;
 use assert_fs::TempDir;
 use git2::Repository;
 use git_workon_fixture::prelude::*;
@@ -15,7 +15,7 @@ fn clone_default() -> Result<(), Box<dyn std::error::Error>> {
     let clone_dest = TempDir::new()?;
 
     // Clone the remote repository
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     cmd.current_dir(&clone_dest)
         .arg("clone")
         .arg(remote.cwd()?.to_str().unwrap())
@@ -59,7 +59,7 @@ fn clone_with_name() -> Result<(), Box<dyn std::error::Error>> {
     let temp = TempDir::new()?;
 
     // Clone the remote repository with a custom directory name
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     cmd.current_dir(&temp)
         .arg("clone")
         .arg(remote.cwd()?.to_str().unwrap())

git-workon/tests/copy_untracked.rs

@@ -1,4 +1,4 @@
-use assert_cmd::Command;
+use assert_cmd::cargo_bin_cmd;
 use git_workon_fixture::prelude::*;
 use std::fs;
 
@@ -24,7 +24,7 @@ fn copy_basic() -> Result<(), Box<dyn std::error::Error>> {
     )?;
 
     // Copy files from main to feature (uses config patterns)
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     cmd.current_dir(&fixture)
         .arg("copy-untracked")
         .arg("main")
@@ -70,7 +70,7 @@ fn copy_with_config_patterns() -> Result<(), Box<dyn std::error::Error>> {
     fs::write(main_worktree.join("build/output.js"), "build output")?;
 
     // Copy using config patterns (default behavior)
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     cmd.current_dir(&fixture)
         .arg("copy-untracked")
         .arg("main")
@@ -117,7 +117,7 @@ fn copy_with_excludes() -> Result<(), Box<dyn std::error::Error>> {
     fs::write(main_worktree.join("temp/cache.dat"), "cached data")?;
 
     // Copy all files using config pattern
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     cmd.current_dir(&fixture)
         .arg("copy-untracked")
         .arg("main")
@@ -160,7 +160,7 @@ fn copy_with_pattern_override() -> Result<(), Box<dyn std::error::Error>> {
     fs::write(main_worktree.join("app.js"), "app code")?;
 
     // Copy with --pattern flag (should override config)
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     cmd.current_dir(&fixture)
         .arg("copy-untracked")
         .arg("--pattern")
@@ -201,7 +201,7 @@ fn copy_respects_force_flag() -> Result<(), Box<dyn std::error::Error>> {
     fs::write(feature_worktree.join("data.txt"), "feature version")?;
 
     // Copy without --force (should skip existing file)
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     let output = cmd
         .current_dir(&fixture)
         .arg("copy-untracked")
@@ -219,7 +219,7 @@ fn copy_respects_force_flag() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     // Now copy with --force (should overwrite)
-    let mut cmd2 = Command::cargo_bin("git-workon")?;
+    let mut cmd2 = cargo_bin_cmd!("git-workon");
     cmd2.current_dir(&fixture)
         .arg("copy-untracked")
         .arg("--force")
@@ -255,7 +255,7 @@ fn copy_creates_directories() -> Result<(), Box<dyn std::error::Error>> {
     )?;
 
     // Copy files
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     cmd.current_dir(&fixture)
         .arg("copy-untracked")
         .arg("main")
@@ -296,7 +296,7 @@ fn copy_with_no_matching_files() -> Result<(), Box<dyn std::error::Error>> {
     fs::write(main_worktree.join("readme.txt"), "readme")?;
 
     // Try to copy with non-matching pattern
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     let output = cmd
         .current_dir(&fixture)
         .arg("copy-untracked")
@@ -338,7 +338,7 @@ fn copy_without_config_defaults_to_all() -> Result<(), Box<dyn std::error::Error
     fs::write(main_worktree.join("src/main.rs"), "fn main() {}")?;
 
     // Copy without config or pattern (should copy everything)
-    let mut cmd = Command::cargo_bin("git-workon")?;
+    let mut cmd = cargo_bin_cmd!("git-workon");
     cmd.current_dir(&fixture)
         .arg("copy-untracked")
         .arg("main")

git-workon/tests/doctor.rs

@@ -1,4 +1,4 @@
-use assert_cmd::Command;
+use assert_cmd::cargo_bin_cmd;
 use git_workon_fixture::prelude::*;
 
 #[test]
@@ -10,7 +10,7 @@ fn doctor_healthy_worktrees() -> Result<(), Box<dyn std::error::Error>> {
         .build()?;
 
     // Doctor should succeed and report no worktree-level issues
-    let output = Command::cargo_bin("git-workon")?
+    let output = cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("doctor")
         .output()?;
@@ -44,7 +44,7 @@ fn doctor_detects_missing_directory() -> Result<(), Box<dyn std::error::Error>>
 
     // Run doctor from the main worktree
     let main_path = fixture.root()?.join("main");
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&main_path)
         .arg("doctor")
         .assert()
@@ -69,7 +69,7 @@ fn doctor_fix_missing_directory() -> Result<(), Box<dyn std::error::Error>> {
 
     // Run doctor --fix from the main worktree
     let main_path = fixture.root()?.join("main");
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&main_path)
         .arg("doctor")
         .arg("--fix")
@@ -103,7 +103,7 @@ fn doctor_dry_run_does_not_fix() -> Result<(), Box<dyn std::error::Error>> {
 
     // Run doctor --dry-run from the main worktree
     let main_path = fixture.root()?.join("main");
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&main_path)
         .arg("doctor")
         .arg("--dry-run")
@@ -136,7 +136,7 @@ fn doctor_json_output() -> Result<(), Box<dyn std::error::Error>> {
     std::fs::remove_dir_all(&feature_path)?;
 
     let main_path = fixture.root()?.join("main");
-    let output = Command::cargo_bin("git-workon")?
+    let output = cargo_bin_cmd!("git-workon")
         .current_dir(&main_path)
         .arg("doctor")
         .arg("--json")

git-workon/tests/find.rs

@@ -1,7 +1,11 @@
 use std::path::{Path, PathBuf};
 use std::time::Duration;
 
-use assert_cmd::Command;
+use assert_cmd::cargo_bin_cmd;
+use expectrl::{
+    session::{OsProcess, OsStream},
+    Expect, Session,
+};
 use git_workon_fixture::prelude::*;
 
 #[test]
@@ -12,7 +16,7 @@ fn find_exact_match() -> Result<(), Box<dyn std::error::Error>> {
         .worktree("feature")
         .build()?;
 
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("feature")
@@ -31,7 +35,7 @@ fn find_no_match_errors() -> Result<(), Box<dyn std::error::Error>> {
         .worktree("feature")
         .build()?;
 
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("nonexistent")
@@ -52,7 +56,7 @@ fn find_multiple_fuzzy_matches_errors_with_no_interactive() -> Result<(), Box<dy
         .worktree("feature-2")
         .build()?;
 
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("feature")
@@ -72,7 +76,7 @@ fn find_no_name_errors_with_no_interactive() -> Result<(), Box<dyn std::error::E
         .worktree("feature")
         .build()?;
 
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("--no-interactive")
@@ -99,7 +103,7 @@ fn find_with_dirty_filter() -> Result<(), Box<dyn std::error::Error>> {
     )?;
 
     // Should find dirty when searching with --dirty
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("dirty")
@@ -108,7 +112,7 @@ fn find_with_dirty_filter() -> Result<(), Box<dyn std::error::Error>> {
         .success();
 
     // Should NOT find clean with --dirty filter
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("clean")
@@ -127,7 +131,7 @@ fn find_all_filtered_out_errors() -> Result<(), Box<dyn std::error::Error>> {
         .worktree("clean")
         .build()?;
 
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("--dirty")
@@ -149,7 +153,7 @@ fn find_single_fuzzy_match_returns_directly() -> Result<(), Box<dyn std::error::
         .build()?;
 
     // "feature" matches only "feature-branch" → return without interaction
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("feature")
@@ -169,7 +173,7 @@ fn find_case_insensitive_fuzzy_match() -> Result<(), Box<dyn std::error::Error>>
         .build()?;
 
     // "feature" should match "Feature-Branch" (case-insensitive)
-    Command::cargo_bin("git-workon")?
+    cargo_bin_cmd!("git-workon")
         .current_dir(&fixture)
         .arg("find")
         .arg("feature")
@@ -188,7 +192,7 @@ fn cargo_bin_path() -> PathBuf {
     PathBuf::from(env!("CARGO_BIN_EXE_git-workon"))
 }
 
-fn spawn_interactive(cwd: &Path, args: &[&str]) -> expectrl::Session {
+fn spawn_interactive(cwd: &Path, args: &[&str]) -> Session<OsProcess, OsStream> {
     let mut cmd = std::process::Command::new(cargo_bin_path());
     cmd.current_dir(cwd);
     for arg in args {