From ad7b5a5624e5f7957e58edcebaf73f7ffec46ed2 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Sun, 4 Dec 2011 22:48:42 +0000 Subject: [PATCH] Update all bundled gems to latest versions --- Gemfile | 28 ++++----- Gemfile.lock | 161 ++++++++++++++++++++++++++------------------------- 2 files changed, 96 insertions(+), 93 deletions(-) diff --git a/Gemfile b/Gemfile index 5023da3..27ea07d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,22 +1,24 @@ source 'http://rubygems.org' -gem 'rails', '3.1.0' +gem 'rails', '~> 3.1' -gem 'pg' +gem 'pg', '~> 0.11' -gem 'haml' +gem 'haml', '~> 3.1' -gem 'bcrypt-ruby' +gem 'bcrypt-ruby', '~> 3.0' group :development, :test do - gem 'rspec-rails' - gem 'capybara' - gem 'database_cleaner' - gem 'factory_girl_rails' + gem 'rspec-rails', '~> 2.6' + gem 'capybara', '~> 1.1' + gem 'database_cleaner', '~> 0.6' + gem 'factory_girl_rails', '~> 1.2' gem 'spork', '~> 0.9.0.rc' - gem 'guard' - gem 'guard-rspec' - gem 'guard-spork' - gem 'rb-inotify' - gem 'shoulda-matchers' + gem 'guard', '~> 0.8' + gem 'guard-rspec', '~> 0.4' + gem 'guard-spork', '~> 0.2' + if RbConfig::CONFIG['target_os'] =~ /linux/i + gem 'rb-inotify', '~> 0.8' + end + gem 'shoulda-matchers', '~> 1.0' end diff --git a/Gemfile.lock b/Gemfile.lock index a91e30a..9a5816a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,77 +1,77 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0) - actionpack (= 3.1.0) + actionmailer (3.1.3) + actionpack (= 3.1.3) mail (~> 2.3.0) - actionpack (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + actionpack (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.0.3) + rack (~> 1.3.5) + rack-cache (~> 1.1) rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) + sprockets (~> 2.0.3) + activemodel (3.1.3) + activesupport (= 3.1.3) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + activerecord (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) arel (~> 2.2.1) tzinfo (~> 0.3.29) - activeresource (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - activesupport (3.1.0) + activeresource (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) + activesupport (3.1.3) multi_json (~> 1.0) arel (2.2.1) bcrypt-ruby (3.0.1) builder (3.0.0) - capybara (1.1.1) + capybara (1.1.2) 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.2.2) + childprocess (0.2.3) ffi (~> 1.0.6) - database_cleaner (0.6.7) + database_cleaner (0.7.0) diff-lcs (1.1.3) erubis (2.7.0) - factory_girl (2.1.0) - factory_girl_rails (1.2.0) - factory_girl (~> 2.1.0) + factory_girl (2.3.2) + activesupport + factory_girl_rails (1.4.0) + factory_girl (~> 2.3.0) railties (>= 3.0.0) - ffi (1.0.9) - guard (0.7.0) + ffi (1.0.11) + guard (0.8.8) thor (~> 0.14.6) - guard-rspec (0.4.5) - guard (>= 0.4.0) - guard-spork (0.2.1) - guard (>= 0.2.2) + guard-rspec (0.5.8) + guard (>= 0.8.4) + guard-spork (0.3.2) + guard (>= 0.8.4) spork (>= 0.8.4) - haml (3.1.3) + haml (3.1.4) hike (1.2.1) i18n (0.6.0) - json_pure (1.6.0) + json (1.6.3) mail (2.3.0) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.16) - multi_json (1.0.3) + mime-types (1.17.2) + multi_json (1.0.4) nokogiri (1.5.0) pg (0.11.0) - polyglot (0.3.2) - rack (1.3.2) - rack-cache (1.0.3) + polyglot (0.3.3) + rack (1.3.5) + rack-cache (1.1) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) @@ -79,56 +79,57 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0) - actionmailer (= 3.1.0) - actionpack (= 3.1.0) - activerecord (= 3.1.0) - activeresource (= 3.1.0) - activesupport (= 3.1.0) + rails (3.1.3) + actionmailer (= 3.1.3) + actionpack (= 3.1.3) + activerecord (= 3.1.3) + activeresource (= 3.1.3) + activesupport (= 3.1.3) bundler (~> 1.0) - railties (= 3.1.0) - railties (3.1.0) - actionpack (= 3.1.0) - activesupport (= 3.1.0) + railties (= 3.1.3) + railties (3.1.3) + actionpack (= 3.1.3) + activesupport (= 3.1.3) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2) - rb-inotify (0.8.6) + rake (0.9.2.2) + rb-inotify (0.8.8) ffi (>= 0.5.0) - rdoc (3.9.4) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) + rdoc (3.11) + json (~> 1.4) + rspec (2.7.0) + rspec-core (~> 2.7.0) + rspec-expectations (~> 2.7.0) + rspec-mocks (~> 2.7.0) + rspec-core (2.7.1) + rspec-expectations (2.7.0) diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) - rspec-rails (2.6.1) + rspec-mocks (2.7.0) + rspec-rails (2.7.0) actionpack (~> 3.0) activesupport (~> 3.0) railties (~> 3.0) - rspec (~> 2.6.0) - rubyzip (0.9.4) - selenium-webdriver (2.6.0) + rspec (~> 2.7.0) + rubyzip (0.9.5) + selenium-webdriver (2.14.0) childprocess (>= 0.2.1) - ffi (>= 1.0.7) - json_pure + ffi (~> 1.0.9) + multi_json (~> 1.0.4) rubyzip - shoulda-matchers (1.0.0.beta3) + shoulda-matchers (1.0.0) spork (0.9.0.rc9) - sprockets (2.0.0) + sprockets (2.0.3) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.29) + tzinfo (0.3.31) xpath (0.1.4) nokogiri (~> 1.3) @@ -136,17 +137,17 @@ PLATFORMS ruby DEPENDENCIES - bcrypt-ruby - capybara - database_cleaner - factory_girl_rails - guard - guard-rspec - guard-spork - haml - pg - rails (= 3.1.0) - rb-inotify - rspec-rails - shoulda-matchers + bcrypt-ruby (~> 3.0) + capybara (~> 1.1) + database_cleaner (~> 0.6) + factory_girl_rails (~> 1.2) + guard (~> 0.8) + guard-rspec (~> 0.4) + guard-spork (~> 0.2) + haml (~> 3.1) + pg (~> 0.11) + rails (~> 3.1) + rb-inotify (~> 0.8) + rspec-rails (~> 2.6) + shoulda-matchers (~> 1.0) spork (~> 0.9.0.rc)