Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Add configuration module and dependencies
Maximilian Roos269c67d6c26e
diff --git a/Cargo.lock b/Cargo.lockindex 85a8ee0d0..fbc2ad232 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -68,9 +68,12 @@ dependencies = ["askama","assert_cmd","clap",+ "confy","insta","insta-cmd",+ "serde","tempfile",+ "toml",][[package]]@@ -204,6 +207,18 @@ version = "1.0.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"+[[package]]+name = "confy"+version = "0.6.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "45b1f4c00870f07dc34adcac82bb6a72cc5aabca8536ba1797e01df51d2ce9a0"+dependencies = [+ "directories",+ "serde",+ "thiserror",+ "toml",+]+[[package]]name = "console"version = "0.15.11"@@ -251,6 +266,27 @@ dependencies = ["crypto-common",]+[[package]]+name = "directories"+version = "5.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"+dependencies = [+ "dirs-sys",+]++[[package]]+name = "dirs-sys"+version = "0.4.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"+dependencies = [+ "libc",+ "option-ext",+ "redox_users",+ "windows-sys 0.48.0",+]+[[package]]name = "doc-comment"version = "0.3.3"@@ -263,6 +299,12 @@ version = "1.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"+[[package]]+name = "equivalent"+version = "1.0.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"+[[package]]name = "errno"version = "0.3.14"@@ -270,7 +312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -289,6 +331,17 @@ dependencies = ["version_check",]+[[package]]+name = "getrandom"+version = "0.2.16"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"+dependencies = [+ "cfg-if",+ "libc",+ "wasi",+]+[[package]]name = "getrandom"version = "0.3.4"@@ -301,12 +354,28 @@ dependencies = ["wasip2",]+[[package]]+name = "hashbrown"+version = "0.16.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"+[[package]]name = "heck"version = "0.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"+[[package]]+name = "indexmap"+version = "2.12.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"+dependencies = [+ "equivalent",+ "hashbrown",+]+[[package]]name = "insta"version = "1.43.2"@@ -351,6 +420,16 @@ version = "0.2.177"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"+[[package]]+name = "libredox"+version = "0.1.10"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"+dependencies = [+ "bitflags",+ "libc",+]+[[package]]name = "linux-raw-sys"version = "0.11.0"@@ -375,6 +454,12 @@ version = "1.70.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"+[[package]]+name = "option-ext"+version = "0.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"+[[package]]name = "percent-encoding"version = "2.3.2"@@ -475,6 +560,17 @@ version = "5.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"+[[package]]+name = "redox_users"+version = "0.4.6"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"+dependencies = [+ "getrandom 0.2.16",+ "libredox",+ "thiserror",+]+[[package]]name = "regex"version = "1.12.2"@@ -520,7 +616,7 @@ dependencies = ["errno","libc","linux-raw-sys",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -572,6 +668,15 @@ dependencies = ["serde_core",]+[[package]]+name = "serde_spanned"+version = "0.6.9"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"+dependencies = [+ "serde",+]+[[package]]name = "sha2"version = "0.10.9"@@ -613,10 +718,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"dependencies = ["fastrand",- "getrandom",+ "getrandom 0.3.4","once_cell","rustix",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -625,6 +730,67 @@ version = "0.5.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"+[[package]]+name = "thiserror"+version = "1.0.69"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"+dependencies = [+ "thiserror-impl",+]++[[package]]+name = "thiserror-impl"+version = "1.0.69"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"+dependencies = [+ "proc-macro2",+ "quote",+ "syn",+]++[[package]]+name = "toml"+version = "0.8.23"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"+dependencies = [+ "serde",+ "serde_spanned",+ "toml_datetime",+ "toml_edit",+]++[[package]]+name = "toml_datetime"+version = "0.6.11"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"+dependencies = [+ "serde",+]++[[package]]+name = "toml_edit"+version = "0.22.27"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"+dependencies = [+ "indexmap",+ "serde",+ "serde_spanned",+ "toml_datetime",+ "toml_write",+ "winnow",+]++[[package]]+name = "toml_write"+version = "0.1.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"+[[package]]name = "typenum"version = "1.19.0"@@ -664,6 +830,12 @@ dependencies = ["libc",]+[[package]]+name = "wasi"+version = "0.11.1+wasi-snapshot-preview1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"+[[package]]name = "wasip2"version = "1.0.1+wasi-0.2.4"@@ -679,6 +851,15 @@ version = "0.2.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"+[[package]]+name = "windows-sys"+version = "0.48.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"+dependencies = [+ "windows-targets 0.48.5",+]+[[package]]name = "windows-sys"version = "0.59.0"@@ -698,12 +879,18 @@ dependencies = [][[package]]-name = "windows-sys"-version = "0.61.2"+name = "windows-targets"+version = "0.48.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"dependencies = [- "windows-link",+ "windows_aarch64_gnullvm 0.48.5",+ "windows_aarch64_msvc 0.48.5",+ "windows_i686_gnu 0.48.5",+ "windows_i686_msvc 0.48.5",+ "windows_x86_64_gnu 0.48.5",+ "windows_x86_64_gnullvm 0.48.5",+ "windows_x86_64_msvc 0.48.5",][[package]]@@ -739,6 +926,12 @@ dependencies = ["windows_x86_64_msvc 0.53.1",]+[[package]]+name = "windows_aarch64_gnullvm"+version = "0.48.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"+[[package]]name = "windows_aarch64_gnullvm"version = "0.52.6"@@ -751,6 +944,12 @@ version = "0.53.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"+[[package]]+name = "windows_aarch64_msvc"+version = "0.48.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"+[[package]]name = "windows_aarch64_msvc"version = "0.52.6"@@ -763,6 +962,12 @@ version = "0.53.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"+[[package]]+name = "windows_i686_gnu"+version = "0.48.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"+[[package]]name = "windows_i686_gnu"version = "0.52.6"@@ -787,6 +992,12 @@ version = "0.53.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"+[[package]]+name = "windows_i686_msvc"+version = "0.48.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"+[[package]]name = "windows_i686_msvc"version = "0.52.6"@@ -799,6 +1010,12 @@ version = "0.53.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"+[[package]]+name = "windows_x86_64_gnu"+version = "0.48.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"+[[package]]name = "windows_x86_64_gnu"version = "0.52.6"@@ -811,6 +1028,12 @@ version = "0.53.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"+[[package]]+name = "windows_x86_64_gnullvm"+version = "0.48.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"+[[package]]name = "windows_x86_64_gnullvm"version = "0.52.6"@@ -823,6 +1046,12 @@ version = "0.53.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"+[[package]]+name = "windows_x86_64_msvc"+version = "0.48.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"+[[package]]name = "windows_x86_64_msvc"version = "0.52.6"diff --git a/Cargo.toml b/Cargo.tomlindex 428bd49f7..11053cefb 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -6,9 +6,12 @@ edition = "2024"[dependencies]askama = { version = "0.14", default-features = false, features = ["derive", "std"] }clap = { version = "4.5", features = ["derive"] }+confy = "0.6"+serde = { version = "1.0", features = ["derive"] }[dev-dependencies]insta = { version = "1.40", features = ["yaml", "redactions", "filters"] }insta-cmd = "0.6"assert_cmd = "2.0"tempfile = "3.14"+toml = "0.8"diff --git a/src/config.rs b/src/config.rsnew file mode 100644index 000000000..8a1bb3a5b--- /dev/null+++ b/src/config.rs@@ -0,0 +1,38 @@+use serde::{Deserialize, Serialize};++#[derive(Debug, Serialize, Deserialize)]+pub struct ArborConfig {+ #[serde(rename = "worktree-path")]+ pub worktree_path: String,+}++impl Default for ArborConfig {+ fn default() -> Self {+ Self {+ worktree_path: "{repo}.{branch}".to_string(),+ }+ }+}++pub fn load_config() -> Result<ArborConfig, confy::ConfyError> {+ confy::load("arbor", None)+}++#[cfg(test)]+mod tests {+ use super::*;++ #[test]+ fn test_default_config() {+ let config = ArborConfig::default();+ assert_eq!(config.worktree_path, "{repo}.{branch}");+ }++ #[test]+ fn test_config_serialization() {+ let config = ArborConfig::default();+ let toml = toml::to_string(&config).unwrap();+ assert!(toml.contains("worktree-path"));+ assert!(toml.contains("{repo}.{branch}"));+ }+}diff --git a/src/main.rs b/src/main.rsindex 8ecf1a10c..8a3d52d22 100644--- a/src/main.rs+++ b/src/main.rs@@ -1,7 +1,9 @@+mod config;mod git;mod shell;use clap::{Parser, Subcommand};+use config::ArborConfig;use git::{GitError, list_worktrees};use std::process;