bundle update

rpush · May 24, 2015 · 0a3091d · 0a3091d
1 parent 43a6ef4
commit 0a3091d
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 78 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.2.1
+ruby-2.2.2
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -41,19 +41,19 @@ GEM
       activemodel (= 4.2.1)
       activesupport (= 4.2.1)
       arel (~> 6.0)
-    activerecord-jdbc-adapter (1.3.15)
+    activerecord-jdbc-adapter (1.3.16)
       activerecord (>= 2.2)
-    activerecord-jdbch2-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
-      jdbc-h2 (~> 1.3.0)
-    activerecord-jdbcmysql-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
+    activerecord-jdbch2-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
+      jdbc-h2 (~> 1.3)
+    activerecord-jdbcmysql-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
       jdbc-mysql (>= 5.1.22)
-    activerecord-jdbcpostgresql-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
+    activerecord-jdbcpostgresql-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
+    activerecord-jdbcsqlite3-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
     activesupport (4.2.1)
       i18n (~> 0.7)
@@ -73,31 +73,30 @@ GEM
       parallel
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
-    connection_pool (2.1.3)
+    connection_pool (2.2.0)
     database_cleaner (1.4.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    globalid (0.3.3)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
     hiredis (0.6.0)
     hiredis (0.6.0-java)
     i18n (0.7.0)
-    jdbc-h2 (1.3.175)
-    jdbc-mysql (5.1.33)
+    jdbc-h2 (1.4.187)
+    jdbc-mysql (5.1.35)
     jdbc-postgres (9.4.1200)
-    jdbc-sqlite3 (3.8.7)
-    jruby-openssl (0.9.6-java)
+    jdbc-sqlite3 (3.8.10.1)
+    jruby-openssl (0.9.7-java)
     json (1.8.2)
     json (1.8.2-java)
-    loofah (2.0.1)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
+    mime-types (2.5)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.6.1)
     modis (1.4.1)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
@@ -123,7 +122,7 @@ GEM
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    msgpack (0.5.11)
+    msgpack (0.5.12)
     msgpack-jruby (1.4.1-java)
     multi_json (1.11.0)
     mysql2 (0.3.18)
@@ -134,11 +133,11 @@ GEM
     optionable (0.2.0)
     origin (2.1.1)
     parallel (1.4.1)
-    parser (2.2.0.3)
+    parser (2.2.2.3)
       ast (>= 1.1, < 3.0)
-    pg (0.18.1)
-    powerpack (0.1.0)
-    rack (1.6.0)
+    pg (0.18.2)
+    powerpack (0.1.1)
+    rack (1.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.1)
@@ -177,33 +176,30 @@ GEM
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    rubocop (0.29.1)
+    rubocop (0.31.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+      parser (>= 2.2.2.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
-    simplecov (0.9.2)
+    ruby-progressbar (1.7.5)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sprockets (3.1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -212,7 +208,6 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
-    tilt (1.4.1)
     timecop (0.7.3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

diff --git a/Gemfile.rails-3.lock b/Gemfile.rails-3.lock
@@ -33,19 +33,19 @@ GEM
       activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.3.15)
+    activerecord-jdbc-adapter (1.3.16)
       activerecord (>= 2.2)
-    activerecord-jdbch2-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
-      jdbc-h2 (~> 1.3.0)
-    activerecord-jdbcmysql-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
+    activerecord-jdbch2-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
+      jdbc-h2 (~> 1.3)
+    activerecord-jdbcmysql-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
       jdbc-mysql (>= 5.1.22)
-    activerecord-jdbcpostgresql-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
+    activerecord-jdbcpostgresql-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
+    activerecord-jdbcsqlite3-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
     activeresource (3.2.21)
       activemodel (= 3.2.21)
@@ -59,14 +59,14 @@ GEM
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.0.4)
-    byebug (4.0.3)
+    byebug (5.0.0)
       columnize (= 0.9.0)
     cane (2.6.2)
       parallel
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     columnize (0.9.0)
-    connection_pool (2.1.3)
+    connection_pool (2.2.0)
     database_cleaner (1.4.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -75,14 +75,13 @@ GEM
     hiredis (0.6.0)
     hiredis (0.6.0-java)
     i18n (0.7.0)
-    jdbc-h2 (1.3.175)
-    jdbc-mysql (5.1.33)
+    jdbc-h2 (1.4.187)
+    jdbc-mysql (5.1.35)
     jdbc-postgres (9.4.1200)
-    jdbc-sqlite3 (3.8.7)
+    jdbc-sqlite3 (3.8.10.1)
     journey (1.0.4)
-    jruby-openssl (0.9.6-java)
+    jruby-openssl (0.9.7-java)
     json (1.8.2)
-    json (1.8.2-java)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -101,17 +100,17 @@ GEM
       hiredis (>= 0.5)
       msgpack-jruby
       redis (>= 3.0)
-    msgpack (0.5.11)
+    msgpack (0.5.12)
     msgpack-jruby (1.4.1-java)
     multi_json (1.11.0)
     mysql2 (0.3.18)
     net-http-persistent (2.9.4)
     parallel (1.4.1)
-    parser (2.2.0.3)
+    parser (2.2.2.3)
       ast (>= 1.1, < 3.0)
-    pg (0.18.1)
+    pg (0.18.2)
     polyglot (0.3.5)
-    powerpack (0.1.0)
+    powerpack (0.1.1)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -145,27 +144,27 @@ GEM
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    rubocop (0.29.1)
+    rubocop (0.31.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+      parser (>= 2.2.2.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
-    simplecov (0.9.2)
+    ruby-progressbar (1.7.5)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -178,7 +177,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.43)
+    tzinfo (0.3.44)
 
 PLATFORMS
   java

diff --git a/spec/functional_spec_helper.rb b/spec/functional_spec_helper.rb
@@ -4,7 +4,7 @@
 DatabaseCleaner.strategy = :truncation
 
 def functional_example?(metadata)
-  metadata[:file_path] =~ /spec\/functional/
+  metadata[:file_path] =~ %r{/spec/functional/}
 end
 
 def timeout(&blk)

diff --git a/spec/support/active_record_setup.rb b/spec/support/active_record_setup.rb
@@ -33,7 +33,7 @@
 migrations = [AddRpush, Rpush200Updates, Rpush210Updates]
 
 unless ENV['TRAVIS']
-  migrations.reverse.each do |m|
+  migrations.reverse_each do |m|
     begin
       m.down
     rescue ActiveRecord::StatementInvalid => e

diff --git a/spec/unit/client/active_record/apns/notification_spec.rb b/spec/unit/client/active_record/apns/notification_spec.rb
@@ -217,7 +217,7 @@
 
   it 'does confuse a JSON looking string as JSON if the alert_is_json attribute is not present' do
     notification = Rpush::Client::ActiveRecord::Apns::Notification.new
-    allow(notification).to receive_messages(:has_attribute? => false)
+    allow(notification).to receive_messages(has_attribute?: false)
     notification.alert = "{\"one\":2}"
     expect(notification.alert).to eq('one' => 2)
   end

diff --git a/spec/unit/logger_spec.rb b/spec/unit/logger_spec.rb
@@ -58,14 +58,14 @@ module Rails
 
   it 'uses ActiveSupport::Logger if BufferedLogger does not exist' do
     stub_const('ActiveSupport::Logger', double)
-    allow(ActiveSupport).to receive_messages(:const_defined? => false)
+    allow(ActiveSupport).to receive_messages(const_defined?: false)
     expect(ActiveSupport::Logger).to receive(:new).with(log).and_return(log)
     Rpush::Logger.new
   end
 
   it 'sets the log level on the logger' do
     stub_const('ActiveSupport::Logger', double)
-    allow(ActiveSupport).to receive_messages(:const_defined? => false)
+    allow(ActiveSupport).to receive_messages(const_defined?: false)
     expect(ActiveSupport::Logger).to receive(:new).with(log).and_return(log)
     Rpush.config.log_level = ::Logger::Severity::ERROR
     expect(log).to receive(:level=).with(::Logger::Severity::ERROR)

diff --git a/spec/unit_spec_helper.rb b/spec/unit_spec_helper.rb
@@ -2,7 +2,7 @@
 require 'rails'
 
 def unit_example?(metadata)
-  metadata[:file_path] =~ /spec\/unit/
+  metadata[:file_path] =~ %r{spec/unit}
 end
 
 def rails4?