From 466ea5c7b8094a93d34d6bc6e6ea1b2c4f8d708c Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Thu, 21 Aug 2014 21:01:17 +0200 Subject: [PATCH] Update simplecov dependency to >= 0.9 --- .travis.yml | 13 ++++++------- Gemfile | 4 ++-- spec/helper.rb | 14 ++++++++------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 763513c..3929d06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,18 @@ language: ruby +env: + global: + - JRUBY_OPTS="$JRUBY_OPTS --debug" rvm: - 1.8.7 - 1.9.3 - 2.0.0 - 2.1 + - jruby-18mode + - jruby-19mode + - jruby-head - rbx-2 - ruby-head matrix: - include: - - rvm: jruby-18mode - env: JRUBY_OPTS="$JRUBY_OPTS --debug" - - rvm: jruby-19mode - env: JRUBY_OPTS="$JRUBY_OPTS --debug" - - rvm: jruby-head - env: JRUBY_OPTS="$JRUBY_OPTS --debug" allow_failures: - rvm: jruby-head - rvm: rbx-2 diff --git a/Gemfile b/Gemfile index 3725c80..5744b42 100644 --- a/Gemfile +++ b/Gemfile @@ -5,12 +5,12 @@ gem 'rake' group :test do gem 'backports' - gem 'coveralls', :require => false + gem 'coveralls' gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18] gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18] gem 'rspec', '>= 2.14' gem 'rubocop', '>= 0.25', :platforms => [:ruby_19, :ruby_20, :ruby_21] - gem 'simplecov', :require => false + gem 'simplecov', '>= 0.9' gem 'yardstick' end diff --git a/spec/helper.rb b/spec/helper.rb index 5efe267..24aa1f6 100644 --- a/spec/helper.rb +++ b/spec/helper.rb @@ -1,11 +1,13 @@ -require 'simplecov' -require 'coveralls' +if RUBY_VERSION >= '1.9' + require 'simplecov' + require 'coveralls' -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter] + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter] -SimpleCov.start do - add_filter '/spec/' - minimum_coverage(100) + SimpleCov.start do + add_filter '/spec/' + minimum_coverage(100) + end end require 'simple_oauth'