Simplify process access to current_dir

Author: djc

src/currentprocess.rs

@@ -18,13 +18,9 @@ use enum_dispatch::enum_dispatch;
 #[cfg(feature = "test")]
 use rand::{thread_rng, Rng};
 
-pub mod cwdsource;
 pub mod filesource;
-mod homethunk;
 pub mod terminalsource;
 
-use cwdsource::*;
-
 use crate::utils::tty::{stderr_isatty, stdout_isatty};
 
 /// An abstraction for the current process.
@@ -62,11 +58,11 @@ use crate::utils::tty::{stderr_isatty, stdout_isatty};
 /// methods are in performance critical loops (except perhaps progress bars -
 /// and even there we should be doing debouncing and managing update rates).
 #[enum_dispatch]
-pub trait CurrentProcess: CurrentDirSource + Debug {}
+pub trait CurrentProcess: Debug {}
 
 /// Allows concrete types for the currentprocess abstraction.
 #[derive(Clone, Debug)]
-#[enum_dispatch(CurrentProcess, CurrentDirSource)]
+#[enum_dispatch(CurrentProcess)]
 pub enum Process {
     OSProcess(OSProcess),
     #[cfg(feature = "test")]
@@ -146,6 +142,14 @@ impl Process {
         }
     }
 
+    pub(crate) fn current_dir(&self) -> io::Result<PathBuf> {
+        match self {
+            Process::OSProcess(_) => env::current_dir(),
+            #[cfg(feature = "test")]
+            Process::TestProcess(p) => Ok(p.cwd.clone()),
+        }
+    }
+
     #[cfg(test)]
     fn id(&self) -> u64 {
         match self {
@@ -156,6 +160,32 @@ impl Process {
     }
 }
 
+impl home::env::Env for Process {
+    fn home_dir(&self) -> Option<PathBuf> {
+        match self {
+            Process::OSProcess(_) => self.var("HOME").ok().map(|v| v.into()),
+            #[cfg(feature = "test")]
+            Process::TestProcess(_) => home::env::OS_ENV.home_dir(),
+        }
+    }
+
+    fn current_dir(&self) -> Result<PathBuf, io::Error> {
+        match self {
+            Process::OSProcess(_) => self.current_dir(),
+            #[cfg(feature = "test")]
+            Process::TestProcess(_) => home::env::OS_ENV.current_dir(),
+        }
+    }
+
+    fn var_os(&self, key: &str) -> Option<OsString> {
+        match self {
+            Process::OSProcess(_) => self.var_os(key),
+            #[cfg(feature = "test")]
+            Process::TestProcess(_) => self.var_os(key),
+        }
+    }
+}
+
 /// Obtain the current instance of CurrentProcess
 pub fn process() -> Process {
     home_process()

src/currentprocess/cwdsource.rs

@@ -10,7 +10,6 @@ use retry::{retry, OperationResult};
 use sha2::Sha256;
 use url::Url;
 
-use crate::currentprocess::cwdsource::CurrentDirSource;
 use crate::errors::*;
 use crate::utils::notifications::Notification;
 use crate::utils::raw;