Merge branch 'master' into master

Author: Freyskeyd

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "assert_cli"
-version = "0.5.2"
+version = "0.5.3"
 description = "Test CLI Applications."
 authors = ["Pascal Hertleif <[email protected]>"]
 license = "MIT OR Apache-2.0"

src/assert.rs

@@ -1,8 +1,10 @@
 use std::default;
-use std::process::Command;
+use std::process::{Command, Stdio};
 use std::path::PathBuf;
 use std::vec::Vec;
 use std::convert::Into;
+use std::io::Write;
+
 use errors::*;
 use output::{OutputAssertion, OutputKind};
 use environment::Environment;
@@ -16,6 +18,7 @@ pub struct Assert {
     expect_success: Option<bool>,
     expect_exit_code: Option<i32>,
     expect_output: Vec<OutputAssertion>,
+    stdin_contents: Option<String>,
 }
 
 impl default::Default for Assert {
@@ -31,6 +34,7 @@ impl default::Default for Assert {
             expect_success: Some(true),
             expect_exit_code: None,
             expect_output: vec![],
+            stdin_contents: None,
         }
     }
 }
@@ -91,6 +95,23 @@ impl Assert {
         self
     }
 
+    /// Add stdin to the command.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// extern crate assert_cli;
+    ///
+    /// assert_cli::Assert::command(&["cat"])
+    ///     .stdin("42")
+    ///     .stdout().contains("42")
+    ///     .unwrap();
+    /// ```
+    pub fn stdin(mut self, contents: &str) -> Self {
+        self.stdin_contents = Some(String::from(contents));
+        self
+    }
+
     /// Sets the working directory for the command.
     ///
     /// # Examples
@@ -257,15 +278,24 @@ impl Assert {
         let args: Vec<_> = self.cmd.iter().skip(1).collect();
         let mut command = Command::new(cmd);
         let command = command
+            .stdin(Stdio::piped())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped())
             .env_clear()
-            .envs(::std::env::vars().chain(self.env.clone().vars))
+            .envs(self.env.clone().compile()))
             .args(&args);
 
         let command = match self.current_dir {
             Some(ref dir) => command.current_dir(dir),
             None => command,
         };
-        let output = command.output()?;
+
+        let mut spawned = command.spawn()?;
+
+        if let Some(ref contents) = self.stdin_contents {
+            spawned.stdin.as_mut().expect("Couldn't get mut ref to command stdin").write_all(contents.as_bytes())?;
+        }
+        let output = spawned.wait_with_output()?;
 
         if let Some(expect_success) = self.expect_success {
             if expect_success != output.status.success() {