buildr 1.4.7.pre2-java → 1.4.8-java

data/rakelib/checks.rake

@@ -14,9 +14,9 @@
 # the License.
 
 
-desc "Check that source files contain the Apache license"
-task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
-  puts "Checking that files contain the Apache license ... "
+desc 'Check that source files contain the Apache license'
+task 'license' => FileList['{addond,lib,doc,rakelib}/**/*.{rb,rake,java}', 'buildr.gemspec', 'Rakefile'] do |task|
+  puts 'Checking that files contain the Apache license ... '
   required = task.prerequisites.select { |fn| File.file?(fn) }
   missing = required.reject { |fn|
     comments = File.read(fn).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|^-#\s+(.*?)$|<!--(.*?)-->/m).
@@ -24,5 +24,5 @@ task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do
     comments =~ /Licensed to the Apache Software Foundation/ && comments =~ /http:\/\/www.apache.org\/licenses\/LICENSE-2.0/
   }
   fail "#{missing.join(', ')} missing Apache License, please add it before making a release!" unless missing.empty?
-  puts "[x] Source files contain the Apache license"
+  puts '[x] Source files contain the Apache license'
 end

data/rakelib/doc.rake

@@ -13,111 +13,108 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-if !RUBY_PLATFORM[/java/]
-  require 'rdoc/task'
+begin
 
-  desc "Creates a symlink to rake's lib directory to support combined rdoc generation"
-  file "rake/lib" do
-    rake_path = $LOAD_PATH.find { |p| File.exist? File.join(p, "rake.rb") }
-    mkdir_p "rake"
-    File.symlink(rake_path, "rake/lib")
-  end
+gem 'rdoc'
+require 'rdoc/task'
+desc 'Creates a symlink to rake' 's lib directory to support combined rdoc generation'
+file 'rake/lib' do
+  rake_path = $LOAD_PATH.find { |p| File.exist? File.join(p, 'rake.rb') }
+  mkdir_p 'rake'
+  File.symlink(rake_path, 'rake/lib')
+end
 
-  desc "Generate RDoc documentation in rdoc/"
-  Rake::RDocTask.new :rdoc do |rdoc|
-    rdoc.rdoc_dir = 'rdoc'
-    rdoc.title = spec.name
-    rdoc.options = spec.rdoc_options.clone
-    rdoc.rdoc_files.include('lib/**/*.rb')
-    rdoc.rdoc_files.include spec.extra_rdoc_files
+desc 'Generate RDoc documentation in rdoc/'
+RDoc::Task.new :rdoc do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = spec.name
+  rdoc.options = spec.rdoc_options.clone
+  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include spec.extra_rdoc_files
 
-      # include rake source for better inheritance rdoc
-    rdoc.rdoc_files.include('rake/lib/**.rb')
-  end
-  task :rdoc => ["rake/lib"]
+  # include rake source for better inheritance rdoc
+  rdoc.rdoc_files.include('rake/lib/**.rb')
+end
+task 'rdoc' => %w(rake/lib)
 
-  begin
-    require 'jekylltask'
-    module TocFilter
-      def toc(input)
-        output = "<ol class=\"toc\">"
-        input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).each do |entry|
-          id = (entry[1][/^id=(['"])(.*)\1$/, 2] rescue nil)
-          title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
-          if id
-            output << %{<li><a href="##{id}">#{title}</a></li>}
-          else
-            output << %{<li>#{title}</li>}
-          end
-        end
-        output << "</ol>"
-        output
+require 'jekylltask'
+module TocFilter
+  def toc(input)
+    output = "<ol class=\"toc\">"
+    input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).each do |entry|
+      id = (entry[1][/^id=(['"])(.*)\1$/, 2] rescue nil)
+      title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
+      if id
+        output << %{<li><a href="##{id}">#{title}</a></li>}
+      else
+        output << %{<li>#{title}</li>}
       end
     end
-    Liquid::Template.register_filter(TocFilter)
-
-    desc "Generate Buildr documentation in _site/"
-    JekyllTask.new :jekyll do |task|
-      task.source = 'doc'
-      task.target = '_site'
-    end
-
-  rescue LoadError
-    puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running bundler"
+    output << '</ol>'
+    output
   end
+end
+Liquid::Template.register_filter(TocFilter)
 
-  if `pygmentize -V`.empty?
-    puts "Buildr uses the Pygments python library. You can install it by running 'sudo easy_install Pygments'"
-  end
+desc 'Generate Buildr documentation in _site/'
+JekyllTask.new 'jekyll' do |task|
+  task.source = 'doc'
+  task.target = '_site'
+end
 
-  desc "Generate Buildr documentation as buildr.pdf"
-  file 'buildr.pdf'=>'_site' do |task|
-    pages = File.read('_site/preface.html').scan(/<li><a href=['"]([^'"]+)/).flatten.map { |f| "_site/#{f}" }
-    sh 'prince', '--input=html', '--no-network', '--log=prince_errors.log', "--output=#{task.name}", '_site/preface.html', *pages
-  end
+if 0 == system('pygmentize -V > /dev/null 2> /dev/null')
+  puts 'Buildr uses the Pygments python library. You can install it by running ' 'sudo easy_install Pygments' ' or ' 'sudo apt-get install python-pygments' ''
+end
+
+desc 'Generate Buildr documentation as buildr.pdf'
+file 'buildr.pdf' => '_site' do |task|
+  pages = File.read('_site/preface.html').scan(/<li><a href=['"]([^'"]+)/).flatten.map { |f| "_site/#{f}" }
+  sh 'prince', '--input=html', '--no-network', '--log=prince_errors.log', "--output=#{task.name}", '_site/preface.html', *pages
+end
 
-  desc "Build a copy of the Web site in the ./_site"
-  task :site=>['_site', :rdoc, '_reports/specs.html', '_reports/coverage', 'buildr.pdf'] do
-    cp_r 'rdoc', '_site'
-    fail 'No RDocs in site directory' unless File.exist?('_site/rdoc/files/lib/buildr_rb.html')
-    cp '_reports/specs.html', '_site'
-    cp_r '_reports/coverage', '_site'
-    fail 'No coverage report in site directory' unless File.exist?('_site/coverage/index.html')
-    cp 'CHANGELOG', '_site'
-    open("_site/.htaccess", "w") do |htaccess|
-      htaccess << %Q{
+desc 'Build a copy of the Web site in the ./_site'
+task 'site' => ['_site', :rdoc, 'buildr.pdf'] do
+  cp_r 'rdoc', '_site'
+  fail 'No RDocs in site directory' unless File.exist?('_site/rdoc/Buildr.html')
+  cp 'CHANGELOG', '_site'
+  open('_site/.htaccess', 'w') do |htaccess|
+    htaccess << %Q{
 <FilesMatch "CHANGELOG">
 ForceType 'text/plain; charset=UTF-8'
 </FilesMatch>
 }
-    end
-    cp 'buildr.pdf', '_site'
-    fail 'No PDF in site directory' unless File.exist?('_site/buildr.pdf')
-    puts 'OK'
   end
+  cp 'buildr.pdf', '_site'
+  fail 'No PDF in site directory' unless File.exist?('_site/buildr.pdf')
+  puts 'OK'
+end
 
 # Publish prerequisites to Web site.
-  task 'publish'=>:site do
-    target = "people.apache.org:/www/#{spec.name}.apache.org/"
-    puts "Uploading new site to #{target} ..."
-    sh 'rsync', '--progress', '--recursive', '--delete', '_site/', target
-    sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
-    puts "Done"
-  end
+task 'publish' => 'site' do
+  target = "people.apache.org:/www/#{spec.name}.apache.org/"
+  puts "Uploading new site to #{target} ..."
+  sh 'rsync', '--progress', '--recursive', '--delete', '_site/', target
+  sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
+  puts 'Done'
+end
 
 # Update HTML + PDF documentation (but not entire site; no specs, coverage, etc.)
-  task 'publish-doc' => ['buildr.pdf', '_site'] do
-    cp 'buildr.pdf', '_site'
-    target = "people.apache.org:/www/#{spec.name}.apache.org/"
-    puts "Uploading new site to #{target} ..."
-    sh 'rsync', '--progress', '--recursive', '_site/', target # Note: no --delete
-    sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
-    puts "Done"
-  end
+task 'publish-doc' => %w(buildr.pdf _site) do
+  cp 'buildr.pdf', '_site'
+  target = "people.apache.org:/www/#{spec.name}.apache.org/"
+  puts "Uploading new site to #{target} ..."
+  sh 'rsync', '--progress', '--recursive', '_site/', target # Note: no --delete
+  sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
+  puts 'Done'
+end
 
-  task :clobber do
-    rm_rf '_site'
-    rm_f 'buildr.pdf'
-    rm_f 'prince_errors.log'
-  end
+task 'clobber' do
+  rm_rf '_site'
+  rm_f 'buildr.pdf'
+  rm_f 'prince_errors.log'
 end
+
+rescue Exception => e
+# The doc tasks do not work on our CI infrastructure with jruby as the native libraries
+# are not compatible with version of the C++ library we are running there
+end

data/rakelib/metrics.rake

@@ -13,15 +13,15 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-namespace :metrics do
+namespace 'metrics' do
   desc 'run Saikuro reports'
-  task :saikuro do
+  task 'saikuro' do
     gem 'atoulme-Saikuro'
     require 'saikuro'
-    output_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "_reports", "saikuro"))
-    base_dir = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), "..")))
-    rb_files = ["lib", "addon"].collect { |folder| 
-      FileList[File.expand_path(File.join(File.dirname(__FILE__), "..", folder, "**", "*.rb"))]
+    output_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '_reports', 'saikuro'))
+    base_dir = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..')))
+    rb_files = %w(lib addon).collect { |folder|
+      FileList[File.expand_path(File.join(File.dirname(__FILE__), '..', folder, '**', '*.rb'))]
     }.flatten.collect {|path| 
       Pathname.new(path).relative_path_from(base_dir).to_s
     }
@@ -29,11 +29,11 @@ namespace :metrics do
   end
   
   desc 'generate ccn treemap'
-  task :ccn_treemap do
+  task 'ccn_treemap' do
     require 'saikuro_treemap'
-    SaikuroTreemap.generate_treemap :code_dirs => ['lib', 'addon'], :output_file => "_reports/saikuro_treemap.html"
+    SaikuroTreemap.generate_treemap :code_dirs => %w(lib addon), :output_file => '_reports/saikuro_treemap.html'
   end
 end
 
 desc 'Run all metrics tools'
-task :metrics => ["metrics:saikuro", "metrics:ccn_treemap"]
+task 'metrics' => %w(metrics:saikuro metrics:ccn_treemap)

data/rakelib/package.rake

@@ -13,43 +13,22 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require 'rubygems/package_task'
 
-
 package = Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true
 end
 
-desc "Install Buildr from source"
-task :install=>["#{package.package_dir}/#{package.gem_spec.file_name}"] do |task|
-  print "Installing #{spec.name} ... "
-  args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.gem_spec.file_name}"
-  args.unshift('sudo') if sudo_needed?
-  sh *args
-  puts "[x] Installed Buildr #{spec.version}"
-end
-
-desc "Uninstall previous rake install"
-task :uninstall do |task|
-  puts "Uninstalling #{spec.name} ... "
-  args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'uninstall', spec.name, '--version', spec.version.to_s
-  args.unshift('sudo') if sudo_needed?
-  sh *args
-  puts "[x] Uninstalled Buildr #{spec.version}"
-end
-
-
-desc "Compile Java libraries used by Buildr"
-task :compile do
-  puts "Compiling Java libraries ..."
-  args = Config::CONFIG['ruby_install_name'], File.expand_path(RUBY_PLATFORM[/java/] ? '_jbuildr' : '_buildr'), '--buildfile', 'buildr.buildfile', 'compile'
+desc 'Compile Java libraries used by Buildr'
+task 'compile' do
+  puts 'Compiling Java libraries ...'
+  args = RbConfig::CONFIG['ruby_install_name'], File.expand_path(RUBY_PLATFORM[/java/] ? '_jbuildr' : '_buildr'), '--buildfile', 'buildr.buildfile', 'compile'
   args << '--trace' if Rake.application.options.trace
   sh *args
 end
-file Gem::PackageTask.new(spec).package_dir => :compile
-file Gem::PackageTask.new(spec).package_dir_path => :compile
+file Gem::PackageTask.new(spec).package_dir => 'compile'
+file Gem::PackageTask.new(spec).package_dir_path => 'compile'
 
 # We also need the other packages (JRuby if building on Ruby, and vice versa)
 # Must call new with block, even if block does nothing, otherwise bad things happen.
@@ -57,17 +36,17 @@ file Gem::PackageTask.new(spec).package_dir_path => :compile
   Gem::PackageTask.new(s) { |task| }
 end
 
-
-desc "Upload snapshot packages over to people.apache.org"
-task :snapshot=>[:package] do
+desc 'Upload snapshot packages over to people.apache.org'
+task 'snapshot' => %w(package) do
   rm_rf '_snapshot' # Always start with empty directory
-  puts "Copying existing gems from Apache"
+  puts 'Copying existing gems from Apache'
   sh 'rsync', '--progress', '--recursive', 'people.apache.org:public_html/buildr/snapshot/', '_snapshot/'
-  puts "Copying new gems over"
+  puts 'Copying new gems over'
   cp FileList['pkg/{*.gem,*.tgz,*.zip}'], '_snapshot/gems'
-  puts "Generating gem index ..."
+  puts 'Generating gem index ...'
   sh 'gem', 'generate_index', '--directory', '_snapshot'
-  puts "Copying gem and index back to Apache"
+  puts 'Copying gem and index back to Apache'
   sh 'rsync', '--progress', '--recursive', '_snapshot/', 'people.apache.org:public_html/buildr/snapshot/'
 end
-task(:clobber) { rm_rf '_snapshot' }
+task('clobber') { rm_rf 'target' }
+task('clobber') { rm_rf '_snapshot' }

data/rakelib/release.rake

@@ -14,26 +14,26 @@
 # the License.
 
 
-task :release do
+task 'release' do
   # First, we need to get all the staged files from Apache to _release.
   mkpath '_release'
   lambda do
     url = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
     puts "Populating _release directory from #{url} ..."
     sh 'rsync', '--progress', '--recursive', url, '_release'
-    puts "[X] Staged files are now in _release"
+    puts '[X] Staged files are now in _release'
   end.call
 
 
   # Upload binary and source packages and new Web site
   lambda do
     target = "people.apache.org:/www/www.apache.org/dist/#{spec.name}/#{spec.version}"
-    puts "Uploading packages to www.apache.org/dist ..."
+    puts 'Uploading packages to www.apache.org/dist ...'
     host, remote_dir = target.split(':')
     sh 'ssh', host, 'rm', '-rf', remote_dir rescue nil
     sh 'ssh', host, 'mkdir', remote_dir
     sh 'rsync', '--progress', '--recursive', "_release/#{spec.version}/dist/", target
-    puts "[X] Uploaded packages to www.apache.org/dist"
+    puts '[X] Uploaded packages to www.apache.org/dist'
 
     target = "people.apache.org:/www/#{spec.name}.apache.org/"
     puts "Uploading new site to #{spec.name}.apache.org ..."
@@ -54,7 +54,7 @@ task :release do
     rubyforge.userconfig.merge!('release_changes'=>"_release/#{spec.version}/CHANGES",  'preformatted' => true)
     rubyforge.add_release spec.rubyforge_project.downcase, spec.name.downcase, spec.version.to_s, *files
 
-    puts "Posting news to RubyForge ... "
+    puts 'Posting news to RubyForge ...'
     changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
     rubyforge.post_news spec.rubyforge_project.downcase, "Buildr #{spec.version} released",
       "#{spec.description}\n\nNew in Buildr #{spec.version}:\n#{changes.gsub(/^/, '  ')}\n"
@@ -68,8 +68,8 @@ task :release do
       puts "Push gem #{f} to RubyForge.org / Gemcutter ... "
       `gem push #{f}`
     end
-    puts "[X] Pushed gems to Rubyforge.org / Gemcutter"
-  end
+    puts '[X] Pushed gems to Rubyforge.org / Gemcutter'
+  end.call
 
   # Create an SVN tag for this release.
   lambda do
@@ -81,7 +81,7 @@ task :release do
           if ok
             puts "[X] Tagged this release as tags/#{spec.version} ... "
           else
-            puts "Could not create tag, please do it yourself!"
+            puts 'Could not create tag, please do it yourself!'
             puts %{  svn copy #{url} #{new_url} -m "Release #{spec.version}"}
           end
         end
@@ -98,7 +98,7 @@ task :release do
     File.open 'CHANGELOG', 'w' do |file|
       file.write modified
     end
-    puts "[X] Updated CHANGELOG and added entry for next release"
+    puts '[X] Updated CHANGELOG and added entry for next release'
   end.call
 
 
@@ -150,11 +150,10 @@ The Apache Buildr Team
     File.open 'announce-email.txt', 'w' do |file|
       file.write email
     end
-    puts "[X] Created release announce email template in 'announce-email.txt'"
+    puts '[X] Created release announce email template in ''announce-email.txt'''
     puts email
   end
 
 end
 
-
-task(:clobber) { rm_rf '_release' }
+task('clobber') { rm_rf '_release' }

data/rakelib/rspec.rake

@@ -13,78 +13,91 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-begin
-  require 'rspec/core/rake_task'
-  directory '_reports'
+require 'rspec/core/rake_task'
+directory '_reports'
 
-  def default_spec_opts
-    default = %w{--format documentation --out _reports/specs.txt --backtrace}
-    default << '--colour' if $stdout.isatty && !(Config::CONFIG['host_os'] =~ /mswin|win32|dos/i)
-    default
-  end
+def default_spec_opts
+  default = %w{--format documentation --out _reports/specs.txt --backtrace}
+  default << '--colour' if $stdout.isatty && !(RbConfig::CONFIG['host_os'] =~ /mswin|win32|dos/i)
+  default
+end
 
-  # RSpec doesn't support file exclusion, so hack our own.
-  class RSpec::Core::RakeTask
-    attr_accessor :rspec_files
+# RSpec doesn't support file exclusion, so hack our own.
+class RSpec::Core::RakeTask
+  attr_accessor :rspec_files
   private
-    def files_to_run
-      @rspec_files
-    end
+  def files_to_run
+    @rspec_files
   end
+end
 
-  desc "Run all specs"
-  RSpec::Core::RakeTask.new :spec=>['_reports', :compile] do |task|
-    ENV['USE_FSC'] = 'no'
-    task.rspec_files = FileList['spec/**/*_spec.rb']
-    task.rspec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
-    task.rspec_opts = default_spec_opts
-    task.rspec_opts = %w{--format html --out _reports/specs.html --backtrace}
-  end
-  file('_reports/specs.html') { task(:spec).invoke }
+desc 'Run all specs'
+RSpec::Core::RakeTask.new :spec => ['_reports', :compile] do |task|
+  ENV['USE_FSC'] = 'no'
+  task.rspec_files = FileList['spec/**/*_spec.rb']
+  task.rspec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
+  task.rspec_opts = default_spec_opts
+  task.rspec_opts = %w{--format html --out _reports/specs.html --backtrace}
+end
+file('_reports/specs.html') { task(:spec).invoke }
 
-  desc 'Run RSpec and generate Spec and coverage reports (slow)'
-  RSpec::Core::RakeTask.new :coverage=>['_reports', :compile] do |task|
-    ENV['USE_FSC'] = 'no'
-    task.rspec_files = FileList['spec/**/*_spec.rb']
-    task.rspec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
-    task.rspec_opts = default_spec_opts
-    task.rcov = true
-    task.rcov_opts = %w{-o _reports/coverage --exclude / --include-file ^lib --text-summary}
-  end
-  file('_reports/coverage') { task(:coverage).invoke }
+desc 'Run RSpec and generate Spec and coverage reports (slow)'
+RSpec::Core::RakeTask.new :coverage => ['_reports', :compile] do |task|
+  ENV['USE_FSC'] = 'no'
+  task.rspec_files = FileList['spec/**/*_spec.rb']
+  task.rspec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
+  task.rspec_opts = default_spec_opts
+  task.rcov = true
+  task.rcov_opts = %w{-o _reports/coverage --exclude / --include-file ^lib --text-summary}
+end
+file('_reports/coverage') { task(:coverage).invoke }
 
-  task :load_ci_reporter do
-    gem 'ci_reporter'
-    ENV['CI_REPORTS'] = '_reports/ci'
-    # CI_Reporter does not quote the path to rspec_loader which causes problems when ruby is installed in C:/Program Files.
-    # However, newer versions of rspec don't like double quotes escaping as well, so removing them for now.
-    ci_rep_path = Gem.loaded_specs['ci_reporter'].full_gem_path
-    ENV["SPEC_OPTS"] = [ENV["SPEC_OPTS"], default_spec_opts, "--require", "#{ci_rep_path}/lib/ci/reporter/rake/rspec_loader.rb", "--format", "CI::Reporter::RSpec"].join(" ")
-  end
+task :load_ci_reporter do
+  gem 'ci_reporter'
+  ENV['CI_REPORTS'] = '_reports/ci'
+  # CI_Reporter does not quote the path to rspec_loader which causes problems when ruby is installed in C:/Program Files.
+  # However, newer versions of rspec don't like double quotes escaping as well, so removing them for now.
+  ci_rep_path = Gem.loaded_specs['ci_reporter'].full_gem_path
+  ENV['SPEC_OPTS'] = [ENV['SPEC_OPTS'], default_spec_opts, '--require', "#{ci_rep_path}/lib/ci/reporter/rake/rspec_loader.rb", '--format', 'CI::Reporter::RSpec'].join(" ")
+end
 
-  desc 'Run all specs with CI reporter'
-  task :ci=>[:load_ci_reporter, :spec]
+desc 'Run all specs with CI reporter'
+task 'ci' => %w(clobber load_ci_reporter spec)
 
-  # Useful for testing with JRuby when using Ruby and vice versa.
-  namespace :spec do
-    desc "Run all specs specifically with Ruby"
-    task :ruby do
-      puts "Running test suite using Ruby ..."
-      sh 'ruby -S rake spec'
-    end
+def rvm_run_in(version, command)
+  if !(RbConfig::CONFIG['host_os'] =~ /mswin|win32|dos/i)
+    cmd_prefix = "rvm #{version} exec"
+    sh "rm -f Gemfile.lock; #{cmd_prefix} bundle install; #{cmd_prefix} bundle exec #{command}"
+  else
+    sh "#{version =~ /jruby/ ? "j" : ""}ruby -S #{command}"
+  end
+end
 
-    desc "Run all specs specifically with JRuby"
-    task :jruby do
-      puts "Running test suite using JRuby ..."
-      sh 'jruby -S rake spec'
-    end
+# Useful for testing with JRuby when using Ruby and vice versa.
+namespace 'spec' do
+  desc 'Run all specs specifically with Ruby 1.9'
+  task 'ruby_1_9' do
+    puts 'Running test suite using Ruby ...'
+    rvm_run_in('ruby-1.9.2-p320@buildr', 'rake spec')
   end
 
-  task :clobber do
-    rm_f 'failed'
-    rm_rf '_reports'
+  desc 'Run all specs specifically with Ruby 1.8'
+  task 'ruby_1_8' do
+    puts 'Running test suite using Ruby ...'
+    rvm_run_in('ruby-1.8.7-p358@buildr', 'rake spec')
   end
 
-rescue LoadError => e
-  puts "Buildr uses RSpec. You can install it by running bundler"
+  desc 'Run all specs specifically with JRuby'
+  task 'jruby' do
+    puts 'Running test suite using JRuby ...'
+    rvm_run_in('jruby-1.6.7@buildr', 'rake spec')
+  end
+
+  desc 'Run all specs across various rubies'
+  task 'all' => %w(jruby ruby_1_8 ruby_1_9)
+end
+
+task 'clobber' do
+  rm_f 'failed'
+  rm_rf '_reports'
 end