Remove special case output to STDOUT

The spec formatter checks that the output is a tty to decide whether to
use colourized formatting but then bypasses this check if STDOUT is used.
This means spec > output.log has undesirable escape sequences.  The only
purpose for this special casing seems to be preventing the closure of
STDOUT.  Localize this special case to #close so #output_to_tty? works
as expected.

Author: tpope

lib/spec/runner/formatter/base_text_formatter.rb

@@ -15,11 +15,6 @@ def initialize(options, where)
           super
           if where.is_a?(String)
             @output = File.open(where, 'w')
-          elsif where == STDOUT
-            @output = Kernel
-            def @output.flush
-              STDOUT.flush
-            end
           else
             @output = where
           end
@@ -81,7 +76,7 @@ def dump_pending
         end
 
         def close
-          if IO === @output
+          if IO === @output && @output != STDOUT
             @output.close 
           end
         end
@@ -112,7 +107,7 @@ def colour(text, colour_code)
 
         def output_to_tty?
           begin
-            @output == Kernel || @output.tty?
+            @output.tty?
           rescue NoMethodError
             false
           end

spec/spec/runner/formatter/story/plain_text_formatter_spec.rb

@@ -320,6 +320,26 @@ module Story
             @out.string.should include('When I say hey (SKIPPED)')
           end
 
+          it "should use colour codes on a tty" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_succeeded(:given, 'a context')
+
+            @out.string.should =~ /\e/m
+          end
+
+          it "should not use colour codes on a non-tty" do
+            @out.stub!(:tty?).and_return(false)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_succeeded(:given, 'a context')
+
+            @out.string.should_not =~ /\e/m
+          end
+
           it "should print steps which succeeded in green" do
             @out.stub!(:tty?).and_return(true)
             @options.stub!(:colour).and_return(true)