clean up spec helpers, no top level methods please

spec/spec_helper.rb

@@ -3,9 +3,10 @@
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path("support/**/*.rb", File.dirname(__FILE__))].each {|f| require f}
+Dir[File.expand_path("support/*.rb", File.dirname(__FILE__))].each {|f| require f}
 
 RSpec.configure do |config|
+  config.include OutputStreams
   config.filter_run :focused => true
   config.filter_run_excluding :disabled => true
   config.run_all_when_everything_filtered = true

spec/support/output_streams.rb

@@ -1,30 +1,12 @@
-def capture_stderr(&block)
-  original_stderr = $stderr
-  $stderr = fake = StringIO.new
-  begin
-    yield
-  ensure
-    $stderr = original_stderr
-  end
-  fake.string
-end
-
-def capture_stdout(&block)
-  original_stdout = $stdout
-  $stdout = fake = StringIO.new
-  begin
-    yield
-  ensure
-    $stdout = original_stdout
-  end
-  fake.string
-end
-
-# wrapper around raise_error that captures stderr
-def should_abort_with(msg)
-  capture_stderr do
-    expect do
+module OutputStreams
+  def capture_stdout(&block)
+    original_stdout = $stdout
+    $stdout = fake = StringIO.new
+    begin
       yield
-    end.to raise_error SystemExit, msg
+    ensure
+      $stdout = original_stdout
+    end
+    fake.string
   end
 end