Skip to content

Commit

Permalink
update gemfile for ruby 2.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronpk committed Apr 17, 2015
1 parent 1a91ef4 commit 25ec36b
Show file tree
Hide file tree
Showing 5 changed files with 859 additions and 108 deletions.
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -21,6 +21,7 @@ gem 'omniauth-google-oauth2'
gem 'omniauth-twitter'
gem 'omniauth-openid'
gem 'omniauth-lastfm'
gem 'omniauth-eventbrite'
gem 'omniauth-beeminder', :git => 'https://github.com/aaronpk/omniauth-beeminder'

gem 'ruby-openid'
Expand Down
203 changes: 107 additions & 96 deletions Gemfile.lock
Expand Up @@ -8,24 +8,24 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activesupport (4.0.5)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.2.8)
backports (2.7.0)
base32 (0.2.0)
activesupport (4.2.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
backports (3.6.4)
base32 (0.3.2)
builder (3.2.2)
daemons (1.1.9)
dalli (2.6.0)
data_objects (0.10.11)
daemons (1.2.2)
dalli (2.7.4)
data_objects (0.10.15)
addressable (~> 2.1)
dm-aggregates (1.2.0)
dm-core (~> 1.2.0)
dm-core (1.2.0)
addressable (~> 2.2.6)
dm-core (1.2.1)
addressable (~> 2.3)
dm-do-adapter (1.2.0)
data_objects (~> 0.10.6)
dm-core (~> 1.2.0)
Expand All @@ -39,144 +39,154 @@ GEM
dm-core (>= 0.10.1)
dm-timestamps (1.2.0)
dm-core (~> 1.2.0)
do_mysql (0.10.11)
data_objects (= 0.10.11)
domain_name (0.5.7)
unf (~> 0.0.3)
do_mysql (0.10.15)
data_objects (= 0.10.15)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
eventmachine (1.0.0)
faraday (0.8.4)
multipart-post (~> 1.1)
eventmachine (1.0.7)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
google_authenticator_auth (1.0.0)
builder
gpgme (2.0.5)
mini_portile (~> 0.5.0)
hashie (1.2.0)
httparty (0.11.0)
multi_json (~> 1.0)
gpgme (2.0.8)
mini_portile (>= 0.5.0)
hashie (3.4.1)
http-cookie (1.0.2)
domain_name (~> 0.5)
httparty (0.13.3)
json (~> 1.8)
multi_xml (>= 0.5.2)
httpauth (0.2.0)
i18n (0.6.9)
json (1.7.6)
jwt (0.1.5)
multi_json (>= 1.0)
kgio (2.8.0)
mechanize (2.5.1)
i18n (0.7.0)
json (1.8.2)
jwt (1.4.1)
kgio (2.9.3)
mechanize (2.7.3)
domain_name (~> 0.5, >= 0.5.1)
mime-types (~> 1.17, >= 1.17.2)
http-cookie (~> 1.0)
mime-types (~> 2.0)
net-http-digest_auth (~> 1.1, >= 1.1.1)
net-http-persistent (~> 2.5, >= 2.5.2)
nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (~> 0.0, >= 0.0.9)
webrobots (>= 0.0.9, < 0.2)
microformats2 (2.0.1)
activesupport
json
nokogiri
mime-types (1.19)
mini_portile (0.5.3)
minitest (4.7.5)
multi_json (1.5.0)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.6.0)
multi_json (1.11.0)
multi_xml (0.5.5)
multipart-post (1.1.5)
multipart-post (2.0.0)
mysql2 (0.3.7)
net-http-digest_auth (1.2.1)
net-http-persistent (2.8)
nokogiri (1.5.6)
net-http-digest_auth (1.4)
net-http-persistent (2.9.4)
netrc (0.10.3)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
ntlm-http (0.1.1)
oauth (0.4.7)
oauth2 (0.8.0)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
oauth2 (0.9.4)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth-facebook (1.4.1)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-eventbrite (0.0.5)
omniauth-oauth2 (~> 1.1.0)
omniauth-flickr (0.0.11)
omniauth-facebook (1.6.0)
omniauth-oauth2 (~> 1.1)
omniauth-flickr (0.0.18)
multi_json (~> 1.11.0)
omniauth-oauth (~> 1.0)
omniauth-geoloqi (0.1.3)
omniauth-oauth2 (>= 1.0.0)
omniauth-github (1.0.3)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-google-oauth2 (0.1.13)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-lastfm (0.0.5)
omniauth-google-oauth2 (0.2.6)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-lastfm (0.0.6)
omniauth-oauth (~> 1.0)
rest-client (~> 1.6.6)
rest-client (>= 1.6.6, < 1.8)
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
omniauth-oauth2 (1.1.2)
faraday (>= 0.8, < 0.10)
multi_json (~> 1.3)
oauth2 (~> 0.9.3)
omniauth (~> 1.2)
omniauth-openid (1.0.1)
omniauth (~> 1.0)
rack-openid (~> 1.3.1)
omniauth-twitter (0.0.14)
omniauth-twitter (1.1.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
puma (2.7.0)
puma (2.11.2)
rack (>= 1.1, < 2.0)
rack (1.4.4)
rack (1.6.0)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-protection (1.3.2)
rack-protection (1.5.3)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rainbows (4.4.3)
rainbows (4.6.2)
kgio (~> 2.5)
rack (~> 1.1)
unicorn (~> 4.1)
raindrops (0.10.0)
rake (10.0.3)
rest-client (1.6.7)
mime-types (>= 1.16)
ruby-openid (2.2.2)
shotgun (0.9)
unicorn (~> 4.8)
raindrops (0.13.0)
rake (10.4.2)
rest-client (1.7.3)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
ruby-openid (2.7.0)
shotgun (0.9.1)
rack (>= 1.0)
sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
sinatra-contrib (1.3.2)
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinatra-contrib (1.4.2)
backports (>= 2.0)
eventmachine
multi_json
rack-protection
rack-test
sinatra (~> 1.3.0)
sinatra (~> 1.4.0)
tilt (~> 1.3)
sinatra-namespace (1.0)
sinatra-contrib
sinatra-support (1.2.2)
sinatra (>= 1.0)
thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thread_safe (0.3.3)
tilt (1.3.3)
twilio-ruby (3.9.0)
thin (1.6.3)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0)
rack (~> 1.0)
thread_safe (0.3.5)
tilt (1.4.1)
twilio-ruby (4.0.0)
builder (>= 2.1.2)
jwt (>= 0.1.2)
jwt (~> 1.0)
multi_json (>= 1.3.0)
tzinfo (0.3.39)
unf (0.0.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.5)
unicorn (4.5.0)
unf_ext (0.0.7.1)
unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
unshorten (0.2.1)
webrobots (0.0.13)
unshorten (0.3.2)
webrobots (0.1.1)

PLATFORMS
ruby
Expand All @@ -202,6 +212,7 @@ DEPENDENCIES
mysql2 (= 0.3.7)
omniauth
omniauth-beeminder!
omniauth-eventbrite
omniauth-facebook
omniauth-flickr
omniauth-geoloqi
Expand Down
4 changes: 2 additions & 2 deletions controllers/auth-web.rb
Expand Up @@ -480,7 +480,7 @@ def save_response_type
attempted_username = session[:attempted_username]
actual_username = ''
if profile.provider[:code] == 'google_oauth2'
authed_url = auth['extra']['raw_info']['link']
authed_url = auth['extra']['raw_info']['profile']
if authed_url && (match=authed_url.match(Regexp.new profile.provider[:regex_username]))
actual_username = match[1]
end
Expand Down Expand Up @@ -562,4 +562,4 @@ def save_response_type
erb :session
end

end
end

0 comments on commit 25ec36b

Please sign in to comment.