Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Cleaning gemfile, updating gems, fixing draper error #753

Closed
wants to merge 8 commits into from

1 participant

@krainboltgreene
  • Reorganized the gemfile for readabilities sake
  • Switch to ~> X.Y version restrictions because we don't actually care about patch levels (most likely)
  • Moved production only gems to the production group
  • Stopped airbreak from initializing in non-production mode
  • Updated a few gems
  • Switch to HTTPS for rubygems source
  • Moved some test-only gems out of development/test into only test group
  • Updated draper didn't have set_view_context method and we don't need it
@krainboltgreene krainboltgreene deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
117 Gemfile
@@ -1,76 +1,73 @@
-source 'http://rubygems.org'
+source "https://rubygems.org"
-gem 'rails', '3.2.12'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
- gem "sass", "~> 3.1.10"
- gem 'sass-rails', "~> 3.2.5"
- gem 'compass-rails', "~> 1.0.3"
- gem 'coffee-rails', "~> 3.2.2"
- gem 'uglifier', "~> 1.0.0"
- gem 'jquery-ui-rails', "~> 2.0.0"
-
- # Many Linux environments do not have a javascript environment which is
- # required by the asset generators. However, windows and os x have one
- # provided by the system.
- gem "therubyracer", "~> 0.11.3" unless RUBY_PLATFORM.match(/darwin|mswin/)
-end
-
-gem "haml", "~> 3.1.4"
-gem "haml-rails", "~> 0.3.4"
-gem 'jquery-rails', "~> 1.0.12"
-gem 'airbrake', "~> 3.0.9"
-gem 'bcrypt-ruby', "~> 3.0.0"
-gem 'thin', "~> 1.5.0"
-gem 'omniauth', "~> 1.1.0"
-gem "omniauth-twitter", "~> 0.0.12"
-gem "mongo_mapper", "~> 0.12.0"
-gem "mongo", "~> 1.7.0"
-gem "bson", "~> 1.7.0"
-gem "bson_ext", "~> 1.7.0"
-gem "i18n", "~> 0.6.0"
-gem "tire", "~> 0.4.1"
-gem "twitter", "~> 3.5.0"
-gem "pony", "~> 1.3"
-gem "rdiscount", "~> 1.6.8"
-gem "ratom", "~> 0.7.2"
-gem "ostatus", "~> 0.0.12"
-gem "osub", "~> 0.0.6"
-gem "opub", "~> 0.0.1"
+gem "rails", "3.2.12"
+gem "haml-rails", "~> 0.4"
+gem "bcrypt-ruby", "~> 3.0"
+gem "omniauth", "~> 1.1"
+gem "omniauth-twitter", "~> 0.0"
+gem "mongo_mapper", "~> 0.12"
+gem "mongo", "~> 1.8"
+gem "bson_ext", "~> 1.7"
+gem "i18n", "~> 0.6"
+gem "tire", "~> 0.5"
+gem "twitter", "~> 4.6"
+gem "pony", "~> 1.4"
+gem "rdiscount", "~> 1.6"
+gem "ratom", "~> 0.7"
+gem "ostatus", "~> 0.0"
+gem "osub", "~> 0.0"
+gem "opub", "~> 0.0"
gem "redfinger", :git => "git://github.com/hotsh/redfinger.git"
-gem "nokogiri", "~> 1.5.0"
-gem "tzinfo", "~> 0.3.29"
-gem "rsa", "~> 0.1.4"
-gem "exceptional", "~> 2.0.32"
-gem "newrelic_rpm", "~> 3.3.1"
-gem "draper", "~> 0.11.1"
+gem "nokogiri", "~> 1.5"
+gem "tzinfo", "~> 0.3"
+gem "rsa", "~> 0.1"
+gem "draper", "~> 0.18"
# background job queue
gem "delayed_job", :git => "git://github.com/collectiveidea/delayed_job.git", :tag => "v2.1.4"
gem "delayed_job_mongo_mapper", :git => "git://github.com/earbits/delayed_job_mongo_mapper.git"
-gem "whenever", "~> 0.6.8"
+gem "whenever", "~> 0.8"
group :production do
- gem 'unicorn', "~> 4.0.1"
+ gem "unicorn", "~> 4.6"
+ gem "newrelic_rpm", "~> 3.5"
+ gem "exceptional", "~> 2.0"
+ gem "airbrake", "~> 3.1"
+end
+
+group :development do
+ gem "thin", "~> 1.5"
end
group :development, :test do
- gem "database_cleaner", "~> 0.6.7"
- gem "fabrication", "~> 1.2.0"
- gem "capybara", "~> 1.1.2"
- gem "show_me_the_cookies", "~> 1.1.0"
+ gem "fabrication", "~> 1.4"
+ gem "show_me_the_cookies", "~> 1.1"
gem "rocco", :git => "git://github.com/rtomayko/rocco.git"
- gem "pygmentize", "~> 0.0.3"
- gem "mocha", "~> 0.13.0", :require => false
- gem "vcr", "~> 1.10.3"
- gem "simplecov", "~> 0.4.0", :require => false
- gem "launchy", "~> 2.0.5"
- gem "minitest", "~> 4.2.0"
- gem "quiet_assets", "~> 1.0.0"
+ gem "pygmentize", "~> 0.0"
+ gem "simplecov", "~> 0.7", :require => false
+ gem "launchy", "~> 2.2"
+ gem "minitest", "~> 4.6"
+ gem "quiet_assets", "~> 1.0"
end
group :test do
- gem "webmock", "~> 1.6.4"
+ gem "webmock", "~> 1.11"
+ gem "capybara", "~> 1.0"
+ gem "database_cleaner", "~> 0.9"
+ gem "mocha", "~> 0.1", :require => false
+ gem "vcr", "~> 1.11"
+end
+
+group :assets do
+ gem "sass-rails", "~> 3.2"
+ gem "compass-rails", "~> 1.0"
+ gem "coffee-rails", "~> 3.2"
+ gem "uglifier", "~> 1.3"
+ gem "jquery-rails", "~> 1.0"
+ gem "jquery-ui-rails", "~> 2.0"
+
+ # Many Linux environments do not have a javascript environment which is
+ # required by the asset generators. However, windows and os x have one
+ # provided by the system.
+ gem "therubyracer", "~> 0.1" unless RUBY_PLATFORM.match(/darwin|mswin/)
end
View
240 Gemfile.lock
@@ -34,9 +34,8 @@ GIT
redcarpet (~> 1.17)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- aaronh-chronic (0.3.9)
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
@@ -64,78 +63,80 @@ GEM
activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.8)
- airbrake (3.0.9)
+ addressable (2.3.3)
+ airbrake (3.1.8)
activesupport
builder
+ json
arel (3.0.2)
bcrypt-ruby (3.0.1)
- bson (1.7.0)
- bson_ext (1.7.0)
- bson (~> 1.7.0)
+ bson (1.8.3)
+ bson_ext (1.8.3)
+ bson (~> 1.8.3)
builder (3.0.4)
- capybara (1.1.2)
+ capybara (1.1.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.5)
- ffi (~> 1.0, >= 1.0.6)
- chunky_png (1.2.6)
+ childprocess (0.3.9)
+ ffi (~> 1.0, >= 1.0.11)
+ chronic (0.9.1)
+ chunky_png (1.2.7)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.6.1)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
- crack (0.3.1)
+ crack (0.3.2)
daemons (1.1.9)
- database_cleaner (0.6.7)
- draper (0.11.1)
- activesupport (>= 2.3.10)
+ database_cleaner (0.9.1)
+ draper (0.18.0)
+ actionpack (~> 3.2)
+ activesupport (~> 3.2)
erubis (2.7.0)
- eventmachine (1.0.0)
- exceptional (2.0.32)
+ eventmachine (1.0.3)
+ exceptional (2.0.33)
rack
execjs (1.4.0)
multi_json (~> 1.0)
- fabrication (1.2.0)
- faraday (0.8.4)
+ fabrication (1.4.1)
+ faraday (0.8.6)
multipart-post (~> 1.1)
- ffi (1.1.5)
- fssm (0.2.9)
- haml (3.1.7)
- haml-rails (0.3.5)
+ ffi (1.4.0)
+ fssm (0.2.10)
+ haml (4.0.0)
+ tilt
+ haml-rails (0.4)
actionpack (>= 3.1, < 4.1)
activesupport (>= 3.1, < 4.1)
- haml (~> 3.1)
+ haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
hashie (1.2.0)
hashr (0.0.22)
hike (1.2.1)
- i18n (0.6.1)
+ i18n (0.6.4)
journey (1.0.4)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- jquery-ui-rails (2.0.1)
+ jquery-ui-rails (2.0.2)
jquery-rails
railties (>= 3.1.0)
json (1.7.7)
- kgio (2.7.4)
- launchy (2.0.5)
- addressable (~> 2.2.6)
- libwebsocket (0.1.5)
- addressable
+ kgio (2.8.0)
+ launchy (2.2.0)
+ addressable (~> 2.3)
libxml-ruby (2.3.3)
mail (2.4.4)
i18n (>= 0.4.0)
@@ -143,28 +144,28 @@ GEM
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.21)
- minitest (4.2.0)
- mocha (0.13.2)
+ minitest (4.6.2)
+ mocha (0.13.3)
metaclass (~> 0.0.1)
- mongo (1.7.0)
- bson (~> 1.7.0)
+ mongo (1.8.3)
+ bson (~> 1.8.3)
mongo_mapper (0.12.0)
activemodel (~> 3.0)
activesupport (~> 3.0)
plucky (~> 0.5.2)
- multi_json (1.5.1)
- multipart-post (1.1.5)
+ multi_json (1.6.1)
+ multipart-post (1.2.0)
mustache (0.99.4)
- newrelic_rpm (3.3.5)
- nokogiri (1.5.5)
+ newrelic_rpm (3.5.8.72)
+ nokogiri (1.5.6)
oauth (0.4.7)
- omniauth (1.1.1)
+ omniauth (1.1.3)
hashie (~> 1.2)
rack
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
- omniauth-twitter (0.0.13)
+ omniauth-twitter (0.0.14)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
opub (0.0.1)
@@ -179,8 +180,8 @@ GEM
pony (1.4)
mail (> 2.0)
pygmentize (0.0.3)
- quiet_assets (1.0.1)
- railties (~> 3.1)
+ quiet_assets (1.0.2)
+ railties (>= 3.1, < 5.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
@@ -208,7 +209,7 @@ GEM
ratom (0.7.2)
libxml-ruby (~> 2.3.2)
rdiscount (1.6.8)
- rdoc (3.12.1)
+ rdoc (3.12.2)
json (~> 1.4)
redcarpet (1.17.2)
rest-client (1.6.7)
@@ -216,22 +217,23 @@ GEM
rsa (0.1.4)
ruby-hmac (0.4.0)
rubyzip (0.9.9)
- sass (3.1.21)
- sass-rails (3.2.5)
+ sass (3.2.7)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.25.0)
+ selenium-webdriver (2.31.0)
childprocess (>= 0.2.5)
- libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- show_me_the_cookies (1.1.3)
+ websocket (~> 1.0.4)
+ show_me_the_cookies (1.1.4)
capybara (~> 1.0)
- simple_oauth (0.1.9)
- simplecov (0.4.2)
- simplecov-html (~> 0.4.4)
- simplecov-html (0.4.5)
+ simple_oauth (0.2.0)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -242,35 +244,36 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
- tilt (1.3.3)
- tire (0.4.3)
+ tilt (1.3.5)
+ tire (0.5.4)
activemodel (>= 3.0)
hashr (~> 0.0.19)
- multi_json (~> 1.0)
+ multi_json (~> 1.3)
rake
rest-client (~> 1.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter (3.5.0)
- faraday (~> 0.8)
- multi_json (~> 1.3)
- simple_oauth (~> 0.1.6)
- tzinfo (0.3.35)
- uglifier (1.0.4)
+ twitter (4.6.0)
+ faraday (~> 0.8, < 0.10)
+ multi_json (~> 1.0)
+ simple_oauth (~> 0.2)
+ tzinfo (0.3.36)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- unicorn (4.0.1)
- kgio (~> 2.4)
+ multi_json (~> 1.0, >= 1.0.2)
+ unicorn (4.6.2)
+ kgio (~> 2.6)
rack
- raindrops (~> 0.6)
- vcr (1.10.3)
- webmock (1.6.4)
- addressable (~> 2.2, > 2.2.5)
- crack (>= 0.1.7)
- whenever (0.6.8)
- aaronh-chronic (>= 0.3.9)
+ raindrops (~> 0.7)
+ vcr (1.11.3)
+ webmock (1.11.0)
+ addressable (>= 2.2.7)
+ crack (>= 0.3.2)
+ websocket (1.0.7)
+ whenever (0.8.2)
activesupport (>= 2.3.4)
+ chronic (>= 0.6.3)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -278,55 +281,52 @@ PLATFORMS
ruby
DEPENDENCIES
- airbrake (~> 3.0.9)
- bcrypt-ruby (~> 3.0.0)
- bson (~> 1.7.0)
- bson_ext (~> 1.7.0)
- capybara (~> 1.1.2)
- coffee-rails (~> 3.2.2)
- compass-rails (~> 1.0.3)
- database_cleaner (~> 0.6.7)
+ airbrake (~> 3.1)
+ bcrypt-ruby (~> 3.0)
+ bson_ext (~> 1.7)
+ capybara (~> 1.0)
+ coffee-rails (~> 3.2)
+ compass-rails (~> 1.0)
+ database_cleaner (~> 0.9)
delayed_job!
delayed_job_mongo_mapper!
- draper (~> 0.11.1)
- exceptional (~> 2.0.32)
- fabrication (~> 1.2.0)
- haml (~> 3.1.4)
- haml-rails (~> 0.3.4)
- i18n (~> 0.6.0)
- jquery-rails (~> 1.0.12)
- jquery-ui-rails (~> 2.0.0)
- launchy (~> 2.0.5)
- minitest (~> 4.2.0)
- mocha (~> 0.13.0)
- mongo (~> 1.7.0)
- mongo_mapper (~> 0.12.0)
- newrelic_rpm (~> 3.3.1)
- nokogiri (~> 1.5.0)
- omniauth (~> 1.1.0)
- omniauth-twitter (~> 0.0.12)
- opub (~> 0.0.1)
- ostatus (~> 0.0.12)
- osub (~> 0.0.6)
- pony (~> 1.3)
- pygmentize (~> 0.0.3)
- quiet_assets (~> 1.0.0)
+ draper (~> 0.18)
+ exceptional (~> 2.0)
+ fabrication (~> 1.4)
+ haml-rails (~> 0.4)
+ i18n (~> 0.6)
+ jquery-rails (~> 1.0)
+ jquery-ui-rails (~> 2.0)
+ launchy (~> 2.2)
+ minitest (~> 4.6)
+ mocha (~> 0.1)
+ mongo (~> 1.8)
+ mongo_mapper (~> 0.12)
+ newrelic_rpm (~> 3.5)
+ nokogiri (~> 1.5)
+ omniauth (~> 1.1)
+ omniauth-twitter (~> 0.0)
+ opub (~> 0.0)
+ ostatus (~> 0.0)
+ osub (~> 0.0)
+ pony (~> 1.4)
+ pygmentize (~> 0.0)
+ quiet_assets (~> 1.0)
rails (= 3.2.12)
- ratom (~> 0.7.2)
- rdiscount (~> 1.6.8)
+ ratom (~> 0.7)
+ rdiscount (~> 1.6)
redfinger!
rocco!
- rsa (~> 0.1.4)
- sass (~> 3.1.10)
- sass-rails (~> 3.2.5)
- show_me_the_cookies (~> 1.1.0)
- simplecov (~> 0.4.0)
- thin (~> 1.5.0)
- tire (~> 0.4.1)
- twitter (~> 3.5.0)
- tzinfo (~> 0.3.29)
- uglifier (~> 1.0.0)
- unicorn (~> 4.0.1)
- vcr (~> 1.10.3)
- webmock (~> 1.6.4)
- whenever (~> 0.6.8)
+ rsa (~> 0.1)
+ sass-rails (~> 3.2)
+ show_me_the_cookies (~> 1.1)
+ simplecov (~> 0.7)
+ thin (~> 1.5)
+ tire (~> 0.5)
+ twitter (~> 4.6)
+ tzinfo (~> 0.3)
+ uglifier (~> 1.3)
+ unicorn (~> 4.6)
+ vcr (~> 1.11)
+ webmock (~> 1.11)
+ whenever (~> 0.8)
View
6 config/initializers/airbrake.rb
@@ -1,3 +1,5 @@
-Airbrake.configure do |config|
- config.api_key = ENV['AIRBRAKE_API_KEY']
+if Rails.env.production?
+ Airbrake.configure do |config|
+ config.api_key = ENV['AIRBRAKE_API_KEY']
+ end
end
View
2  test/test_helper.rb
@@ -44,8 +44,6 @@ def setup
DatabaseCleaner.strategy = :truncation
DatabaseCleaner.clean_with(:truncation)
DatabaseCleaner.start
-
- ApplicationController.new.set_current_view_context
end
def teardown
Something went wrong with that request. Please try again.