Update testing dependencies

thoughtbot · Sep 12, 2011 · 78b5e5f · 78b5e5f
1 parent 0a70502
commit 78b5e5f
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 114 deletions.
diff --git a/Appraisals b/Appraisals
@@ -1,10 +1,10 @@
-appraise "3.0.3" do
-  gem "rails", "3.0.3"
+appraise "3.0" do
+  gem "rails", "3.0.10"
   gem "rake", "~> 0.8.7"
 end
 
-appraise "3.1.0.rc1" do
-  gem "rails", "3.1.0.rc1"
+appraise "3.1" do
+  gem "rails", "3.1.0"
   gem 'sass'
   gem 'coffee-script'
   gem 'uglifier'

diff --git a/gemfiles/3.0.3.gemfile → gemfiles/3.0.gemfile b/gemfiles/3.0.3.gemfile → gemfiles/3.0.gemfile
@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.3"
 gem "rake", "~> 0.8.7"
+gem "rails", "3.0.10"
 
 gemspec :path=>"../"
diff --git a/gemfiles/3.0.3.gemfile.lock → gemfiles/3.0.gemfile.lock b/gemfiles/3.0.3.gemfile.lock → gemfiles/3.0.gemfile.lock
@@ -1,52 +1,53 @@
 PATH
-  remote: /home/mike/lib/shoulda-matchers
+  remote: /Users/sikachu/Projects/shoulda-matchers
   specs:
     shoulda-matchers (1.0.0.beta3)
 
 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.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       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.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
     appraisal (0.3.8)
       bundler
       rake
+    archive-tar-minitar (0.5.2)
     arel (2.0.10)
     aruba (0.4.5)
       bcat (>= 0.6.1)
       childprocess (>= 0.1.9)
       cucumber (>= 0.10.7)
       rdiscount (>= 1.6.8)
       rspec (>= 2.6.0)
-    bcat (0.6.1)
+    bcat (0.6.2)
       rack (~> 1.0)
     builder (2.1.2)
-    childprocess (0.2.1)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
     columnize (0.3.4)
     cucumber (0.10.7)
@@ -55,16 +56,16 @@ GEM
       gherkin (~> 2.4.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     ffi (1.0.9)
-    gherkin (2.4.16)
+    gherkin (2.4.18)
       json (>= 1.4.6)
-    i18n (0.6.0)
-    json (1.5.3)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
+    i18n (0.5.0)
+    json (1.5.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -78,22 +79,23 @@ GEM
       rack (>= 1.0.0)
     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.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rbx-require-relative (0.0.5)
     rdiscount (1.6.8)
+    rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -107,11 +109,16 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -130,9 +137,9 @@ DEPENDENCIES
   aruba
   cucumber (~> 0.10.0)
   mocha (~> 0.9.10)
-  rails (= 3.0.3)
+  rails (= 3.0.10)
   rake (~> 0.8.7)
   rspec-rails (~> 2.6.1.beta1)
-  ruby-debug (~> 0.10.4)
+  ruby-debug19 (~> 0.11.6)
   shoulda-matchers!
   sqlite3-ruby (~> 1.3.2)
diff --git a/gemfiles/3.1.0.rc1.gemfile → gemfiles/3.1.gemfile b/gemfiles/3.1.0.rc1.gemfile → gemfiles/3.1.gemfile
@@ -2,11 +2,11 @@
 
 source "http://rubygems.org"
 
-gem "jquery-rails"
-gem "uglifier"
-gem "rails", "3.1.0.rc1"
 gem "rake", "~> 0.8.7"
-gem "coffee-script"
+gem "rails", "3.1.0"
 gem "sass"
+gem "coffee-script"
+gem "uglifier"
+gem "jquery-rails"
 
 gemspec :path=>"../"