chore: Replace dirs with etcetera

Fixes bytecodealliance#303

Signed-off-by: Joonas Bergius <[email protected]>

CONTRIBUTING.md

@@ -190,8 +190,8 @@ warg key new 127.0.0.1:8090
 The new signing key will be stored in your operating system's key store and
 used to sign package log entries when publishing to the registry.
 
-[config_dir]: https://docs.rs/dirs/5.0.0/dirs/fn.config_dir.html
-[cache_dir]: https://docs.rs/dirs/5.0.0/dirs/fn.cache_dir.html
+[config_dir]: https://docs.rs/etcetera/0.8.0/etcetera/base_strategy/trait.BaseStrategy.html#tymethod.config_dir
+[cache_dir]: https://docs.rs/etcetera/0.8.0/etcetera/base_strategy/trait.BaseStrategy.html#tymethod.cache_dir
 
 ### Improving The Documentation
 <!-- TODO

Cargo.toml

@@ -130,7 +130,7 @@ rand = "0.8.5"
 url = "2.5.0"
 libc = "0.2.153"
 itertools = "0.12.1"
-dirs = "5.0.1"
+etcetera = "0.8.0"
 once_cell = "1.19.0"
 walkdir = "2.4.0"
 normpath = "1.1.1"

README.md

@@ -96,8 +96,8 @@ warg key new --registry 127.0.0.1:8090
 The new signing key will be stored in your operating system's key store and
 used to sign package log entries when publishing to the registry.
 
-[config_dir]: https://docs.rs/dirs/5.0.0/dirs/fn.config_dir.html
-[cache_dir]: https://docs.rs/dirs/5.0.0/dirs/fn.cache_dir.html
+[config_dir]: https://docs.rs/etcetera/0.8.0/etcetera/base_strategy/trait.BaseStrategy.html#tymethod.config_dir
+[cache_dir]: https://docs.rs/etcetera/0.8.0/etcetera/base_strategy/trait.BaseStrategy.html#tymethod.cache_dir
 
 ### Publishing a package
 

crates/client/Cargo.toml

@@ -41,7 +41,7 @@ tracing = { workspace = true }
 itertools = { workspace = true }
 wasmparser = { workspace = true }
 wasm-compose = { workspace = true }
-dirs = { workspace = true }
+etcetera = { workspace = true }
 once_cell = { workspace = true }
 walkdir = { workspace = true }
 normpath = { workspace = true }

crates/client/src/config.rs

@@ -2,6 +2,7 @@
 
 use crate::{ClientError, RegistryUrl};
 use anyhow::{anyhow, Context, Result};
+use etcetera::BaseStrategy;
 use indexmap::IndexSet;
 use normpath::PathExt;
 use once_cell::sync::Lazy;
@@ -12,8 +13,16 @@ use std::{
     path::{Component, Path, PathBuf},
 };
 
-static CACHE_DIR: Lazy<Option<PathBuf>> = Lazy::new(dirs::cache_dir);
-static CONFIG_DIR: Lazy<Option<PathBuf>> = Lazy::new(dirs::config_dir);
+static CACHE_DIR: Lazy<Option<PathBuf>> = Lazy::new(|| {
+    etcetera::choose_base_strategy()
+        .ok()
+        .map(|strat| strat.cache_dir())
+});
+static CONFIG_DIR: Lazy<Option<PathBuf>> = Lazy::new(|| {
+    etcetera::choose_base_strategy()
+        .ok()
+        .map(|strat| strat.config_dir())
+});
 static CONFIG_FILE_NAME: &str = "warg-config.json";
 
 fn find_warg_config(cwd: &Path) -> Option<PathBuf> {

crates/client/src/keyring/flatfile.rs

@@ -7,6 +7,7 @@
 
 use keyring::credential::{Credential, CredentialApi, CredentialBuilderApi};
 
+use etcetera::BaseStrategy;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::PathBuf;
@@ -27,7 +28,9 @@ impl FlatfileCredentialBuilder {
     /// Construct the credential builder, storing credentials in
     /// `$XDG_CONFIG_HOME/warg/keyring`.
     pub fn new() -> keyring::Result<Self> {
-        let dir = dirs::config_dir()
+        let dir = etcetera::choose_base_strategy()
+            .ok()
+            .map(|strat| strat.config_dir())
             .ok_or(keyring::Error::NoEntry)?
             .join("warg")
             .join("keyring");