Improve shell and add tests

diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs
index ea4fb06023434d054eefd2c339b0685a73d8ab22..7bcdbddd621d7ff95bdb992b6ab0fd8ac2429009 100644 (file)
--- a/src/cargo/core/shell.rs
+++ b/src/cargo/core/shell.rs
@@ -3,7 +3,6 @@ use term::{Terminal,color};
 use term::color::Color;
 use term::attr::Attr;
 use std::io::IoResult;
-use std::io::stdio::StdWriter;
 
 pub struct ShellConfig {
     pub color: bool,
@@ -23,7 +22,7 @@ pub struct Shell<T> {
 
 impl<T: Writer + Send> Shell<T> {
     pub fn create(out: T, config: ShellConfig) -> Option<Shell<T>> {
-        if config.tty {
+        if config.tty && config.color {
             let term: Option<term::TerminfoTerminal<T>> = Terminal::new(out);
             term.map(|t| Shell { terminal: Color(box t as Box<Terminal<T>>), config: config })
         } else {

diff --git a/tests/test_shell.rs b/tests/test_shell.rs
new file mode 100644 (file)
index 0000000..a4e5912
--- /dev/null
+++ b/tests/test_shell.rs
@@ -0,0 +1,40 @@
+use support::{ResultTest,Tap,shell_writes};
+use hamcrest::{assert_that};
+use std::io::{MemWriter,IoResult};
+use std::str::from_utf8_lossy;
+use cargo::core::shell::{Shell,ShellConfig};
+use term::{Terminal,TerminfoTerminal,color};
+
+fn setup() {
+}
+
+test!(non_tty {
+    Shell::create(MemWriter::new(), ShellConfig { color: true, verbose: true, tty: false }).assert().tap(|shell| {
+        shell.say("Hey Alex", color::RED).assert();
+        assert_that(shell, shell_writes("Hey Alex\n"));
+    });
+})
+
+test!(color_explicitly_disabled {
+    Shell::create(MemWriter::new(), ShellConfig { color: false, verbose: true, tty: true }).assert().tap(|shell| {
+        shell.say("Hey Alex", color::RED).assert();
+        assert_that(shell, shell_writes("Hey Alex\n"));
+    });
+})
+
+test!(colored_shell {
+    Shell::create(MemWriter::new(), ShellConfig { color: true, verbose: true, tty: true }).assert().tap(|shell| {
+        shell.say("Hey Alex", color::RED).assert();
+        assert_that(shell, shell_writes(colored_output("Hey Alex\n", color::RED).assert()));
+    });
+})
+
+fn colored_output<S: Str>(string: S, color: color::Color) -> IoResult<String> {
+    let mut term: TerminfoTerminal<MemWriter> = Terminal::new(MemWriter::new()).assert();
+    try!(term.reset());
+    try!(term.fg(color));
+    try!(term.write_str(string.as_slice()));
+    try!(term.reset());
+    try!(term.flush());
+    Ok(from_utf8_lossy(term.get_ref().get_ref()).to_str())
+}