update gems to prevent oauth redirect loop of death

play · Mar 29, 2013 · b2912e3 · b2912e3
1 parent f0b04c0
commit b2912e3
Show file tree

Hide file tree

Showing 25 changed files with 19 additions and 30 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem 'mustache',      '~>0.99.4'
 gem "SystemTimer",   "~>1.2.3", :platforms => [:mri_18]
 gem 'yajl-ruby'
 gem 'redis'
-gem 'sinatra_auth_github', '~>0.8.2'
+gem 'sinatra_auth_github', '~>0.13.3'
 gem 'sprockets'
 gem 'sass',          '~>3.1'
 gem 'coffee-script'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    addressable (2.2.8)
+    addressable (2.3.3)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -11,32 +11,29 @@ GEM
     eventmachine (0.12.10)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    faraday (0.8.1)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
-    faraday_middleware (0.8.8)
+    faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     foreman (0.39.0)
       term-ansicolor (~> 1.0.7)
       thor (>= 0.13.6)
-    hashie (1.2.0)
+    hashie (2.0.3)
     hike (1.2.1)
-    json (1.7.3)
     metaclass (0.0.1)
-    mime-types (1.18)
     mocha (0.11.1)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
-    multipart-post (1.1.5)
+    multipart-post (1.2.0)
     mustache (0.99.4)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
-    octokit (1.4.0)
+    netrc (0.7.7)
+    octokit (1.24.0)
       addressable (~> 2.2)
       faraday (~> 0.8)
-      faraday_middleware (~> 0.8)
-      hashie (~> 1.2)
+      faraday_middleware (~> 0.9)
+      hashie (~> 2.0)
       multi_json (~> 1.3)
+      netrc (~> 0.7.7)
     pusher (0.9.2)
       multi_json (~> 1.0)
       ruby-hmac (~> 0.4.0)
@@ -49,8 +46,6 @@ GEM
     rake (0.9.2.2)
     rb-appscript (0.6.1)
     redis (2.2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     ruby-hmac (0.4.0)
     sass (3.1.12)
     shotgun (0.9)
@@ -61,11 +56,9 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sinatra_auth_github (0.8.2)
-      rest-client (~> 1.6.1)
+    sinatra_auth_github (0.13.3)
       sinatra (~> 1.0)
-      warden-github (~> 0.8.2)
-      yajl-ruby (~> 1.1)
+      warden-github (~> 0.13.1)
     sprockets (2.3.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -80,13 +73,9 @@ GEM
     tilt (1.3.3)
     warden (1.2.1)
       rack (>= 1.0)
-    warden-github (0.8.2)
-      json (~> 1.5)
-      oauth2 (~> 0.5.2)
-      octokit (~> 1.4.0)
-      rest-client (~> 1.6.1)
-      warden (~> 1.0)
-      yajl-ruby (~> 1.1)
+    warden-github (0.13.2)
+      octokit (>= 1.22.0)
+      warden (> 1.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -107,7 +96,7 @@ DEPENDENCIES
   sass (~> 3.1)
   shotgun
   sinatra
-  sinatra_auth_github (~> 0.8.2)
+  sinatra_auth_github (~> 0.13.3)
   sprockets
   thin
   yajl-ruby
diff --git a/app/app.rb b/app/app.rb
@@ -40,7 +40,7 @@ class Octobouncer < Sinatra::Base
                             :client_id => Play.config.client_id,
                             :failure_app => Octobouncer,
                             :organization => Play.config.gh_org,
-                            :github_scopes => 'user,offline_access'
+                            :scopes => 'user,offline_access'
                          }
 
     Pusher.app_id =  Play.config.pusher_app_id

diff --git a/script/realtime b/script/realtime
@@ -6,7 +6,7 @@
 
 $PROGRAM_NAME = 'play [realtime-daemon]'
 
-require 'app/boot'
+#require 'app/boot'
 
 class Realtime
   def initialize

diff --git a/vendor/cache/addressable-2.2.8.gem b/vendor/cache/addressable-2.2.8.gem
diff --git a/vendor/cache/addressable-2.3.3.gem b/vendor/cache/addressable-2.3.3.gem
diff --git a/vendor/cache/faraday-0.8.1.gem b/vendor/cache/faraday-0.8.1.gem
diff --git a/vendor/cache/faraday-0.8.7.gem b/vendor/cache/faraday-0.8.7.gem
diff --git a/vendor/cache/faraday_middleware-0.8.8.gem b/vendor/cache/faraday_middleware-0.8.8.gem
diff --git a/vendor/cache/faraday_middleware-0.9.0.gem b/vendor/cache/faraday_middleware-0.9.0.gem
diff --git a/vendor/cache/hashie-1.2.0.gem b/vendor/cache/hashie-1.2.0.gem
diff --git a/vendor/cache/hashie-2.0.3.gem b/vendor/cache/hashie-2.0.3.gem
diff --git a/vendor/cache/json-1.7.3.gem b/vendor/cache/json-1.7.3.gem
diff --git a/vendor/cache/mime-types-1.18.gem b/vendor/cache/mime-types-1.18.gem
diff --git a/vendor/cache/multipart-post-1.1.5.gem b/vendor/cache/multipart-post-1.1.5.gem
diff --git a/vendor/cache/multipart-post-1.2.0.gem b/vendor/cache/multipart-post-1.2.0.gem
diff --git a/vendor/cache/netrc-0.7.7.gem b/vendor/cache/netrc-0.7.7.gem
diff --git a/vendor/cache/oauth2-0.5.2.gem b/vendor/cache/oauth2-0.5.2.gem
diff --git a/vendor/cache/octokit-1.24.0.gem b/vendor/cache/octokit-1.24.0.gem
diff --git a/vendor/cache/octokit-1.4.0.gem b/vendor/cache/octokit-1.4.0.gem
diff --git a/vendor/cache/rest-client-1.6.7.gem b/vendor/cache/rest-client-1.6.7.gem
diff --git a/vendor/cache/sinatra_auth_github-0.13.3.gem b/vendor/cache/sinatra_auth_github-0.13.3.gem
diff --git a/vendor/cache/sinatra_auth_github-0.8.2.gem b/vendor/cache/sinatra_auth_github-0.8.2.gem
diff --git a/vendor/cache/warden-github-0.13.2.gem b/vendor/cache/warden-github-0.13.2.gem
diff --git a/vendor/cache/warden-github-0.8.2.gem b/vendor/cache/warden-github-0.8.2.gem