diff --git a/Cargo.lock b/Cargo.lock index 45eee3bb..097cbe1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "autocfg" @@ -29,12 +29,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.4.1" @@ -75,9 +69,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.8" +version = "4.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7" dependencies = [ "clap_builder", "clap_derive", @@ -85,9 +79,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df" dependencies = [ "anstyle", "clap_lex", @@ -96,18 +90,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck", "proc-macro2", @@ -117,15 +111,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "constcat" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325bfa454baa4898475be5c0ec5f3a5dd3c2e4c4a9ef5e951a25427e9928de1f" +checksum = "1f2e5af989b1955b092db01462980c0a286217f86817e12b2c09aea46bd03651" [[package]] name = "crossbeam-deque" @@ -162,9 +156,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.44" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" dependencies = [ "curl-sys", "libc", @@ -172,14 +166,14 @@ dependencies = [ "openssl-sys", "schannel", "socket2", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.68+curl-8.4.0" +version = "0.4.72+curl-8.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" +checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" dependencies = [ "cc", "libc", @@ -187,7 +181,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -210,12 +204,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -241,20 +235,20 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "git2" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 2.4.1", + "bitflags", "libc", "libgit2-sys", "log", @@ -278,28 +272,28 @@ dependencies = [ [[package]] name = "globwalk" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags 1.3.2", + "bitflags", "ignore", "walkdir", ] [[package]] name = "goldie" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1d4b95ae93c6d91591a2998aa7363113e51130ede293b3c92ac89b63e13914" +checksum = "aa70c42797cac60e6182e00f33f629212e02ba80d67e8a976f6168b57568d78e" dependencies = [ "anyhow", "once_cell", "pretty_assertions", "serde", "serde_json", - "upon 0.5.0", - "yansi", + "upon", + "yansi 1.0.1", ] [[package]] @@ -310,24 +304,24 @@ checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -352,9 +346,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -364,9 +358,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -394,15 +388,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.16.1+1.7.1" +version = "0.16.2+1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" dependencies = [ "cc", "libc", @@ -440,9 +434,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" @@ -473,9 +467,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl-probe" @@ -507,9 +501,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pkg-config" @@ -524,32 +518,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ "diff", - "yansi", + "yansi 0.5.1", ] [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -557,23 +551,14 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" version = "1.10.2" @@ -615,15 +600,15 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rustix" -version = "0.38.24" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -647,7 +632,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -658,18 +643,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -689,9 +674,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -723,34 +708,34 @@ dependencies = [ "thiserror", "toml", "toml_edit", - "upon 0.8.0", + "upon", "url", "walkdir", "which", - "yansi", + "yansi 1.0.1", ] [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.39" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -759,31 +744,30 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -817,9 +801,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "indexmap", "serde", @@ -830,18 +814,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", @@ -879,29 +863,20 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "upon" -version = "0.5.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b77ce40602cb1a7dfcdd6336f6d8baa2803c898aafbc0d46156b59727f2e7135" +checksum = "9fe29601d1624f104fa9a35ea71a5f523dd8bd1cfc8c31f8124ad2b829f013c0" dependencies = [ "serde", "unicode-ident", "unicode-width", ] -[[package]] -name = "upon" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6539a8975f097abc4500a33d542ac5f2e11b8912d48c980ce585161eed1ec59a" -dependencies = [ - "serde", -] - [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -917,9 +892,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -927,15 +902,14 @@ dependencies = [ [[package]] name = "which" -version = "5.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" dependencies = [ "either", "home", - "once_cell", "rustix", - "windows-sys", + "winsafe", ] [[package]] @@ -975,7 +949,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -984,13 +967,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -999,53 +998,113 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "winnow" -version = "0.5.19" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" diff --git a/Cargo.toml b/Cargo.toml index 4b1e68f3..f9564d45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,33 +28,33 @@ codegen-units = 1 pkg-url = "{ repo }/releases/download/{ version }/sheldon-{ version }-{ target }.tar.gz" [dependencies] -anyhow = "1.0.75" +anyhow = "1.0.86" casual = "0.2.0" -clap_complete = "4.4.4" -constcat = "0.4.0" -curl = "0.4.44" +clap_complete = "4.4.10" +constcat = "0.5.0" +curl = "0.4.46" fmutex = "0.1.0" -git2 = "0.18.1" -globwalk = "0.8.1" -home = "0.5.5" -indexmap = { version = "2.1.0", features = ["rayon", "serde"] } -itertools = "0.12.0" +git2 = "0.18.3" +globwalk = "0.9.1" +home = "0.5.9" +indexmap = { version = "2.2.6", features = ["rayon", "serde"] } +itertools = "0.13.0" maplit = "1.0.2" -once_cell = "1.18.0" -rayon = "1.8.0" +once_cell = "1.19.0" +rayon = "1.10.0" regex-macro = "0.2.0" -serde = { version = "1.0.192", features = ["derive"] } -thiserror = "1.0.50" -toml = { version = "0.8.8", features = ["preserve_order"] } -toml_edit = "0.21.0" -upon = { version = "0.8.0", default-features = false, features = ["serde", "filters"] } -url = { version = "2.4.1", features = ["serde"] } -walkdir = "2.4.0" -which = { version = "5.0.0", default-features = false } -yansi = "0.5.1" +serde = { version = "1.0.203", features = ["derive"] } +thiserror = "1.0.61" +toml = { version = "0.8.14", features = ["preserve_order"] } +toml_edit = "0.22.14" +upon = { version = "0.8.1", default-features = false, features = ["serde", "filters"] } +url = { version = "2.5.0", features = ["serde"] } +walkdir = "2.5.0" +which = { version = "6.0.1", default-features = false } +yansi = "1.0.1" [dependencies.clap] -version = "4.4.8" +version = "4.4.18" default-features = false features = [ "std", "help", "usage", "error-context", "suggestions", # default excluding "color" @@ -62,12 +62,12 @@ features = [ ] [build-dependencies] -anyhow = "1.0.75" +anyhow = "1.0.86" [dev-dependencies] -goldie = "0.4.3" +goldie = "0.5.0" pretty_assertions = "1.4.0" -tempfile = "3.8.1" +tempfile = "3.10.1" [features] # By default vendor libgit2 since we rely on some modern features. diff --git a/README.md b/README.md index 5330d78e..b55046e0 100644 --- a/README.md +++ b/README.md @@ -632,9 +632,9 @@ following. ```toml [templates] -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' PATH = 'export PATH="{{ dir }}:$PATH"' path = 'path=( "{{ dir }}" $path )' fpath = 'fpath=( "{{ dir }}" $fpath )' diff --git a/completions/sheldon.bash b/completions/sheldon.bash index a8fc2a91..c4f0cd2b 100644 --- a/completions/sheldon.bash +++ b/completions/sheldon.bash @@ -255,4 +255,8 @@ _sheldon() { esac } -complete -F _sheldon -o nosort -o bashdefault -o default sheldon +if [[ "${BASH_VERSINFO[0]}" -eq 4 && "${BASH_VERSINFO[1]}" -ge 4 || "${BASH_VERSINFO[0]}" -gt 4 ]]; then + complete -F _sheldon -o nosort -o bashdefault -o default sheldon +else + complete -F _sheldon -o bashdefault -o default sheldon +fi diff --git a/completions/sheldon.zsh b/completions/sheldon.zsh index c16f7648..d3218cb1 100644 --- a/completions/sheldon.zsh +++ b/completions/sheldon.zsh @@ -14,7 +14,7 @@ _sheldon() { fi local context curcontext="$curcontext" state line - _arguments "${_arguments_options[@]}" \ + _arguments "${_arguments_options[@]}" : \ '--color=[Output coloring\: always, auto, or never]:WHEN: ' \ '--config-dir=[The configuration directory]:PATH:_files' \ '--data-dir=[The data directory]:PATH:_files' \ @@ -39,14 +39,14 @@ _sheldon() { curcontext="${curcontext%:*:*}:sheldon-command-$line[1]:" case $line[1] in (init) -_arguments "${_arguments_options[@]}" \ +_arguments "${_arguments_options[@]}" : \ '--shell=[The type of shell, accepted values are\: bash, fish, zsh]:SHELL: ' \ '-h[Print help]' \ '--help[Print help]' \ && ret=0 ;; (add) -_arguments "${_arguments_options[@]}" \ +_arguments "${_arguments_options[@]}" : \ '--git=[Add a clonable Git repository]:URL: ' \ '--gist=[Add a clonable Gist snippet]:ID: ' \ '--github=[Add a clonable GitHub repository]:REPO: ' \ @@ -67,20 +67,20 @@ _arguments "${_arguments_options[@]}" \ && ret=0 ;; (edit) -_arguments "${_arguments_options[@]}" \ +_arguments "${_arguments_options[@]}" : \ '-h[Print help]' \ '--help[Print help]' \ && ret=0 ;; (remove) -_arguments "${_arguments_options[@]}" \ +_arguments "${_arguments_options[@]}" : \ '-h[Print help]' \ '--help[Print help]' \ ':name -- A unique name for this plugin:' \ && ret=0 ;; (lock) -_arguments "${_arguments_options[@]}" \ +_arguments "${_arguments_options[@]}" : \ '--update[Update all plugin sources]' \ '(--update)--reinstall[Reinstall all plugin sources]' \ '-h[Print help]' \ @@ -88,7 +88,7 @@ _arguments "${_arguments_options[@]}" \ && ret=0 ;; (source) -_arguments "${_arguments_options[@]}" \ +_arguments "${_arguments_options[@]}" : \ '--relock[Regenerate the lock file]' \ '--update[Update all plugin sources (implies --relock)]' \ '(--update)--reinstall[Reinstall all plugin sources (implies --relock)]' \ @@ -97,14 +97,14 @@ _arguments "${_arguments_options[@]}" \ && ret=0 ;; (completions) -_arguments "${_arguments_options[@]}" \ +_arguments "${_arguments_options[@]}" : \ '--shell=[The type of shell, accepted values are\: bash, zsh]:SHELL: ' \ '-h[Print help]' \ '--help[Print help]' \ && ret=0 ;; (version) -_arguments "${_arguments_options[@]}" \ +_arguments "${_arguments_options[@]}" : \ '-h[Print help]' \ '--help[Print help]' \ && ret=0 diff --git a/docs/src/Configuration.md b/docs/src/Configuration.md index fbb81f7e..8d3ce6ba 100644 --- a/docs/src/Configuration.md +++ b/docs/src/Configuration.md @@ -248,9 +248,9 @@ following. ```toml [templates] -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' PATH = 'export PATH="{{ dir }}:$PATH"' path = 'path=( "{{ dir }}" $path )' fpath = 'fpath=( "{{ dir }}" $fpath )' diff --git a/src/config/edit.rs b/src/config/edit.rs index f22e2a36..a318accf 100644 --- a/src/config/edit.rs +++ b/src/config/edit.rs @@ -18,7 +18,7 @@ pub struct EditPlugin { #[derive(Debug)] pub struct EditConfig { /// The parsed TOML version of the config. - doc: toml_edit::Document, + doc: toml_edit::DocumentMut, } impl From for EditPlugin { @@ -58,7 +58,7 @@ impl EditConfig { { let doc = s .as_ref() - .parse::() + .parse::() .context("failed to deserialize contents as TOML")?; Ok(Self { doc }) } @@ -80,7 +80,7 @@ impl EditConfig { toml::to_string_pretty(&plugin.inner).expect("failed to serialize plugin as TOML"); let mini = contents - .parse::() + .parse::() .expect("failed to parse valid TOML"); match &mut self.doc["plugins"] { diff --git a/tests/testdata/clean/plugins.lock b/tests/testdata/clean/plugins.lock index 57bf7a75..6eb056f1 100644 --- a/tests/testdata/clean/plugins.lock +++ b/tests/testdata/clean/plugins.lock @@ -6,9 +6,9 @@ config_file = "/plugins.toml" plugins = [] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/clean_permission_denied/plugins.lock b/tests/testdata/clean_permission_denied/plugins.lock index 57bf7a75..6eb056f1 100644 --- a/tests/testdata/clean_permission_denied/plugins.lock +++ b/tests/testdata/clean_permission_denied/plugins.lock @@ -6,9 +6,9 @@ config_file = "/plugins.toml" plugins = [] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/deprecated_directories/plugins.lock b/tests/testdata/deprecated_directories/plugins.lock index 681fd409..d5405a87 100644 --- a/tests/testdata/deprecated_directories/plugins.lock +++ b/tests/testdata/deprecated_directories/plugins.lock @@ -21,9 +21,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/deprecated_get_filter/plugins.lock b/tests/testdata/deprecated_get_filter/plugins.lock index 97540233..85029722 100644 --- a/tests/testdata/deprecated_get_filter/plugins.lock +++ b/tests/testdata/deprecated_get_filter/plugins.lock @@ -13,9 +13,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks | get: \"pre\" | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks | get: \"post\" | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks | get: "pre" | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks | get: "post" | nl }}''' diff --git a/tests/testdata/directories_default/plugins.lock b/tests/testdata/directories_default/plugins.lock index 1fb97ed8..e3730464 100644 --- a/tests/testdata/directories_default/plugins.lock +++ b/tests/testdata/directories_default/plugins.lock @@ -21,9 +21,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/directories_xdg_from_env/plugins.lock b/tests/testdata/directories_xdg_from_env/plugins.lock index 1fb97ed8..e3730464 100644 --- a/tests/testdata/directories_xdg_from_env/plugins.lock +++ b/tests/testdata/directories_xdg_from_env/plugins.lock @@ -21,9 +21,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/empty/plugins.lock b/tests/testdata/empty/plugins.lock index 57bf7a75..6eb056f1 100644 --- a/tests/testdata/empty/plugins.lock +++ b/tests/testdata/empty/plugins.lock @@ -6,9 +6,9 @@ config_file = "/plugins.toml" plugins = [] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/github_bad_reinstall/plugins.lock b/tests/testdata/github_bad_reinstall/plugins.lock index ce7248df..2d88ffbe 100644 --- a/tests/testdata/github_bad_reinstall/plugins.lock +++ b/tests/testdata/github_bad_reinstall/plugins.lock @@ -13,9 +13,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/github_branch/plugins.lock b/tests/testdata/github_branch/plugins.lock index ce7248df..2d88ffbe 100644 --- a/tests/testdata/github_branch/plugins.lock +++ b/tests/testdata/github_branch/plugins.lock @@ -13,9 +13,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/github_https/plugins.lock b/tests/testdata/github_https/plugins.lock index ce7248df..2d88ffbe 100644 --- a/tests/testdata/github_https/plugins.lock +++ b/tests/testdata/github_https/plugins.lock @@ -13,9 +13,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/github_submodule/plugins.lock b/tests/testdata/github_submodule/plugins.lock index 35f75158..e5d1c6f0 100644 --- a/tests/testdata/github_submodule/plugins.lock +++ b/tests/testdata/github_submodule/plugins.lock @@ -14,9 +14,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/github_tag/plugins.lock b/tests/testdata/github_tag/plugins.lock index ce7248df..2d88ffbe 100644 --- a/tests/testdata/github_tag/plugins.lock +++ b/tests/testdata/github_tag/plugins.lock @@ -13,9 +13,9 @@ apply = ["source"] [plugins.hooks] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/hooks/plugins.lock b/tests/testdata/hooks/plugins.lock index b60407aa..f2628c51 100644 --- a/tests/testdata/hooks/plugins.lock +++ b/tests/testdata/hooks/plugins.lock @@ -23,9 +23,9 @@ raw = """ post = "post" [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/inline/plugins.lock b/tests/testdata/inline/plugins.lock index 2b58521f..8c8407a9 100644 --- a/tests/testdata/inline/plugins.lock +++ b/tests/testdata/inline/plugins.lock @@ -17,9 +17,9 @@ name = "inline-test" raw = "echo 'testing...'" [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/override_config_file/plugins.lock b/tests/testdata/override_config_file/plugins.lock index 641978af..c42107c0 100644 --- a/tests/testdata/override_config_file/plugins.lock +++ b/tests/testdata/override_config_file/plugins.lock @@ -6,9 +6,9 @@ config_file = "/test.toml" plugins = [] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/override_data_dir/plugins.lock b/tests/testdata/override_data_dir/plugins.lock index fa16adcf..b0f52435 100644 --- a/tests/testdata/override_data_dir/plugins.lock +++ b/tests/testdata/override_data_dir/plugins.lock @@ -6,9 +6,9 @@ config_file = "/plugins.toml" plugins = [] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}''' diff --git a/tests/testdata/profiles/plugins.p1.lock b/tests/testdata/profiles/plugins.p1.lock index 5edb069f..d544b38d 100644 --- a/tests/testdata/profiles/plugins.p1.lock +++ b/tests/testdata/profiles/plugins.p1.lock @@ -19,9 +19,9 @@ raw = "echo 'testing...'" profiles = ["p1", "p2"] [templates] -PATH = "export PATH=\"{{ dir }}:$PATH\"" -path = "path=( \"{{ dir }}\" $path )" -fpath = "fpath=( \"{{ dir }}\" $fpath )" -source = """ -{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\" -{% endfor %}{{ hooks?.post | nl }}""" +PATH = 'export PATH="{{ dir }}:$PATH"' +path = 'path=( "{{ dir }}" $path )' +fpath = 'fpath=( "{{ dir }}" $fpath )' +source = ''' +{{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}" +{% endfor %}{{ hooks?.post | nl }}'''