Upgrade oauth2 to 0.6.0. All tests that passed before are still passing.

overflow-tm · Jun 13, 2012 · 7cb29aa · 7cb29aa
1 parent a1b365b
commit 7cb29aa
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 51 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source :rubygems
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.5.1"
+gem 'oauth2', "~> 0.6.0"
 gem 'bcrypt-ruby', "~> 3.0.0"
 
 # Add dependencies to develop your gem here.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,7 +28,6 @@ GEM
     activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.7)
     archive-tar-minitar (0.5.2)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
@@ -46,13 +45,12 @@ GEM
     columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
     ffi (1.0.11)
     git (1.2.5)
     hike (1.2.1)
+    httpauth (0.1)
     i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
@@ -82,9 +80,10 @@ GEM
     multipart-post (1.1.5)
     nokogiri (1.5.2)
     oauth (0.4.5)
-    oauth2 (0.5.2)
+    oauth2 (0.6.1)
       faraday (~> 0.7)
-      multi_json (~> 1.0)
+      httpauth (~> 0.1)
+      multi_json (~> 1.3)
     plucky (0.4.4)
       mongo (~> 1.5)
     polyglot (0.3.3)
@@ -176,7 +175,7 @@ DEPENDENCIES
   mongo_mapper
   mongoid (~> 2.4.4)
   oauth (~> 0.4.4)
-  oauth2 (~> 0.5.1)
+  oauth2 (~> 0.6.0)
   rails (>= 3.0.0)
   rspec (~> 2.5.0)
   rspec-rails (~> 2.5.0)

diff --git a/sorcery.gemspec b/sorcery.gemspec
@@ -310,7 +310,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.1"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.6.0"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<json>, [">= 1.5.1"])
@@ -328,7 +328,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mongoid>, ["~> 2.4.4"])
     else
       s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+      s.add_dependency(%q<oauth2>, ["~> 0.6.0"])
       s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<json>, [">= 1.5.1"])
@@ -347,7 +347,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+    s.add_dependency(%q<oauth2>, ["~> 0.6.0"])
     s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<json>, [">= 1.5.1"])

diff --git a/spec/Gemfile b/spec/Gemfile
@@ -4,7 +4,7 @@ gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
 gem "sorcery", '>= 0.1.0', :path => '../'
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.5.1"
+gem 'oauth2', "~> 0.6.0"
 group :development do
   gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'

diff --git a/spec/Gemfile.lock b/spec/Gemfile.lock
@@ -1,12 +1,10 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.7.10)
+    sorcery (0.7.12)
       bcrypt-ruby (~> 3.0.0)
-      bundler (>= 1.1.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      sorcery
+      oauth2 (~> 0.6.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,7 +36,6 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.7)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
@@ -47,10 +44,9 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
+    httpauth (0.1)
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -63,8 +59,9 @@ GEM
     multi_json (1.1.0)
     multipart-post (1.1.5)
     oauth (0.4.5)
-    oauth2 (0.5.2)
+    oauth2 (0.6.0)
       faraday (~> 0.7)
+      httpauth (~> 0.1)
       multi_json (~> 1.0)
     polyglot (0.3.3)
     rack (1.2.5)
@@ -120,7 +117,7 @@ PLATFORMS
 DEPENDENCIES
   bcrypt-ruby
   oauth (~> 0.4.4)
-  oauth2 (~> 0.5.1)
+  oauth2 (~> 0.6.0)
   rails (= 3.0.3)
   rspec (~> 2.5.0)
   ruby-debug19

diff --git a/spec/rails3/Gemfile.lock b/spec/rails3/Gemfile.lock
@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.10)
+    sorcery (0.7.12)
       bcrypt-ruby (~> 3.0.0)
-      bundler (>= 1.1.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      sorcery
+      oauth2 (~> 0.6.0)
 
 GEM
   remote: http://rubygems.org/
@@ -56,11 +54,10 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
     ffi (1.0.11)
+    httpauth (0.1)
     i18n (0.6.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
@@ -75,9 +72,10 @@ GEM
     multi_json (1.1.0)
     multipart-post (1.1.5)
     nokogiri (1.5.0)
-    oauth (0.4.5)
-    oauth2 (0.5.2)
+    oauth (0.4.6)
+    oauth2 (0.6.0)
       faraday (~> 0.7)
+      httpauth (~> 0.1)
       multi_json (~> 1.0)
     polyglot (0.3.3)
     rack (1.2.5)

diff --git a/spec/rails3_mongo_mapper/Gemfile.lock b/spec/rails3_mongo_mapper/Gemfile.lock
@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.10)
+    sorcery (0.7.12)
       bcrypt-ruby (~> 3.0.0)
-      bundler (>= 1.1.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      sorcery
+      oauth2 (~> 0.6.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,7 +36,6 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.7)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
@@ -51,10 +48,9 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
+    httpauth (0.1)
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -73,9 +69,10 @@ GEM
       plucky (~> 0.4.0)
     multi_json (1.1.0)
     multipart-post (1.1.5)
-    oauth (0.4.5)
-    oauth2 (0.5.2)
+    oauth (0.4.6)
+    oauth2 (0.6.0)
       faraday (~> 0.7)
+      httpauth (~> 0.1)
       multi_json (~> 1.0)
     plucky (0.4.4)
       mongo (~> 1.5)

diff --git a/spec/rails3_mongoid/Gemfile.lock b/spec/rails3_mongoid/Gemfile.lock
@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.10)
+    sorcery (0.7.12)
       bcrypt-ruby (~> 3.0.0)
-      bundler (>= 1.1.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      sorcery
+      oauth2 (~> 0.6.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,7 +36,6 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.7)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
@@ -50,10 +47,9 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
+    httpauth (0.1)
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -71,9 +67,10 @@ GEM
       tzinfo (~> 0.3.22)
     multi_json (1.1.0)
     multipart-post (1.1.5)
-    oauth (0.4.5)
-    oauth2 (0.5.2)
+    oauth (0.4.6)
+    oauth2 (0.6.0)
       faraday (~> 0.7)
+      httpauth (~> 0.1)
       multi_json (~> 1.0)
     polyglot (0.3.3)
     rack (1.2.5)