From a250e749d16535845d2ab7e776282e4d161c1306 Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Sun, 4 Nov 2018 16:15:17 +0200
Subject: [PATCH] Implement process module

---
 src/main.rs    | 51 +++-----------------------------------------------
 src/process.rs | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 48 deletions(-)
 create mode 100644 src/process.rs

diff --git a/src/main.rs b/src/main.rs
index 0810999..9c7f29e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,16 +9,17 @@ extern crate which;
 
 mod error;
 mod mountstack;
+mod process;
 mod tool;
 
 use error::*;
 use failure::{Fail, ResultExt};
 use mountstack::{Filesystem, MountStack};
+use process::CommandExt;
 use simplelog::*;
 use std::fs;
 use std::path::PathBuf;
-use std::process::{exit, Command, ExitStatus};
-use std::str;
+use std::process::exit;
 use std::thread;
 use std::time::Duration;
 use structopt::StructOpt;
@@ -30,52 +31,6 @@ BINARIES=()
 FILES=()
 HOOKS=(base udev block filesystems keyboard fsck)";
 
-#[derive(Debug, Fail)]
-enum ProcessError {
-    #[fail(display = "Bad exit code: {}", _0)]
-    BadExitCode(ExitStatus),
-
-    #[fail(display = "Process output isn't valid UTF-8")]
-    InvalidUtf8,
-}
-
-trait CommandExt {
-    fn run(&mut self, context: ErrorKind) -> Result<(), Error>;
-    fn run_text_output(&mut self, context: ErrorKind) -> Result<String, Error>;
-}
-
-impl CommandExt for Command {
-    fn run(&mut self, context: ErrorKind) -> Result<(), Error> {
-        let exit_status = self.spawn().context(context)?.wait().context(context)?;
-
-        if !exit_status.success() {
-            return Err(ProcessError::BadExitCode(exit_status)
-                .context(context)
-                .into());
-        }
-
-        Ok(())
-    }
-
-    fn run_text_output(&mut self, context: ErrorKind) -> Result<String, Error> {
-        let output = self.output().context(context)?;
-
-        if !output.status.success() {
-            let error = str::from_utf8(&output.stderr).unwrap_or("[INVALID UTF8]");
-            error!("{}", error);
-            return Err(ProcessError::BadExitCode(output.status)
-                .context(context)
-                .into());
-        }
-
-        Ok(String::from(
-            str::from_utf8(&output.stdout)
-                .map_err(|_| ProcessError::InvalidUtf8)
-                .context(context)?,
-        ))
-    }
-}
-
 #[derive(StructOpt)]
 #[structopt(name = "alma", about = "Arch Linux Mobile Applicance")]
 enum App {
diff --git a/src/process.rs b/src/process.rs
new file mode 100644
index 0000000..c76634f
--- /dev/null
+++ b/src/process.rs
@@ -0,0 +1,50 @@
+use super::error::*;
+use failure::{Fail, ResultExt};
+use std::process::{Command, ExitStatus};
+use std::str;
+
+#[derive(Debug, Fail)]
+enum ProcessError {
+    #[fail(display = "Bad exit code: {}", _0)]
+    BadExitCode(ExitStatus),
+
+    #[fail(display = "Process output isn't valid UTF-8")]
+    InvalidUtf8,
+}
+
+pub trait CommandExt {
+    fn run(&mut self, context: ErrorKind) -> Result<(), Error>;
+    fn run_text_output(&mut self, context: ErrorKind) -> Result<String, Error>;
+}
+
+impl CommandExt for Command {
+    fn run(&mut self, context: ErrorKind) -> Result<(), Error> {
+        let exit_status = self.spawn().context(context)?.wait().context(context)?;
+
+        if !exit_status.success() {
+            return Err(ProcessError::BadExitCode(exit_status)
+                .context(context)
+                .into());
+        }
+
+        Ok(())
+    }
+
+    fn run_text_output(&mut self, context: ErrorKind) -> Result<String, Error> {
+        let output = self.output().context(context)?;
+
+        if !output.status.success() {
+            let error = str::from_utf8(&output.stderr).unwrap_or("[INVALID UTF8]");
+            error!("{}", error);
+            return Err(ProcessError::BadExitCode(output.status)
+                .context(context)
+                .into());
+        }
+
+        Ok(String::from(
+            str::from_utf8(&output.stdout)
+                .map_err(|_| ProcessError::InvalidUtf8)
+                .context(context)?,
+        ))
+    }
+}