Upgrade to rspec 2.11 to avoid out-of-date deprecation warning when r…

…unning specs

Gemfile

@@ -4,11 +4,7 @@ group :development, :test do
   gem 'rails', '3.0.9'
   gem 'activesupport'
   gem 'activemodel'
-  gem 'rspec', '2.6.0'
-  gem 'rspec-core', '2.6.4'
-  gem 'rspec-expectations', '2.6.0'
-  gem 'rspec-mocks', '2.6.0'
-  gem 'rspec-rails', '2.6.0'
+  gem 'rspec-rails', '~> 2.11'
   gem 'jeweler'
   gem 'diff-lcs'
   gem 'guard'

Gemfile.lock

@@ -31,7 +31,7 @@ GEM
     arel (2.0.10)
     builder (2.1.2)
     configuration (1.2.0)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     git (1.2.5)
@@ -46,6 +46,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.7.6)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
@@ -58,7 +59,7 @@ GEM
     open_gem (1.4.2)
       launchy (~> 0.3.5)
     polyglot (0.3.1)
-    rack (1.2.3)
+    rack (1.2.7)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -77,26 +78,25 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (10.0.3)
     rb-fsevent (0.9.2)
-    rdoc (3.6.1)
-    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)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    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)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.28)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -111,8 +111,4 @@ DEPENDENCIES
   jeweler
   rails (= 3.0.9)
   rb-fsevent (>= 0.9.2)
-  rspec (= 2.6.0)
-  rspec-core (= 2.6.4)
-  rspec-expectations (= 2.6.0)
-  rspec-mocks (= 2.6.0)
-  rspec-rails (= 2.6.0)
+  rspec-rails (~> 2.11)

Rakefile

@@ -24,7 +24,7 @@ RSpec::Core::RakeTask.new(:rcov)
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""