smokey the smoke tester says: "only you can fight bitrot"

Author: alexch

Rakefile

@@ -14,7 +14,7 @@ end
 
 def sys cmd
   puts "$ #{cmd}"
-  Bundler.with_clean_env do
+  Bundler.with_unbundled_env do
     system cmd
   end
 end
@@ -103,7 +103,7 @@ namespace :rvm do
         puts "== #{using}"
       else
         if options[:bundle_check]
-          Bundler.with_clean_env do
+          Bundler.with_unbundled_env do
             prefix = "#{rvm} #{version} exec"
             sys "#{prefix} bundle check"
             if $?.exitstatus != 0
@@ -114,7 +114,7 @@ namespace :rvm do
           end
         end
 
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           sys "#{rvm} #{version} exec #{cmd}"
         end
       end

lib/wrong/capturing.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module Wrong
   module Capturing
 
@@ -15,7 +17,7 @@ def capturing(*streams)
       # reassign the $ variable (which is used by well-behaved code e.g. puts)
       streams.each do |stream|
         original[stream] = (stream == :stdout ? $stdout : $stderr)
-        captured[stream] = StringIO.new
+        captured[stream] = ::StringIO.new
         reassign_stream(stream, captured)
       end
 

test/adapters/rspec_test.rb

@@ -33,7 +33,7 @@
           end
         end
 
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           # RSpec v1 exits with 0 on failure :-( (as do older rubies)
           expected_status = (rspec_version == 1 || RUBY_VERSION =~ /^1\.8\./ || RUBY_VERSION == '1.9.1' ? :ignore : 1)
           spec_output = sys "ruby #{dir}/failing_spec.rb", expected_status