Run coverage just once

Author: pitr-ch

.travis.yml

@@ -29,6 +29,9 @@ branches:
 
 matrix:
   include:
+    - rvm: 2.3.1
+      jdk: oraclejdk8
+      env: COVERAGE=1
     - rvm: jruby-head
       jdk: oraclejdk8
       env: TRUFFLE=1

Gemfile

@@ -20,10 +20,14 @@ end
 group :testing do
   gem 'rspec', '~> 3.3.0'
   gem 'timecop', '~> 0.7.4'
+end
 
-  # Coverage
-  gem 'simplecov', '~> 0.10.0', :require => false
-  gem 'coveralls', '~> 0.8.2', :require => false
+# made opt-in since it will not install on jruby 1.7
+if ENV['COVERAGE']
+  group :coverage do
+    gem 'simplecov', '~> 0.10.0', :require => false
+    gem 'coveralls', '~> 0.8.2', :require => false
+  end
 end
 
 group :benchmarks do

spec/spec_helper.rb

@@ -1,26 +1,23 @@
 $VERBOSE = nil # suppress our deprecation warnings
 
-# we can't use our helpers here because we need to load the gem _after_ simplecov
-unless RUBY_ENGINE == 'jruby' && 0 == (JRUBY_VERSION =~ /^9\.0\.0\.0/)
-  if (ENV['COVERAGE'] || ENV['CI'] || ENV['TRAVIS']) && !ENV['NO_COVERAGE']
-    require 'simplecov'
-    require 'coveralls'
+if ENV['COVERAGE']
+  require 'simplecov'
+  require 'coveralls'
 
-    if ENV['TRAVIS']
-      SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  if ENV['TRAVIS']
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
         SimpleCov::Formatter::HTMLFormatter,
         Coveralls::SimpleCov::Formatter
-      ]
-    else
-      SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
-    end
+    ]
+  else
+    SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+  end
 
-    SimpleCov.start do
-      project_name 'concurrent-ruby'
-      add_filter '/build-tests/'
-      add_filter '/examples/'
-      add_filter '/spec/'
-    end
+  SimpleCov.start do
+    project_name 'concurrent-ruby'
+    add_filter '/build-tests/'
+    add_filter '/examples/'
+    add_filter '/spec/'
   end
 end