Merge pull request #587 from pitr-ch/master

Update CI

Author: Petr Chalupa

.travis.yml

@@ -3,19 +3,22 @@ language: ruby
 cache: bundler
 
 rvm:
+  # start with the latest
   - 2.3.1
-  - 2.2.3
-  - 2.2.2
-  - 2.1.5
-  - 2.0.0
+  - jruby-9.1.5.0
+
+  # older versions
+  - 2.2
+  - 2.1
+  - 2.0
   - 1.9.3
-  - ruby-head
-  - jruby-1.7.19
-  - jruby-9.0.1.0
-  - jruby-9.0.3.0
+
   - jruby-9.0.5.0
+  - jruby-1.7.26
+
+  - ruby-head
   - jruby-head
-  - rbx-2
+
   - rbx
 
 jdk:
@@ -29,14 +32,16 @@ branches:
 
 matrix:
   include:
+    - rvm: 2.3.1
+      jdk: oraclejdk8
+      env: COVERAGE=1
     - rvm: jruby-head
       jdk: oraclejdk8
       env: TRUFFLE=1
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: 1.9.3
-    - rvm: rbx-2
     - rvm: rbx
     - rvm: jruby-head
       jdk: oraclejdk8

Gemfile

@@ -13,17 +13,22 @@ group :development do
   # documentation
   gem 'countloc', '~> 0.4.0', :platforms => :mri, :require => false
   gem 'yard', '~> 0.8.7.6', :require => false
+  # TODO (pitr-ch 15-Oct-2016): does not work on 1.9.3 anymore
   gem 'inch', '~> 0.6.3', :platforms => :mri, :require => false
   gem 'redcarpet', '~> 3.3.2', platforms: :mri # understands github markdown
 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

lib/concurrent/utility/engine.rb

@@ -8,7 +8,7 @@ def on_jruby?
       end
 
       def on_jruby_9000?
-        on_jruby? && 0 == (JRUBY_VERSION =~ /^9\.0\.0\.0/)
+        on_jruby? && ruby_version(:>=, 9, 0, 0, JRUBY_VERSION)
       end
 
       def on_cruby?
@@ -39,8 +39,8 @@ def ruby_engine
         defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
       end
 
-      def ruby_version(comparison, major, minor = 0, patch = 0)
-        result      = (RUBY_VERSION.split('.').map(&:to_i) <=> [major, minor, patch])
+      def ruby_version(comparison, major, minor, patch, version = RUBY_VERSION)
+        result      = (version.split('.').map(&:to_i) <=> [major, minor, patch])
         comparisons = { :== => [0],
                         :>= => [1, 0],
                         :<= => [-1, 0],

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