From e77a72d3902f088bedef9e20908464da883e3c8c Mon Sep 17 00:00:00 2001 From: Lucas Amorim Date: Thu, 20 Oct 2016 13:02:15 -0700 Subject: [PATCH 1/2] Adds support to ruby 2.3 --- .travis.yml | 2 ++ redis_failover.gemspec | 2 +- spec/client_spec.rb | 8 ++++---- spec/util_spec.rb | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 389dd55..c51c16d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,5 @@ rvm: - jruby-19mode - 2.1.0 - 2.0.0 + - 2.2.5 + - 2.3.0 diff --git a/redis_failover.gemspec b/redis_failover.gemspec index 40c2d0b..8d1af8f 100644 --- a/redis_failover.gemspec +++ b/redis_failover.gemspec @@ -21,6 +21,6 @@ Gem::Specification.new do |gem| gem.add_dependency('zk', ['>= 1.7.4', '< 1.8']) gem.add_development_dependency('rake') - gem.add_development_dependency('rspec') + gem.add_development_dependency('rspec', '~> 3') gem.add_development_dependency('yard') end diff --git a/spec/client_spec.rb b/spec/client_spec.rb index df72244..58b146b 100644 --- a/spec/client_spec.rb +++ b/spec/client_spec.rb @@ -52,7 +52,7 @@ def setup_zk called = true end client.del('foo') - called.should be_true + called.should be_truthy end describe '#inspect' do @@ -82,7 +82,7 @@ def setup_zk called = true end client.get('foo') - called.should be_true + called.should be_truthy end end @@ -94,7 +94,7 @@ def setup_zk called = true end client.get('foo') - called.should be_true + called.should be_truthy end end @@ -118,7 +118,7 @@ def fetch_nodes client.current_master.make_unavailable! client.del('foo') - client.reconnected.should be_true + client.reconnected.should be_truthy end context 'with :verify_role true' do diff --git a/spec/util_spec.rb b/spec/util_spec.rb index 0a7a641..cba3166 100644 --- a/spec/util_spec.rb +++ b/spec/util_spec.rb @@ -10,11 +10,11 @@ module RedisFailover describe '.different?' do it 'handles different arrays' do - Util.different?([1,2,3], [1,5,3]).should be_true + Util.different?([1,2,3], [1,5,3]).should be_truthy end it 'handles non-different arrays' do - Util.different?([1,2,3], [3,2,1]).should be_false + Util.different?([1,2,3], [3,2,1]).should be_falsey end end end From db5f7c34bb2b9ba18c042a14b34ab4e67e286ed4 Mon Sep 17 00:00:00 2001 From: Lucas Amorim Date: Thu, 20 Oct 2016 13:27:07 -0700 Subject: [PATCH 2/2] Removes ruby 1.9 and jruby-1.7 from travis --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c51c16d..a3bab7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: ruby rvm: - - 1.9.2 - - 1.9.3 - - jruby-19mode + - jruby-9.0.5.0 - 2.1.0 - 2.0.0 - 2.2.5