Merge pull request #3955 from diaspora/update_gems

Update gems
This commit is contained in:
Florian Staudacher 2013-02-17 04:50:19 -08:00
commit 7b340b0056
4 changed files with 85 additions and 98 deletions

39
Gemfile
View file

@ -4,7 +4,7 @@ gem 'rails', '3.2.12'
gem 'foreman', '0.61'
gem 'unicorn', '4.5.0', :require => false
gem 'unicorn', '4.6.0', :require => false
gem 'rails_autolink', '1.0.9'
@ -23,14 +23,14 @@ gem 'rack-protection', '1.2'
gem 'devise', '2.1.3'
gem 'remotipart', '1.0.2'
gem 'remotipart', '1.0.5'
gem 'omniauth', '1.1.1'
gem 'omniauth', '1.1.3'
gem 'omniauth-facebook', '1.4.1'
gem 'omniauth-tumblr', '1.1'
gem 'omniauth-twitter', '0.0.14'
gem 'twitter', '4.4.4'
gem 'twitter', '4.5.0'
# mail
@ -38,9 +38,8 @@ gem 'markerb', '1.0.1'
gem 'messagebus_ruby_api', '1.0.3'
group :production do # we don't install these on travis to speed up test runs
gem 'rails_admin', '0.4.1'
gem 'fastercsv', '1.5.5', :require => false
gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
gem 'rails_admin', '0.4.5'
gem 'rack-ssl', '1.3.3', :require => 'rack/ssl'
gem 'rack-rewrite', '1.3.3', :require => false
# analytics
@ -52,17 +51,17 @@ end
# database
gem "activerecord-import", "0.2.11"
gem 'foreigner', '1.2.1'
gem "activerecord-import", "0.3.1"
gem 'foreigner', '1.3.0'
gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
# file uploading
gem 'carrierwave', '0.7.1'
gem 'fog', '1.8.0'
gem 'mini_magick', '3.4'
gem 'carrierwave', '0.8.0'
gem 'fog', '1.9.0'
gem 'mini_magick', '3.5'
# JSON and API
@ -98,7 +97,7 @@ gem 'typhoeus', '0.3.3'
# views
gem 'haml', '3.1.7'
gem 'haml', '4.0.0'
gem 'mobile-fu', '1.1.1'
gem 'will_paginate', '3.0.4'
@ -118,7 +117,7 @@ group :assets do
# gem 'therubyracer', :platform => :ruby
gem 'handlebars_assets', '0.8.2'
gem 'handlebars_assets', '0.11.0'
gem 'uglifier', '1.3.0'
gem "asset_sync", '0.5.4', :require => false
@ -128,7 +127,7 @@ gem 'jquery-rails', '2.1.4'
# web
gem 'faraday', '0.8.4'
gem 'faraday', '0.8.5'
gem 'faraday_middleware', '0.9.0'
@ -143,18 +142,18 @@ group :test do
gem 'cucumber-rails', '1.3.0', :require => false
gem 'database_cleaner', '0.9.1'
gem 'timecop', '0.5.9'
gem 'factory_girl_rails', '4.1.0'
gem 'timecop', '0.5.9.2'
gem 'factory_girl_rails', '4.2.1'
gem 'fixture_builder', '0.3.5'
gem 'fuubar', '1.1.0'
gem 'rspec-instafail', '0.2.4', :require => false
gem 'selenium-webdriver', '2.27.2'
gem 'selenium-webdriver', '2.29.0'
gem 'webmock', '1.8.11', :require => false
gem 'spork', '1.0.0rc3'
gem 'guard-rspec', '2.3.3'
gem 'guard-spork', '1.4.1'
gem 'guard-rspec', '2.4.0'
gem 'guard-spork', '1.4.2'
gem 'guard-cucumber', '1.3.2'
gem 'rb-inotify', '0.9.0', :require => false
gem 'rb-fsevent', '0.9.3', :require => false

View file

@ -31,8 +31,7 @@ GEM
activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-import (0.2.11)
activerecord (~> 3.0)
activerecord-import (0.3.1)
activerecord (~> 3.0)
activeresource (3.2.12)
activemodel (= 3.2.12)
@ -69,11 +68,11 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
carrierwave (0.7.1)
carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
childprocess (0.3.8)
ffi (~> 1.0, >= 1.0.11)
client_side_validations (3.2.1)
coderay (1.0.8)
coffee-rails (3.2.2)
@ -84,7 +83,7 @@ GEM
execjs
coffee-script-source (1.4.0)
configurate (0.0.2)
crack (0.3.1)
crack (0.3.2)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@ -105,21 +104,20 @@ GEM
excon (0.16.10)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.1.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.1.0)
factory_girl (~> 4.1.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
faraday (0.8.4)
faraday (0.8.5)
multipart-post (~> 1.1)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
fastercsv (1.5.5)
ffi (1.3.1)
ffi (1.4.0)
fixture_builder (0.3.5)
activerecord (>= 2)
activesupport (>= 2)
fog (1.8.0)
fog (1.9.0)
builder
excon (~> 0.14)
formatador (~> 0.2.0)
@ -129,10 +127,10 @@ GEM
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
font-awesome-sass-rails (3.0.0.1)
font-awesome-sass-rails (3.0.2.1)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
foreigner (1.2.1)
foreigner (1.3.0)
activerecord (>= 3.0.0)
foreman (0.61.0)
thor (>= 0.13.6)
@ -141,28 +139,30 @@ GEM
rspec (~> 2.0)
rspec-instafail (~> 0.2.0)
ruby-progressbar (~> 1.0.0)
gherkin (2.11.5)
json (>= 1.4.6)
gherkin (2.11.6)
json (>= 1.7.6)
gon (4.0.2)
actionpack (>= 2.3.0)
json
guard (1.6.1)
guard (1.6.2)
listen (>= 0.6.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
terminal-table (>= 1.4.3)
thor (>= 0.14.6)
guard-cucumber (1.3.2)
cucumber (>= 1.2.0)
guard (>= 1.1.0)
guard-rspec (2.3.3)
guard-rspec (2.4.0)
guard (>= 1.1)
rspec (~> 2.11)
guard-spork (1.4.1)
guard-spork (1.4.2)
childprocess (>= 0.2.3)
guard (>= 1.1)
spork (>= 0.8.4)
haml (3.1.7)
handlebars_assets (0.8.2)
haml (4.0.0)
tilt
handlebars_assets (0.11.0)
execjs (>= 1.2.9)
sprockets (>= 2.0.3)
tilt
@ -197,10 +197,7 @@ GEM
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.7.4)
libwebsocket (0.1.7.1)
addressable
websocket
kgio (2.8.0)
listen (0.7.2)
lumberjack (1.0.2)
mail (2.4.4)
@ -212,12 +209,12 @@ GEM
messagebus_ruby_api (1.0.3)
method_source (0.8.1)
mime-types (1.21)
mini_magick (3.4)
mini_magick (3.5.0)
subexec (~> 0.2.1)
mobile-fu (1.1.1)
rack-mobile-detect
rails
multi_json (1.5.1)
multi_json (1.6.1)
multipart-post (1.1.5)
mysql2 (0.3.11)
nested_form (0.3.1)
@ -236,7 +233,7 @@ GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
omniauth (1.1.1)
omniauth (1.1.3)
hashie (~> 1.2)
rack
omniauth-facebook (1.4.1)
@ -254,7 +251,7 @@ GEM
omniauth-oauth (~> 1.0)
orm_adapter (0.4.0)
polyglot (0.3.3)
pry (0.9.11.1)
pry (0.9.12)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
@ -273,7 +270,7 @@ GEM
rack-protection (1.2.0)
rack
rack-rewrite (1.3.3)
rack-ssl (1.3.2)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
@ -287,19 +284,20 @@ GEM
railties (= 3.2.12)
rails-i18n (0.7.2)
i18n (~> 0.5)
rails_admin (0.4.1)
bootstrap-sass (~> 2.1)
rails_admin (0.4.5)
bootstrap-sass (~> 2.2)
builder (~> 3.0)
coffee-rails (~> 3.1)
font-awesome-sass-rails (~> 3.0, >= 3.0.0.1)
haml (~> 3.1)
haml (~> 4.0)
jquery-rails (~> 2.1)
jquery-ui-rails (~> 3.0)
kaminari (~> 0.14)
nested_form (~> 0.2)
nested_form (~> 0.3)
rack-pjax (~> 0.6)
rails (~> 3.1)
remotipart (~> 1.0)
safe_yaml (~> 0.6)
sass-rails (~> 3.1)
rails_autolink (1.0.9)
rails (~> 3.1)
@ -321,7 +319,7 @@ GEM
redis (3.0.2)
redis-namespace (1.2.1)
redis (~> 3.0.0)
remotipart (1.0.2)
remotipart (1.0.5)
resque (1.23.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0)
@ -338,7 +336,7 @@ GEM
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-instafail (0.2.4)
rspec-mocks (2.12.1)
rspec-mocks (2.12.2)
rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
@ -350,16 +348,17 @@ GEM
ruby-oembed (0.8.8)
ruby-progressbar (1.0.2)
rubyzip (0.9.9)
safe_yaml (0.8.0)
sass (3.2.5)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.27.2)
selenium-webdriver (2.29.0)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
simple_oauth (0.2.0)
sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
@ -373,13 +372,14 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
subexec (0.2.2)
terminal-table (1.4.5)
thor (0.17.0)
tilt (1.3.3)
timecop (0.5.9)
timecop (0.5.9.2)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
twitter (4.4.4)
twitter (4.5.0)
faraday (~> 0.8, < 0.10)
multi_json (~> 1.0)
simple_oauth (~> 0.2)
@ -389,7 +389,7 @@ GEM
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.5.0)
unicorn (4.6.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@ -400,7 +400,7 @@ GEM
webmock (1.8.11)
addressable (>= 2.2.7)
crack (>= 0.1.7)
websocket (1.0.6)
websocket (1.0.7)
will_paginate (3.0.4)
xpath (0.1.4)
nokogiri (~> 1.3)
@ -409,7 +409,7 @@ PLATFORMS
ruby
DEPENDENCIES
activerecord-import (= 0.2.11)
activerecord-import (= 0.3.1)
acts-as-taggable-on (= 2.3.3)
acts_as_api (= 0.4.1)
addressable (= 2.3.2)
@ -418,27 +418,26 @@ DEPENDENCIES
capistrano (= 2.12.0)
capistrano_colors (= 0.5.5)
capybara (= 1.1.3)
carrierwave (= 0.7.1)
carrierwave (= 0.8.0)
client_side_validations (= 3.2.1)
configurate (= 0.0.2)
cucumber-rails (= 1.3.0)
database_cleaner (= 0.9.1)
devise (= 2.1.3)
factory_girl_rails (= 4.1.0)
faraday (= 0.8.4)
factory_girl_rails (= 4.2.1)
faraday (= 0.8.5)
faraday_middleware (= 0.9.0)
fastercsv (= 1.5.5)
fixture_builder (= 0.3.5)
fog (= 1.8.0)
foreigner (= 1.2.1)
fog (= 1.9.0)
foreigner (= 1.3.0)
foreman (= 0.61)
fuubar (= 1.1.0)
gon (= 4.0.2)
guard-cucumber (= 1.3.2)
guard-rspec (= 2.3.3)
guard-spork (= 1.4.1)
haml (= 3.1.7)
handlebars_assets (= 0.8.2)
guard-rspec (= 2.4.0)
guard-spork (= 1.4.2)
haml (= 4.0.0)
handlebars_assets (= 0.11.0)
http_accept_language (= 1.0.2)
i18n-inflector-rails (~> 1.0)
jasmine (= 1.3.1)
@ -446,11 +445,11 @@ DEPENDENCIES
json (= 1.7.7)
markerb (= 1.0.1)
messagebus_ruby_api (= 1.0.3)
mini_magick (= 3.4)
mini_magick (= 3.5)
mobile-fu (= 1.1.1)
mysql2 (= 0.3.11)
nokogiri (= 1.5.6)
omniauth (= 1.1.1)
omniauth (= 1.1.3)
omniauth-facebook (= 1.4.1)
omniauth-tumblr (= 1.1)
omniauth-twitter (= 0.0.14)
@ -459,15 +458,15 @@ DEPENDENCIES
rack-piwik (= 0.1.3)
rack-protection (= 1.2)
rack-rewrite (= 1.3.3)
rack-ssl (= 1.3.2)
rack-ssl (= 1.3.3)
rails (= 3.2.12)
rails-i18n (= 0.7.2)
rails_admin (= 0.4.1)
rails_admin (= 0.4.5)
rails_autolink (= 1.0.9)
rb-fsevent (= 0.9.3)
rb-inotify (= 0.9.0)
redcarpet (= 2.2.2)
remotipart (= 1.0.2)
remotipart (= 1.0.5)
resque (= 1.23.0)
resque-timeout (= 1.0.0)
rmagick (= 2.13.2)
@ -476,12 +475,12 @@ DEPENDENCIES
rspec-rails (= 2.12.2)
ruby-oembed (= 0.8.8)
sass-rails (= 3.2.6)
selenium-webdriver (= 2.27.2)
selenium-webdriver (= 2.29.0)
spork (= 1.0.0rc3)
timecop (= 0.5.9)
twitter (= 4.4.4)
timecop (= 0.5.9.2)
twitter (= 4.5.0)
typhoeus (= 0.3.3)
uglifier (= 1.3.0)
unicorn (= 4.5.0)
unicorn (= 4.6.0)
webmock (= 1.8.11)
will_paginate (= 3.0.4)

View file

@ -197,14 +197,9 @@ SQL
# ---------------- HELPER METHODS -------------------------
def self.load_waiting_list_csv(filename)
require 'csv'
csv = filename
if RUBY_VERSION.include? "1.8"
require 'fastercsv'
people = FasterCSV.read(csv)
else
require 'csv'
people = CSV.read(csv)
end
people = CSV.read(csv)
people
end

View file

@ -4,14 +4,8 @@
module RakeHelpers
def process_emails(csv, num_to_process, offset, test=true)
if RUBY_VERSION.include? "1.8"
require 'fastercsv'
backers = FasterCSV.read(csv)
else
require 'csv'
backers = CSV.read(csv)
end
require 'csv'
backers = CSV.read(csv)
puts "DRY RUN" if test
churn_through = 0
num_to_process.times do |n|