Permalink
Browse files

Upgrade RCov to 1.0.0, only used on ruby_18

  • Loading branch information...
1 parent 3c520b0 commit 25f3c9514c47aacf9c5dc76806d361df74280188 @nicksieger nicksieger committed Jan 28, 2012
Showing with 6 additions and 8 deletions.
  1. +1 −1 Gemfile
  2. +1 −2 Gemfile.lock
  3. +2 −5 Rakefile
  4. +2 −0 spec/spec_helper.rb
View
@@ -13,7 +13,7 @@ group :development do
gem 'cucumber'
gem 'rspec', '> 2.0.0'
gem 'test-unit', '> 2.0.0'
- gem 'rcov'
+ gem 'rcov', :platform => :ruby_18
gem 'rdoc'
gem 'jruby-openssl', :platform => :jruby
end
View
@@ -22,8 +22,7 @@ GEM
json (1.6.3-java)
json_pure (1.6.1)
rake (0.9.2.2)
- rcov (0.9.9)
- rcov (0.9.9-java)
+ rcov (1.0.0)
rdoc (3.9.2)
rspec (2.8.0)
rspec-core (~> 2.8.0)
View
@@ -49,8 +49,8 @@ end
Rake::Task[task].actions.clear
end
-# No RCov on JRuby at the moment
-if RUBY_PLATFORM =~ /java/
+# RCov only on 1.8
+if defined?(RUBY_ENGINE)
task :default => :spec
else
task :default => :rcov
@@ -86,9 +86,6 @@ begin
rescue LoadError
end
-task "spec:rcov" do
- rm_f "Manifest.txt"
-end
task :rcov => "spec:rcov"
task :generate_output do
View
@@ -9,6 +9,8 @@
require 'spec'
end
+require 'rspec/autorun' if $0 =~ /rcov$/
+
unless defined?(CI_REPORTER_LIB)
CI_REPORTER_LIB = File.expand_path(File.dirname(__FILE__) + "/../lib")
$: << CI_REPORTER_LIB

0 comments on commit 25f3c95

Please sign in to comment.