From 2958c0f9f43caa80e93da9c0698da96bb60d3f64 Mon Sep 17 00:00:00 2001 From: Tim Bellefleur Date: Fri, 6 Jan 2017 02:20:39 -0800 Subject: [PATCH 1/6] Fix Ruby 2.4 deprecation error To avoid compatibility issues, use 0.class instead of Fixnum or Integer. --- lib/thread_safe/cache.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/thread_safe/cache.rb b/lib/thread_safe/cache.rb index 109cb98..265c0e5 100644 --- a/lib/thread_safe/cache.rb +++ b/lib/thread_safe/cache.rb @@ -150,8 +150,8 @@ def populate_from(hash) end def validate_options_hash!(options) - if (initial_capacity = options[:initial_capacity]) && (!initial_capacity.kind_of?(Fixnum) || initial_capacity < 0) - raise ArgumentError, ":initial_capacity must be a positive Fixnum" + if (initial_capacity = options[:initial_capacity]) && (!initial_capacity.kind_of?(0.class) || initial_capacity < 0) + raise ArgumentError, ":initial_capacity must be a positive #{0.class}" end if (load_factor = options[:load_factor]) && (!load_factor.kind_of?(Numeric) || load_factor <= 0 || load_factor > 1) raise ArgumentError, ":load_factor must be a number between 0 and 1" From 3f0c8a3415cbd527bc3eea00b43dce6ed5545939 Mon Sep 17 00:00:00 2001 From: Tim Bellefleur Date: Fri, 6 Jan 2017 02:29:04 -0800 Subject: [PATCH 2/6] Fix rake dev dependency eror by limiting version to < 12.0 Reason: `last_comment` was removed in 12.0 --- thread_safe.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thread_safe.gemspec b/thread_safe.gemspec index 5e6aba1..cf3faeb 100644 --- a/thread_safe.gemspec +++ b/thread_safe.gemspec @@ -21,6 +21,6 @@ Gem::Specification.new do |gem| gem.license = "Apache-2.0" gem.add_development_dependency 'atomic', '= 1.1.16' - gem.add_development_dependency 'rake' + gem.add_development_dependency 'rake', '< 12.0' gem.add_development_dependency 'rspec', '~> 3.2' end From 4f5d1fbf631f8ca54d9539248b7fa067a8c16833 Mon Sep 17 00:00:00 2001 From: Tim Bellefleur Date: Fri, 6 Jan 2017 02:40:35 -0800 Subject: [PATCH 3/6] Fix tins dev dependency error by limiting version to 1.9-compatible one. tins is a dependency of coveralls via term-ansicolor. --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 2ad2b76..e5cb94c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ gemspec group :development, :test do gem 'rspec', '~> 3.2.0' gem 'simplecov', '~> 0.9.2', :require => false + gem 'tins', '~> 1.10.2', :require => false gem 'coveralls', '~> 0.7.11', :require => false end From b6cce84bc489fe7e533bfd3dc5751c50cb6af2df Mon Sep 17 00:00:00 2001 From: Tim Bellefleur Date: Fri, 6 Jan 2017 02:42:08 -0800 Subject: [PATCH 4/6] Add Ruby 2.3 and 2.4 to CI tests. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c98d274..a4d0be7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: ruby rvm: + - 2.4.0 + - 2.3.3 - 2.2.0 - 2.1.5 - 2.1.4 From a5b3ccbd794920d119f21b23d55740c78c0a9876 Mon Sep 17 00:00:00 2001 From: Tim Bellefleur Date: Fri, 6 Jan 2017 02:43:44 -0800 Subject: [PATCH 5/6] Exclude JDK from 2.4 and 2.3 CI tests. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index a4d0be7..5d4d0bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,12 @@ jdk: # for JRuby only - oraclejdk8 matrix: exclude: + - rvm: 2.4.0 + jdk: openjdk7 + jdk: oraclejdk8 + - rvm: 2.3.3 + jdk: openjdk7 + jdk: oraclejdk8 - rvm: 2.2.0 jdk: openjdk7 jdk: oraclejdk8 From fe634920d1b182fdb951176300455db6f0eac9e6 Mon Sep 17 00:00:00 2001 From: Tim Bellefleur Date: Fri, 6 Jan 2017 02:54:24 -0800 Subject: [PATCH 6/6] Run CI rake tests through bundler. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5d4d0bb..d696151 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,4 +48,4 @@ matrix: - rvm: jruby-head - rvm: 1.9.3 -script: "rake test" +script: "bundle exec rake test"