improve multi-ruby test framework

Author: alexch

.gitignore

@@ -8,3 +8,6 @@ test/adapters/railsapp
 .DS_Store
 vendor/cache/
 
+vendor/cache
+test/adapters/rspec1/vendor/cache
+test/adapters/rspec2/vendor/cache

Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gemspec name: "wrong"
+gemspec :name => "wrong"
 
 group :development, :test do
   gem "rvm"

Rakefile

@@ -6,8 +6,8 @@ task :default => :test
 
 def separate
   Dir["./test/adapters/*_test.rb"] + [
-    "./test/message/test_context_test.rb",
-    "./test/assert_advanced_test.rb",
+      "./test/message/test_context_test.rb",
+      "./test/assert_advanced_test.rb",
   ]
 end
 
@@ -58,49 +58,54 @@ end
 # end
 
 namespace :rvm do
+  require 'rvm'
 
   # todo: use https://gist.github.com/674648 technique instead
-#  $: << ENV["HOME"] + "/.rvm/lib"
+  #  $: << ENV["HOME"] + "/.rvm/lib"
   require 'rvm'
 
   @rubies=['1.8.6',
            '1.8.7',
-           '1.9.1-p378',  # we can't use p429 or p431, see http://bugs.ruby-lang.org/issues/show/3584
+           '1.9.1-p378', # we can't use p429 or p431, see http://bugs.ruby-lang.org/issues/show/3584 and http://bugs.ruby-lang.org/issues/2404
            '1.9.2',
            '1.9.3',
            'jruby']
   @rubies_str = @rubies.join(', ')
 
   def rvm
-    rvm = `which rvm`.strip
-    raise 'rvm not available; go to http://rvm.beginrescueend.com' unless rvm
-    rvm
+    @rvm_path ||= begin
+      rvm = `which rvm`.strip
+      raise 'rvm not available; go to http://rvm.beginrescueend.com' unless rvm
+      rvm
+    end
   end
 
   def rvm_run(cmd, options = {})
     options = {:bundle_check => true}.merge(options)
     @rubies.each do |version|
+
+      available_versions = RVM.list_strings
+      version = available_versions.grep(/#{version}/).last
+
       puts "\n== Using #{version}"
       using = `#{rvm} #{version} exec true`
       if using =~ /not installed/
         puts "== #{using}"
       else
         if options[:bundle_check]
           Bundler.with_clean_env do
-            sys "#{rvm} #{version} exec bundle check"
+            prefix = "#{rvm} #{version} exec"
+            sys "#{prefix} bundle check"
             if $?.exitstatus != 0
-              puts "try rake rvm:install_bundler or rake rvm:install_gems"
+              sys("#{prefix} bundle install")
+              sys("#{prefix} bundle install --gemfile=#{File.dirname __FILE__}/test/adapters/rspec1/Gemfile")
+              sys("#{prefix} bundle install --gemfile=#{File.dirname __FILE__}/test/adapters/rspec2/Gemfile")
             end
           end
         end
 
         Bundler.with_clean_env do
           sys "#{rvm} #{version} exec #{cmd}"
-          if $?.exitstatus == 7
-            puts "try rake rvm:install_gems"
-          elsif $?.exitstatus == 1
-            # uh...
-          end
         end
       end
     end
@@ -120,13 +125,6 @@ namespace :rvm do
   task :install_bundler do
     rvm_run("gem install bundler", :bundle_check => false)
   end
-
-  desc "run 'bundle install' with rvm in each of #{@rubies_str}"
-  task :install_gems do
-    rvm_run("bundle install", :bundle_check => false)
-    rvm_run("bundle install --gemfile=#{File.dirname __FILE__}/test/adapters/rspec1/Gemfile", :bundle_check => false)
-    rvm_run("bundle install --gemfile=#{File.dirname __FILE__}/test/adapters/rspec2/Gemfile", :bundle_check => false)
-  end
 end
 
 def load_gemspec(gemspec_name)

lib/wrong/chunk.rb

@@ -73,7 +73,6 @@ def glom(source)
       while sexp.nil? && line_index + c < lines.size
         begin
           @chunk = lines[line_index..line_index+c].join("\n")
-
           capturing(:stderr) do  # new RubyParser is too loud
             sexp = @parser.parse(@chunk)
           end

test/adapters/rspec1/Gemfile

@@ -1,9 +1,11 @@
+source :rubygems
+
 here = File.expand_path(File.dirname(__FILE__))
 
 gem "rspec", "~> 1.3", :require => "spec"
 gem "rvm"
 gem "bundler"
 gem "rake"
 
-gemspec path: "#{here}/../../..", name: "wrong"
+gemspec :path => "#{here}/../../..", :name => "wrong"
 

test/adapters/rspec2/Gemfile

@@ -1,3 +1,5 @@
+source :rubygems
+
 here = File.expand_path(File.dirname(__FILE__))
 
 gem "rspec", "~> 2.0"
@@ -8,4 +10,4 @@ gem "rvm"
 gem "bundler"
 gem "rake"
 
-gemspec path: "#{here}/../../..", name: "wrong"
+gemspec :path => "#{here}/../../..", :name => "wrong"

test/adapters/rspec_rails_test.rb

@@ -12,7 +12,7 @@
 # called rspec-rails-generate.sh -- if you dare
 
 
-if RUBY_VERSION == "1.9.2" # too many issues with other versions
+if RUBY_VERSION >= "1.9.2" # too many issues with other versions
 describe "testing rspec-rails" do
 
   [2].each do |rspec_version|

test/assert_advanced_test.rb

@@ -50,6 +50,10 @@ def assert_later(&p)
 
   it "can compare two hashes" do
     assert { {1=>2} == {1=>2} }
-    assert { {a:2} == {a:2} }
+    unless RUBY_VERSION < "1.9"
+      assert do
+        {a:2} == {a:2}
+      end
+    end
   end
 end

test/failure_message_test.rb

@@ -1,5 +1,6 @@
 require "./test/test_helper"
 require "wrong/assert"
+require "wrong/chunk"
 require "wrong/failure_message"
 
 class BogusFormatter < Wrong::FailureMessage::Formatter
@@ -91,7 +92,7 @@ def message(options = {}, &block)
 
     describe "#details" do
       def details(&block)
-        @chunk = Chunk.from_block(block, 1)
+        @chunk = Wrong::Chunk.from_block(block, 1)
         message.details
       end
 
@@ -200,7 +201,7 @@ def inspect
         end
 
         after do
-          Terminal.width = 80
+          Wrong::Terminal.width = 80
         end
 
         it 'inspects its value' do