Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Replace `confy` with `config` crate for configuration management
Maximilian Roos1ccf07fcca33
diff --git a/Cargo.lock b/Cargo.lockindex 9c8a6e699..4297433db 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2,6 +2,18 @@# It is not intended for manual editing.version = 4+[[package]]+name = "ahash"+version = "0.8.12"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"+dependencies = [+ "cfg-if",+ "once_cell",+ "version_check",+ "zerocopy",+]+[[package]]name = "aho-corasick"version = "1.1.3"@@ -11,6 +23,12 @@ dependencies = ["memchr",]+[[package]]+name = "allocator-api2"+version = "0.2.21"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"+[[package]]name = "anstream"version = "0.6.21"@@ -67,6 +85,12 @@ version = "1.0.100"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"+[[package]]+name = "arraydeque"+version = "0.5.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"+[[package]]name = "askama"version = "0.14.0"@@ -120,11 +144,31 @@ dependencies = ["wait-timeout",]+[[package]]+name = "async-trait"+version = "0.1.89"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"+dependencies = [+ "proc-macro2",+ "quote",+ "syn",+]++[[package]]+name = "base64"+version = "0.21.7"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"+[[package]]name = "bitflags"version = "2.10.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"+dependencies = [+ "serde_core",+][[package]]name = "block-buffer"@@ -199,15 +243,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"[[package]]-name = "confy"-version = "0.6.1"+name = "config"+version = "0.14.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "45b1f4c00870f07dc34adcac82bb6a72cc5aabca8536ba1797e01df51d2ce9a0"+checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf"dependencies = [- "directories",+ "async-trait",+ "convert_case",+ "json5",+ "nom",+ "pathdiff",+ "ron",+ "rust-ini","serde",- "thiserror",+ "serde_json","toml",+ "yaml-rust2",][[package]]@@ -222,6 +273,35 @@ dependencies = ["windows-sys 0.59.0",]+[[package]]+name = "const-random"+version = "0.1.18"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"+dependencies = [+ "const-random-macro",+]++[[package]]+name = "const-random-macro"+version = "0.1.16"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"+dependencies = [+ "getrandom 0.2.16",+ "once_cell",+ "tiny-keccak",+]++[[package]]+name = "convert_case"+version = "0.6.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"+dependencies = [+ "unicode-segmentation",+]+[[package]]name = "cpufeatures"version = "0.2.17"@@ -231,6 +311,12 @@ dependencies = ["libc",]+[[package]]+name = "crunchy"+version = "0.2.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"+[[package]]name = "crypto-common"version = "0.1.6"@@ -353,6 +439,15 @@ dependencies = ["windows-sys 0.48.0",]+[[package]]+name = "dlv-list"+version = "0.5.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"+dependencies = [+ "const-random",+]+[[package]]name = "doc-comment"version = "0.3.3"@@ -365,6 +460,15 @@ version = "1.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"+[[package]]+name = "encoding_rs"+version = "0.8.35"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"+dependencies = [+ "cfg-if",+]+[[package]]name = "equivalent"version = "1.0.2"@@ -426,12 +530,31 @@ dependencies = ["wasip2",]+[[package]]+name = "hashbrown"+version = "0.14.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"+dependencies = [+ "ahash",+ "allocator-api2",+]+[[package]]name = "hashbrown"version = "0.16.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"+[[package]]+name = "hashlink"+version = "0.8.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"+dependencies = [+ "hashbrown 0.14.5",+]+[[package]]name = "heck"version = "0.5.0"@@ -451,7 +574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"dependencies = ["equivalent",- "hashbrown",+ "hashbrown 0.16.0",][[package]]@@ -492,6 +615,17 @@ version = "1.0.15"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"+[[package]]+name = "json5"+version = "0.4.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"+dependencies = [+ "pest",+ "pest_derive",+ "serde",+]+[[package]]name = "libc"version = "0.2.177"@@ -520,6 +654,22 @@ version = "2.7.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"+[[package]]+name = "minimal-lexical"+version = "0.2.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"++[[package]]+name = "nom"+version = "7.1.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"+dependencies = [+ "memchr",+ "minimal-lexical",+]+[[package]]name = "num-conv"version = "0.1.0"@@ -553,6 +703,22 @@ version = "0.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"+[[package]]+name = "ordered-multimap"+version = "0.7.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"+dependencies = [+ "dlv-list",+ "hashbrown 0.14.5",+]++[[package]]+name = "pathdiff"+version = "0.2.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"+[[package]]name = "percent-encoding"version = "2.3.2"@@ -699,6 +865,28 @@ version = "0.8.8"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"+[[package]]+name = "ron"+version = "0.8.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"+dependencies = [+ "base64",+ "bitflags",+ "serde",+ "serde_derive",+]++[[package]]+name = "rust-ini"+version = "0.20.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a"+dependencies = [+ "cfg-if",+ "ordered-multimap",+]+[[package]]name = "rustc-hash"version = "2.1.1"@@ -888,6 +1076,15 @@ dependencies = ["time-core",]+[[package]]+name = "tiny-keccak"+version = "2.0.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"+dependencies = [+ "crunchy",+]+[[package]]name = "toml"version = "0.8.23"@@ -947,6 +1144,12 @@ version = "1.0.19"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"+[[package]]+name = "unicode-segmentation"+version = "1.12.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"+[[package]]name = "utf8parse"version = "0.2.2"@@ -1271,7 +1474,8 @@ dependencies = ["askama","assert_cmd","clap",- "confy",+ "config",+ "directories","insta","insta-cmd","serde",@@ -1279,3 +1483,34 @@ dependencies = ["toml","vergen-gitcl",]++[[package]]+name = "yaml-rust2"+version = "0.8.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8"+dependencies = [+ "arraydeque",+ "encoding_rs",+ "hashlink",+]++[[package]]+name = "zerocopy"+version = "0.8.27"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"+dependencies = [+ "zerocopy-derive",+]++[[package]]+name = "zerocopy-derive"+version = "0.8.27"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"+dependencies = [+ "proc-macro2",+ "quote",+ "syn",+]diff --git a/Cargo.toml b/Cargo.tomlindex 214e3e375..13128fa9d 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -15,7 +15,8 @@ path = "src/main.rs"[dependencies]askama = { version = "0.14", default-features = false, features = ["derive", "std"] }clap = { version = "4.5", features = ["derive"] }-confy = "0.6"+config = "0.14"+directories = "5.0"serde = { version = "1.0", features = ["derive"] }[build-dependencies]diff --git a/src/config.rs b/src/config.rsindex f456319b2..9edcf34ec 100644--- a/src/config.rs+++ b/src/config.rs@@ -1,4 +1,7 @@+use config::{Config, ConfigError, File};+use directories::ProjectDirs;use serde::{Deserialize, Serialize};+use std::path::PathBuf;#[derive(Debug, Serialize, Deserialize)]pub struct WorktrunkConfig {@@ -14,8 +17,26 @@ impl Default for WorktrunkConfig {}}-pub fn load_config() -> Result<WorktrunkConfig, confy::ConfyError> {- confy::load("worktrunk", None)+fn get_config_path() -> Option<PathBuf> {+ ProjectDirs::from("", "", "worktrunk").map(|dirs| dirs.config_dir().join("config.toml"))+}++pub fn load_config() -> Result<WorktrunkConfig, ConfigError> {+ let defaults = WorktrunkConfig::default();++ let mut builder = Config::builder().set_default("worktree-path", defaults.worktree_path)?;++ // Add config file if it exists+ if let Some(config_path) = get_config_path() {+ if config_path.exists() {+ builder = builder.add_source(File::from(config_path));+ }+ }++ // Add environment variables with WORKTRUNK prefix+ builder = builder.add_source(config::Environment::with_prefix("WORKTRUNK").separator("_"));++ builder.build()?.try_deserialize()}#[cfg(test)]@@ -35,4 +56,11 @@ mod tests {assert!(toml.contains("worktree-path"));assert!(toml.contains("{repo}.{branch}"));}++ #[test]+ fn test_load_config_defaults() {+ // Without a config file or env vars, should return defaults+ let config = load_config().unwrap();+ assert_eq!(config.worktree_path, "{repo}.{branch}");+ }}