Update (almost all) gems.

huerlisi · May 11, 2011 · 03438c9 · 03438c9
1 parent 086ad83
commit 03438c9
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 95 deletions.
diff --git a/Gemfile b/Gemfile
@@ -37,24 +37,27 @@ end
 # Standard helpers
 # ================
 gem 'haml'
-gem 'compass', '~> 0.10.6'
+gem 'sass'
+gem 'compass'
 gem 'fancy-buttons'
 
 gem 'simple-navigation'
 
-gem 'formtastic', '~> 1.2.1'
+# Form framework
+gem 'formtastic'
+
 gem 'will_paginate', :git => 'http://github.com/huerlisi/will_paginate.git', :branch => 'rails3'
 gem 'inherited_resources'
 gem 'has_scope'
-gem 'i18n_rails_helpers', '~> 0.9'
+gem 'i18n_rails_helpers'
 
 # Mailyt
 # ======
 # Authentication
-gem 'devise', '~> 1.1'
+gem 'devise'
 
 # Vcards
-gem 'has_vcards', '~> 0.6.1'
+gem 'has_vcards'
 
 # Attachments
 gem 'paperclip'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,144 +9,155 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    bcrypt-ruby (2.1.2)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    compass (0.10.6)
-      haml (>= 3.0.4)
-    cucumber (0.10.0)
+    chunky_png (1.2.0)
+    compass (0.11.1)
+      chunky_png (~> 1.1)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    cucumber (0.10.2)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    devise (1.1.5)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    cucumber-rails (0.4.1)
+      cucumber (>= 0.10.1)
+      nokogiri (>= 1.4.4)
+      rack-test (>= 0.5.7)
+    devise (1.3.4)
       bcrypt-ruby (~> 2.1.2)
-      warden (~> 1.0.2)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (1.3.2)
-    factory_girl_rails (1.0)
+    factory_girl (1.3.3)
+    factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
-      rails (>= 3.0.0.beta4)
-    fancy-buttons (1.0.4)
-      compass (>= 0.10.6)
-    formtastic (1.2.2)
+      railties (>= 3.0.0)
+    fancy-buttons (1.1.1)
+      compass (>= 0.11)
+    formtastic (1.2.3)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
-      i18n (>= 0.4.0)
-    gherkin (2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    haml (3.0.24)
+      i18n (~> 0.4)
+    fssm (0.2.7)
+    gherkin (2.3.7)
+      json (>= 1.4.6)
+    haml (3.1.1)
     has_scope (0.5.0)
-    has_vcards (0.6.1)
+    has_vcards (0.7.1)
       activerecord
       i18n
-    hpricot (0.8.3)
+    hpricot (0.8.4)
     i18n (0.5.0)
-    i18n_rails_helpers (0.9.0)
+    i18n_rails_helpers (0.14.0)
       activerecord
       i18n
-    inherited_resources (1.1.2)
+      i18n_rails_helpers
+      rails (~> 3.0.0)
+    inherited_resources (1.2.2)
       has_scope (~> 0.5.0)
       responders (~> 0.6.0)
-    json (1.4.6)
-    mail (2.2.12)
+    json (1.5.1)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mocha (0.9.10)
-      rake
+    mocha (0.9.12)
     mysql (2.8.1)
     nokogiri (1.4.4)
-    paperclip (2.3.6)
-      activerecord
-      activesupport
+    orm_adapter (0.0.5)
+    paperclip (2.3.11)
+      activerecord (>= 2.3.0)
+      activesupport (>= 2.3.2)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    rails3-generators (0.17.0)
+      railties (= 3.0.7)
+    rails3-generators (0.17.4)
       railties (>= 3.0.0)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
-    responders (0.6.2)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.0)
-    rspec-expectations (2.3.0)
+    responders (0.6.4)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.2)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.0)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.3.0)
-    ruby_parser (2.0.5)
+      rspec (~> 2.5.0)
+    ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
+    sass (3.1.1)
     sexp_processor (3.0.5)
     shoulda (2.11.3)
-    simple-navigation (3.0.2)
+    simple-navigation (3.2.0)
       activesupport (>= 2.3.2)
-    sqlite3-ruby (1.3.2)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
     system_timer (1.0)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-    warden (1.0.3)
-      rack (>= 1.0.0)
-    webrat (0.7.2)
+    tzinfo (0.3.27)
+    warden (1.0.4)
+      rack (>= 1.0)
+    webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
@@ -155,18 +166,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  compass (~> 0.10.6)
+  compass
   cucumber
   cucumber-rails
-  devise (~> 1.1)
+  devise
   factory_girl_rails
   fancy-buttons
-  formtastic (~> 1.2.1)
+  formtastic
   haml
   has_scope
-  has_vcards (~> 0.6.1)
+  has_vcards
   hpricot
-  i18n_rails_helpers (~> 0.9)
+  i18n_rails_helpers
   inherited_resources
   mocha
   mysql
@@ -177,6 +188,7 @@ DEPENDENCIES
   rspec
   rspec-rails (~> 2.1)
   ruby_parser
+  sass
   shoulda
   simple-navigation
   sqlite3-ruby