buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject svn commit: r1395217 - /buildr/trunk/rakelib/rspec.rake
Date Sun, 07 Oct 2012 05:49:12 GMT
Author: donaldp
Date: Sun Oct  7 05:49:12 2012
New Revision: 1395217

URL: http://svn.apache.org/viewvc?rev=1395217&view=rev
Log:
Remove begin/rescue/end to guard against rspec not being present as bundler will enforce the
presence of rspec

Modified:
    buildr/trunk/rakelib/rspec.rake

Modified: buildr/trunk/rakelib/rspec.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/rspec.rake?rev=1395217&r1=1395216&r2=1395217&view=diff
==============================================================================
--- buildr/trunk/rakelib/rspec.rake (original)
+++ buildr/trunk/rakelib/rspec.rake Sun Oct  7 05:49:12 2012
@@ -13,96 +13,91 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-begin
-  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
+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
 
-  # 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' => ['clobber', 'load_ci_reporter', 'spec']
+desc 'Run all specs with CI reporter'
+task 'ci' => ['clobber', 'load_ci_reporter', 'spec']
 
-  def rvm_run_in(version, command)
-    if !(Config::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
+def rvm_run_in(version, command)
+  if !(Config::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
 
-  # 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
-
-    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
-
-    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
+# 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
 
-    desc 'Run all specs across various rubies'
-    task 'all' => ['jruby', 'ruby_1_8', 'ruby_1_9']
+  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
 
-  task 'clobber' do
-    rm_f 'failed'
-    rm_rf '_reports'
+  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
 
-rescue LoadError => e
-  puts 'Buildr uses RSpec. You can install it by running bundler'
+  desc 'Run all specs across various rubies'
+  task 'all' => ['jruby', 'ruby_1_8', 'ruby_1_9']
+end
+
+task 'clobber' do
+  rm_f 'failed'
+  rm_rf '_reports'
 end



Mime
View raw message