Uber refactor

src/unix.rs

@@ -1,42 +1,70 @@
+use super::terminal::Terminal;
 use super::utils::{which, Check, PathExt};
 use directories::BaseDirs;
-use failure;
+use failure::Error;
 use std::env;
 use std::os::unix::process::CommandExt;
-use std::path::PathBuf;
 use std::process::Command;
 
-pub fn run_zplug(zsh: &PathBuf) -> Result<(), failure::Error> {
-    Command::new(zsh)
-        .args(&["-c", "source ~/.zshrc && zplug update"])
-        .spawn()?
-        .wait()?
-        .check()?;
+pub fn run_zplug(base_dirs: &BaseDirs, terminal: &mut Terminal) -> Option<(&'static str, bool)> {
+    if let Some(zsh) = which("zsh") {
+        if base_dirs.home_dir().join(".zplug").exists() {
+            terminal.print_separator("zplug");
 
-    Ok(())
+            let success = || -> Result<(), Error> {
+                Command::new(zsh)
+                    .args(&["-c", "source ~/.zshrc && zplug update"])
+                    .spawn()?
+                    .wait()?
+                    .check()?;
+                Ok(())
+            }().is_ok();
+
+            return Some(("zplug", success));
+        }
+    }
+
+    None
 }
 
-pub fn run_fisherman(fish: &PathBuf) -> Result<(), failure::Error> {
-    Command::new(fish)
-        .args(&["-c", "fisher update"])
-        .spawn()?
-        .wait()?
-        .check()?;
+pub fn run_fisherman(base_dirs: &BaseDirs, terminal: &mut Terminal) -> Option<(&'static str, bool)> {
+    if let Some(fish) = which("fisherman") {
+        if base_dirs.home_dir().join(".config/fish/functions/fisher.fish").exists() {
+            terminal.print_separator("fisherman");
 
-    Ok(())
+            let success = || -> Result<(), Error> {
+                Command::new(fish)
+                    .args(&["-c", "fisher update"])
+                    .spawn()?
+                    .wait()?
+                    .check()?;
+                Ok(())
+            }().is_ok();
+
+            return Some(("fisherman", success));
+        }
+    }
+
+    None
 }
 
-pub fn run_tpm(tpm: &PathBuf) -> Result<(), failure::Error> {
-    Command::new(&tpm).arg("all").spawn()?.wait()?.check()?;
-
-    Ok(())
-}
-
-pub fn tpm_path(base_dirs: &BaseDirs) -> Option<PathBuf> {
-    base_dirs
+pub fn run_tpm(base_dirs: &BaseDirs, terminal: &mut Terminal) -> Option<(&'static str, bool)> {
+    if let Some(tpm) = base_dirs
         .home_dir()
         .join(".tmux/plugins/tpm/bin/update_plugins")
         .if_exists()
+    {
+        terminal.print_separator("tmux plugins");
+
+        let success = || -> Result<(), Error> {
+            Command::new(&tpm).arg("all").spawn()?.wait()?.check()?;
+            Ok(())
+        }().is_ok();
+
+        return Some(("tmux", success));
+    }
+
+    None
 }
 
 pub fn run_in_tmux() -> ! {
@@ -57,3 +85,20 @@ pub fn run_in_tmux() -> ! {
         .exec();
     panic!("{:?}", err);
 }
+
+#[must_use]
+pub fn run_homebrew(terminal: &mut Terminal) -> Option<(&'static str, bool)> {
+    if let Some(brew) = which("brew") {
+        terminal.print_separator("Brew");
+
+        let inner = || -> Result<(), Error> {
+            Command::new(&brew).arg("update").spawn()?.wait()?.check()?;
+            Command::new(&brew).arg("upgrade").spawn()?.wait()?.check()?;
+            Ok(())
+        };
+
+        return Some(("Brew", inner().is_ok()));
+    }
+
+    None
+}