Gem update

tanguygo · Mar 22, 2012 · 9e57568 · 9e57568
1 parent 5aecd92
commit 9e57568
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 100 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,19 +1,19 @@
 source :rubygems
 
-gem 'rails',         '3.1.3'
-gem 'sqlite3',       '1.3.5'
+gem 'rails',         '3.2.2'
+gem 'sqlite3'
 gem 'resque',        '1.20.0', :require => "resque/server"
-gem 'git',           '1.2.5'
-gem 'will_paginate', '3.0.2'
-gem 'jquery-rails',  '1.0.19'
-gem 'notifier',      '0.1.4'
-gem 'haml',          '3.1.4'
-gem 'hpricot',       '0.8.5'
+gem 'git'
+gem 'will_paginate'
+gem 'jquery-rails'
+gem 'notifier'
+gem 'haml'
+gem 'hpricot'
 gem 'unicorn'
 
 group :development do
-  gem 'capistrano', '2.9.0'
-  gem 'capistrano_colors', '0.5.5'
+  gem 'capistrano'
+  gem 'capistrano_colors'
   gem 'mongrel', '1.2.0.pre2'
 end
 
@@ -22,8 +22,8 @@ group :test do
 end
 
 group :assets do
-  gem 'sass-rails',   '3.1.5'
-  gem 'coffee-rails', '3.1.1'
-  gem 'uglifier',     '1.1.0'
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
   gem 'compass',      '0.12.alpha.1'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,47 +1,46 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
+      mail (~> 2.4.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (3.0.2)
     builder (3.0.0)
-    capistrano (2.9.0)
+    capistrano (2.11.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
     chunky_png (1.2.5)
-    coffee-rails (3.1.1)
+    coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
+      railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -53,61 +52,60 @@ GEM
     daemons (1.0.10)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    execjs (1.2.13)
+    execjs (1.3.0)
       multi_json (~> 1.0)
-    fssm (0.2.7)
+    fssm (0.2.8.1)
     gem_plugin (0.2.3)
     git (1.2.5)
     haml (3.1.4)
-    highline (1.6.9)
+    highline (1.6.11)
     hike (1.2.1)
-    hpricot (0.8.5)
+    hpricot (0.8.6)
     i18n (0.6.0)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
+    journey (1.0.3)
+    jquery-rails (2.0.1)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.4)
-    kgio (2.7.2)
-    mail (2.3.0)
+    json (1.6.5)
+    kgio (2.7.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    mime-types (1.18)
     mongrel (1.2.0.pre2)
       daemons (~> 1.0.10)
       gem_plugin (~> 0.2.3)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.2.1)
+    net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     notifier (0.1.4)
     polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-protection (1.2.0)
       rack
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 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)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -124,30 +122,29 @@ GEM
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    sass (3.1.12)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
+      rspec (~> 2.9.0)
+    sass (3.1.15)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -157,37 +154,37 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    uglifier (1.1.0)
+    tzinfo (0.3.32)
+    uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    unicorn (4.1.1)
-      kgio (~> 2.4)
+    unicorn (4.2.0)
+      kgio (~> 2.6)
       rack
-      raindrops (~> 0.6)
+      raindrops (~> 0.7)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    will_paginate (3.0.2)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano (= 2.9.0)
-  capistrano_colors (= 0.5.5)
-  coffee-rails (= 3.1.1)
+  capistrano
+  capistrano_colors
+  coffee-rails
   compass (= 0.12.alpha.1)
-  git (= 1.2.5)
-  haml (= 3.1.4)
-  hpricot (= 0.8.5)
-  jquery-rails (= 1.0.19)
+  git
+  haml
+  hpricot
+  jquery-rails
   mongrel (= 1.2.0.pre2)
-  notifier (= 0.1.4)
-  rails (= 3.1.3)
+  notifier
+  rails (= 3.2.2)
   resque (= 1.20.0)
   rspec-rails
-  sass-rails (= 3.1.5)
-  sqlite3 (= 1.3.5)
-  uglifier (= 1.1.0)
+  sass-rails
+  sqlite3
+  uglifier
   unicorn
-  will_paginate (= 3.0.2)
+  will_paginate