Browse files

Gem updates

  • Loading branch information...
1 parent d67f18a commit 06f14a52cb6818fa143fad49a203d5e173fe67ac @andey committed Jan 27, 2013
Showing with 92 additions and 21 deletions.
  1. +13 −4 Gemfile
  2. +79 −17 Gemfile.lock
View
17 Gemfile
@@ -2,26 +2,35 @@ source 'https://rubygems.org'
gem 'rails', '3.2.11'
gem 'pg'
-#gem 'sqlite3'
gem 'thin'
gem 'jquery-rails'
gem 'authlogic'
gem 'will_paginate'
gem 'bootstrap-will_paginate'
-gem 'wikipedia-client'
gem 'high_voltage'
gem 'acts-as-taggable-on'
gem 'htmlentities'
gem 'awesome_print'
gem 'sitemap_generator', '~> 3.4'
gem 'carrierwave'
gem 'fog'
-gem 'newrelic_rpm'
gem 'paperclip', '~> 3.0'
gem 'aws-sdk'
gem 'paper_trail', '~> 2'
gem 'awesome_nested_fields'
-gem 'iron_cache_rails'
+
+group :production do
+ gem 'newrelic_rpm'
+ gem 'iron_cache_rails'
+end
+
+gem 'rspec-rails', :group => [:test, :development]
+group :test do
+ gem 'factory_girl_rails'
+ gem 'capybara'
+ gem 'guard-rspec'
+ gem 'rb-inotify', '~> 0.8.8'
+end
group :assets do
gem 'sass-rails', '~> 3.2.3'
View
96 Gemfile.lock
@@ -45,10 +45,20 @@ GEM
bootstrap-will_paginate (0.0.9)
will_paginate
builder (3.0.4)
- carrierwave (0.7.1)
+ capybara (2.0.2)
+ mime-types (>= 1.16)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ selenium-webdriver (~> 2.0)
+ xpath (~> 1.0.0)
+ carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
+ childprocess (0.3.7)
+ ffi (~> 1.0, >= 1.0.6)
cocaine (0.4.2)
+ coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -57,12 +67,19 @@ GEM
execjs
coffee-script-source (1.4.0)
daemons (1.1.9)
+ diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (1.0.0)
excon (0.16.10)
execjs (1.4.0)
multi_json (~> 1.0)
- fog (1.8.0)
+ factory_girl (4.2.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (4.2.0)
+ factory_girl (~> 4.2.0)
+ railties (>= 3.0.0)
+ ffi (1.3.1)
+ fog (1.9.0)
builder
excon (~> 0.14)
formatador (~> 0.2.0)
@@ -73,36 +90,47 @@ GEM
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.4)
+ guard (1.6.1)
+ listen (>= 0.6.0)
+ lumberjack (>= 1.0.2)
+ pry (>= 0.9.10)
+ thor (>= 0.14.6)
+ guard-rspec (2.4.0)
+ guard (>= 1.1)
+ rspec (~> 2.11)
high_voltage (1.2.1)
hike (1.2.1)
htmlentities (4.3.1)
- httparty (0.9.0)
+ httparty (0.10.2)
multi_json (~> 1.0)
- multi_xml
+ multi_xml (>= 0.5.2)
i18n (0.6.1)
- iron_cache (1.3.0)
- iron_core (>= 0.4.2)
+ iron_cache (1.4.0)
+ iron_core (>= 0.5.1)
iron_cache_rails (0.1.4)
iron_cache (>= 1)
iron_core (0.5.1)
rest (>= 2.2.0)
journey (1.0.4)
- jquery-rails (2.1.4)
+ jquery-rails (2.2.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
+ listen (0.7.2)
+ lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ method_source (0.8.1)
mime-types (1.19)
multi_json (1.5.0)
- multi_xml (0.5.1)
+ multi_xml (0.5.2)
net-http-persistent (2.8)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
- net-ssh (2.6.2)
- newrelic_rpm (3.5.4.34)
+ net-ssh (2.6.3)
+ newrelic_rpm (3.5.6.46)
nokogiri (1.5.6)
paper_trail (2.7.0)
activerecord (~> 3.0)
@@ -115,7 +143,11 @@ GEM
mime-types
pg (0.14.1)
polyglot (0.3.3)
- rack (1.4.3)
+ pry (0.9.11.4)
+ coderay (~> 1.0.5)
+ method_source (~> 0.8)
+ slop (~> 3.4)
+ rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
@@ -138,21 +170,45 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
+ rb-inotify (0.8.8)
+ ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
rest (2.2.0)
net-http-persistent
rest-client (>= 0.3.0)
rest-client (1.6.7)
mime-types (>= 1.16)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.12.1)
+ rspec-rails (2.12.2)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
ruby-hmac (0.4.0)
- sass (3.2.3)
- sass-rails (3.2.5)
+ rubyzip (0.9.9)
+ sass (3.2.5)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
+ selenium-webdriver (2.29.0)
+ childprocess (>= 0.2.5)
+ multi_json (~> 1.0)
+ rubyzip
+ websocket (~> 1.0.4)
sitemap_generator (3.4)
builder
+ slop (3.4.3)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -162,7 +218,7 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.16.0)
+ thor (0.17.0)
tilt (1.3.3)
treetop (1.4.12)
polyglot
@@ -172,8 +228,10 @@ GEM
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
uuidtools (2.1.3)
- wikipedia-client (1.0.0)
- will_paginate (3.0.3)
+ websocket (1.0.7)
+ will_paginate (3.0.4)
+ xpath (1.0.0)
+ nokogiri (~> 1.3)
PLATFORMS
ruby
@@ -185,9 +243,12 @@ DEPENDENCIES
awesome_print
aws-sdk
bootstrap-will_paginate
+ capybara
carrierwave
coffee-rails (~> 3.2.1)
+ factory_girl_rails
fog
+ guard-rspec
high_voltage
htmlentities
iron_cache_rails
@@ -197,9 +258,10 @@ DEPENDENCIES
paperclip (~> 3.0)
pg
rails (= 3.2.11)
+ rb-inotify (~> 0.8.8)
+ rspec-rails
sass-rails (~> 3.2.3)
sitemap_generator (~> 3.4)
thin
uglifier (>= 1.0.3)
- wikipedia-client
will_paginate

0 comments on commit 06f14a5

Please sign in to comment.