wip: replace simple_error with anyhow

Cargo.toml

@@ -8,12 +8,15 @@ repository = "https://github.com/cilki/wsm/"
 [dependencies]
 toml = "0"
 serde = { version = "1", features = ["derive"] }
-git-repository = "0"
+git-repository = { version = "0", optional = true }
 walkdir = "2"
 cmd_lib = "1.3.0"
 regex = "1"
 log = "0.4.17"
 env_logger = "0.10.0"
-simple-error = "0.2.3"
 pico-args = "0.5.0"
 sha2 = "0.10.6"
+anyhow = "1.0.82"
+
+[features]
+git_oxide = ["dep:git-repository"]

src/api/github.rs

@@ -1,6 +1,6 @@
 use crate::api::Provider;
 use crate::Provider;
-use std::error::Error;
+use anyhow::Result;
 use std::fmt;
 
 pub struct GithubProvider {
@@ -14,7 +14,7 @@ impl fmt::Display for GithubProvider {
 }
 
 impl Provider for GithubProvider {
-    fn list_repo_paths(&self) -> Result<Vec<String>, Box<dyn Error>> {
+    fn list_repo_paths(&self) -> Result<Vec<String>> {
         let mut paths: Vec<String> = Vec::new();
 
         /*loop {

src/api/mod.rs

@@ -1,10 +1,10 @@
-use std::error::Error;
+use anyhow::Result;
 use std::fmt::Display;
 
 //pub mod github;
 //pub mod gitlab;
 
 pub trait Provider: Display {
     /// List all repository paths available to the provider.
-    fn list_repo_paths(&self) -> Result<Vec<String>, Box<dyn Error>>;
+    fn list_repo_paths(&self) -> Result<Vec<String>>;
 }

src/cmd/drop.rs

@@ -1,11 +1,11 @@
 use crate::cmd::RepoPattern;
 use crate::Config;
+use anyhow::Result;
 use cmd_lib::*;
 use log::debug;
-use std::error::Error;
 
 /// Drop one or more repositories from the workspace
-pub fn run_drop(config: &Config, path: Option<String>) -> Result<(), Box<dyn Error>> {
+pub fn run_drop(config: &Config, path: Option<String>) -> Result<()> {
     debug!("Drop requested for: {:?}", &path);
 
     let repos = match path {

src/cmd/mod.rs

@@ -1,6 +1,6 @@
+use anyhow::bail;
+use anyhow::Result;
 use regex::Regex;
-use simple_error::bail;
-use std::error::Error;
 
 pub mod drop;
 pub mod open;
@@ -17,7 +17,7 @@ pub struct RepoPattern {
 }
 
 impl RepoPattern {
-    pub fn parse(path: &str) -> Result<Self, Box<dyn Error>> {
+    pub fn parse(path: &str) -> Result<Self> {
         match Regex::new(r"^([^/]+:)?(.*)$")?.captures(path) {
             Some(captures) => Ok(Self {
                 workspace: captures
@@ -43,10 +43,10 @@ impl RepoPattern {
 #[cfg(test)]
 mod test_repo_pattern {
     use super::RepoPattern;
-    use std::error::Error;
+    use anyhow::Result;
 
     #[test]
-    fn test_parse() -> Result<(), Box<dyn Error>> {
+    fn test_parse() -> Result<()> {
         assert_eq!(
             RepoPattern::parse("workspace12:remote1/abc/123")?,
             RepoPattern {

src/cmd/open.rs

@@ -1,17 +1,15 @@
 use crate::cmd::RepoPattern;
 use crate::Config;
+use anyhow::Result;
 use cmd_lib::*;
 use log::debug;
-use std::error::Error;
 
 /// Open one or more repositories in the workspace
-pub fn run_open(config: &Config, path: Option<String>) -> Result<(), Box<dyn Error>> {
+pub fn run_open(config: &Config, path: Option<String>) -> Result<()> {
     debug!("Open requested for: {:?}", &path);
 
     // Check the cache first
-    if let Some(cache) = &config.cache {
-
-    }
+    if let Some(cache) = &config.cache {}
 
     let repos = match path {
         Some(p) => config.resolve_local(&RepoPattern::parse(&p)?), // TODO remote

src/lib.rs

@@ -1,4 +1,5 @@
 use crate::cmd::RepoPattern;
+use anyhow::Result;
 use cmd_lib::run_fun;
 use log::debug;
 use serde::{Deserialize, Serialize};
@@ -55,7 +56,7 @@ impl Config {
 }
 
 /// Recursively find git repositories.
-fn find_git_dir(path: &str) -> Result<Vec<PathBuf>, Box<dyn Error>> {
+fn find_git_dir(path: &str) -> Result<Vec<PathBuf>> {
     debug!("Searching for git repositories in: {}", path);
     let mut found: Vec<PathBuf> = Vec::new();
 
@@ -118,7 +119,7 @@ pub struct Cache {
 
 impl Cache {
     /// Move the given repository into the cache.
-    pub fn cache(&self, repo_path: String) -> Result<(), Box<dyn Error>> {
+    pub fn cache(&self, repo_path: String) -> Result<()> {
         // Make sure the cache directory exists first
         std::fs::create_dir_all(&self.cache)?;
 
@@ -135,7 +136,7 @@ impl Cache {
         Ok(())
     }
 
-    pub fn uncache(&self, repo_path: String) -> Result<(), Box<dyn Error>> {
+    pub fn uncache(&self, repo_path: String) -> Result<()> {
         let source = self.compute_cache_key(&repo_path);
         run_fun!(git clone $source $repo_path)?;
         Ok(())

src/main.rs

@@ -1,8 +1,8 @@
+use anyhow::Result;
 use log::debug;
-use std::error::Error;
 use wsm::Config;
 
-fn main() -> Result<(), Box<dyn Error>> {
+fn main() -> Result<()> {
     // Initialize logging
     env_logger::init();
 
@@ -41,11 +41,11 @@ fn main() -> Result<(), Box<dyn Error>> {
 }
 
 /// Output dynamic completions for bash
-fn complete_bash() -> Result<(), Box<dyn Error>> {
+fn complete_bash() -> Result<()> {
     todo!()
 }
 
 /// Output dynamic completions for fish
-fn complete_fish() -> Result<(), Box<dyn Error>> {
+fn complete_fish() -> Result<()> {
     todo!()
 }