update gems

MakeYourLaws · Mar 26, 2015 · 43f2854 · 43f2854
1 parent eb7f4b7
commit 43f2854
Show file tree

Hide file tree

Showing 36 changed files with 44 additions and 43 deletions.
diff --git a/Gemfile b/Gemfile
@@ -33,7 +33,9 @@ source 'https://rubygems.org' do
   #    /active_merchant/billing/gateways/paypal_adaptive_payments/ext.rb:7
   # Haven't diagnosed why. Works fine without.
 
-  gem 'hashie_rails'  # see https://github.com/intridea/hashie/blob/master/UPGRADING.md
+  gem 'hashie-forbidden_attributes'
+  # moved from hashie-rails
+  # see https://github.com/intridea/hashie/blob/master/UPGRADING.md
 
   gem 'redis-rails' # switching out for dalli/memcached
   gem "redis-rack-cache"
@@ -155,7 +157,9 @@ source 'https://rubygems.org' do
   gem 'amazon_flex_pay'
 
   gem 'bitpay-client', '>= 2.0.1', :require => 'bitpay'
-  gem 'coinbase', ">= 2.1.1"
+  # FIXME: pending gem bump https://github.com/coinbase/coinbase-ruby/issues/63
+  gem 'coinbase', ">= 2.1.1" #, github: 'coinbase/coinbase-ruby', branch: 'v3'
+  # omniauth-coinbase depends on coinbase ~>2.0
 
   gem "devise"#, ">= 3.1.1"
   gem "devise-encryptable"#, ">= 0.1.1c"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,17 +4,17 @@ GEM
   specs:
     Empact-activerecord-import (0.4.3)
       activerecord (>= 3.0.0)
-    actionmailer (4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
+    actionmailer (4.1.10)
+      actionpack (= 4.1.10)
+      actionview (= 4.1.10)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.9)
-      actionview (= 4.1.9)
-      activesupport (= 4.1.9)
+    actionpack (4.1.10)
+      actionview (= 4.1.10)
+      activesupport (= 4.1.10)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.9)
-      activesupport (= 4.1.9)
+    actionview (4.1.10)
+      activesupport (= 4.1.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     active_paypal_adaptive_payment (0.3.16)
@@ -31,14 +31,14 @@ GEM
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (4.1.9)
-      activesupport (= 4.1.9)
+    activemodel (4.1.10)
+      activesupport (= 4.1.10)
       builder (~> 3.1)
-    activerecord (4.1.9)
-      activemodel (= 4.1.9)
-      activesupport (= 4.1.9)
+    activerecord (4.1.10)
+      activemodel (= 4.1.10)
+      activesupport (= 4.1.10)
       arel (~> 5.0.0)
-    activesupport (4.1.9)
+    activesupport (4.1.10)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -96,9 +96,8 @@ GEM
     bundler-audit (0.3.1)
       bundler (~> 1.2)
       thor (~> 0.18)
-    byebug (4.0.1)
+    byebug (4.0.3)
       columnize (= 0.9.0)
-      rb-readline (= 0.5.2)
     cancancan (1.10.1)
     capistrano (3.4.0)
       i18n
@@ -168,7 +167,7 @@ GEM
     diff-lcs (1.2.5)
     diffy (3.0.7)
     ecdsa (1.2.0)
-    equalizer (0.0.9)
+    equalizer (0.0.11)
     erubis (2.7.0)
     ethon (0.7.3)
       ffi (>= 1.3.0)
@@ -191,12 +190,11 @@ GEM
     haml (4.0.6)
       tilt
     hashie (3.4.0)
-    hashie_rails (0.0.2)
-      activesupport (~> 4.0)
+    hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
     highline (1.6.21)
     hike (1.2.3)
-    http (0.6.3)
+    http (0.6.4)
       http_parser.rb (~> 0.6.0)
     http_parser.rb (0.6.0)
     httparty (0.13.3)
@@ -206,7 +204,7 @@ GEM
     interception (0.5)
     it (0.2.5)
       actionpack (>= 3.0.0)
-    jbuilder (2.2.11)
+    jbuilder (2.2.12)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.2)
@@ -257,7 +255,7 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
-    newrelic_rpm (3.10.0.279)
+    newrelic_rpm (3.11.1.284)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oauth (0.4.7)
@@ -361,26 +359,25 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-tor-tag (0.2.1)
-    rails (4.1.9)
-      actionmailer (= 4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
-      activemodel (= 4.1.9)
-      activerecord (= 4.1.9)
-      activesupport (= 4.1.9)
+    rails (4.1.10)
+      actionmailer (= 4.1.10)
+      actionpack (= 4.1.10)
+      actionview (= 4.1.10)
+      activemodel (= 4.1.10)
+      activerecord (= 4.1.10)
+      activesupport (= 4.1.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.9)
+      railties (= 4.1.10)
       sprockets-rails (~> 2.0)
     rails_email_validator (0.1.4)
       activemodel (>= 3.0.0)
-    railties (4.1.9)
-      actionpack (= 4.1.9)
-      activesupport (= 4.1.9)
+    railties (4.1.10)
+      actionpack (= 4.1.10)
+      activesupport (= 4.1.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.4.2)
-    rb-readline (0.5.2)
     rdoc (4.2.0)
       json (~> 1.4)
     redis (3.2.1)
@@ -437,7 +434,7 @@ GEM
       rufus-scheduler (~> 3.0)
     resque_mailer (2.2.7)
       actionmailer (>= 3.0)
-    resqued (0.7.12)
+    resqued (0.7.13)
       kgio (~> 2.6)
       mono_logger (~> 1.0)
       resque (>= 1.9.1)
@@ -472,7 +469,7 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-openid (2.7.0)
     ruby-prof (0.15.6)
-    ruby-progressbar (1.7.1)
+    ruby-progressbar (1.7.5)
     ruby2ruby (2.1.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
@@ -691,10 +688,10 @@ GEM
       rdoc (~> 4.0)
     sexp_processor (4.5.0)
     simple_oauth (0.3.1)
-    sinatra (1.4.5)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     slop (3.6.0)
     spring (1.3.3)
     sprockets (2.12.3)
@@ -798,7 +795,7 @@ DEPENDENCIES
   ffi!
   friendly_id!
   groupdate!
-  hashie_rails!
+  hashie-forbidden_attributes!
   it!
   jbuilder!
   jquery-rails!

diff --git a/bin/rails b/bin/rails
@@ -3,6 +3,6 @@ begin
   load File.expand_path("../spring", __FILE__)
 rescue LoadError
 end
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/spring b/bin/spring
@@ -8,7 +8,7 @@ unless defined?(Spring)
   require "bundler"
 
   if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
-    Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s }
+    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
     gem "spring", match[1]
     require "spring/binstub"
   end

diff --git a/vendor/cache/actionmailer-4.1.10.gem b/vendor/cache/actionmailer-4.1.10.gem
diff --git a/vendor/cache/actionmailer-4.1.9.gem b/vendor/cache/actionmailer-4.1.9.gem
diff --git a/vendor/cache/actionpack-4.1.10.gem b/vendor/cache/actionpack-4.1.10.gem
diff --git a/vendor/cache/actionpack-4.1.9.gem b/vendor/cache/actionpack-4.1.9.gem
diff --git a/vendor/cache/actionview-4.1.10.gem b/vendor/cache/actionview-4.1.10.gem
diff --git a/vendor/cache/actionview-4.1.9.gem b/vendor/cache/actionview-4.1.9.gem
diff --git a/vendor/cache/activemodel-4.1.10.gem b/vendor/cache/activemodel-4.1.10.gem
diff --git a/vendor/cache/activemodel-4.1.9.gem b/vendor/cache/activemodel-4.1.9.gem
diff --git a/vendor/cache/activerecord-4.1.10.gem b/vendor/cache/activerecord-4.1.10.gem
diff --git a/vendor/cache/activerecord-4.1.9.gem b/vendor/cache/activerecord-4.1.9.gem
diff --git a/vendor/cache/activesupport-4.1.10.gem b/vendor/cache/activesupport-4.1.10.gem
diff --git a/vendor/cache/activesupport-4.1.9.gem b/vendor/cache/activesupport-4.1.9.gem
diff --git a/vendor/cache/equalizer-0.0.11.gem b/vendor/cache/equalizer-0.0.11.gem
diff --git a/vendor/cache/equalizer-0.0.9.gem b/vendor/cache/equalizer-0.0.9.gem
diff --git a/vendor/cache/hashie-forbidden_attributes-0.1.1.gem b/vendor/cache/hashie-forbidden_attributes-0.1.1.gem
diff --git a/vendor/cache/hashie_rails-0.0.2.gem b/vendor/cache/hashie_rails-0.0.2.gem
diff --git a/vendor/cache/http-0.6.3.gem b/vendor/cache/http-0.6.3.gem
diff --git a/vendor/cache/http-0.6.4.gem b/vendor/cache/http-0.6.4.gem
diff --git a/vendor/cache/jbuilder-2.2.11.gem b/vendor/cache/jbuilder-2.2.11.gem
diff --git a/vendor/cache/jbuilder-2.2.12.gem b/vendor/cache/jbuilder-2.2.12.gem
diff --git a/vendor/cache/newrelic_rpm-3.10.0.279.gem b/vendor/cache/newrelic_rpm-3.10.0.279.gem
diff --git a/vendor/cache/newrelic_rpm-3.11.1.284.gem b/vendor/cache/newrelic_rpm-3.11.1.284.gem
diff --git a/vendor/cache/rails-4.1.10.gem b/vendor/cache/rails-4.1.10.gem
diff --git a/vendor/cache/rails-4.1.9.gem b/vendor/cache/rails-4.1.9.gem
diff --git a/vendor/cache/railties-4.1.10.gem b/vendor/cache/railties-4.1.10.gem
diff --git a/vendor/cache/railties-4.1.9.gem b/vendor/cache/railties-4.1.9.gem
diff --git a/vendor/cache/resqued-0.7.12.gem b/vendor/cache/resqued-0.7.12.gem
diff --git a/vendor/cache/resqued-0.7.13.gem b/vendor/cache/resqued-0.7.13.gem
diff --git a/vendor/cache/ruby-progressbar-1.7.1.gem b/vendor/cache/ruby-progressbar-1.7.1.gem
diff --git a/vendor/cache/ruby-progressbar-1.7.5.gem b/vendor/cache/ruby-progressbar-1.7.5.gem
diff --git a/vendor/cache/sinatra-1.4.5.gem b/vendor/cache/sinatra-1.4.5.gem
diff --git a/vendor/cache/sinatra-1.4.6.gem b/vendor/cache/sinatra-1.4.6.gem