Update to RSpec 2.0

5 files changed, 19 insertions, 15 deletions

diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..1225cbf
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--colour
+--format=nested
diff --git a/Gemfile b/Gemfile
index de47fea..5f20c74 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,5 +8,5 @@ group :development do
 end
 
 group :test do
-  gem 'rspec'
+  gem 'rspec', '~> 2.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 115aad2..a614c27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     gemcutter (0.6.1)
     git (1.2.5)
     jeweler (1.4.0)
@@ -10,7 +11,14 @@ GEM
     json (1.4.3)
     json_pure (1.4.3)
     rake (0.8.7)
-    rspec (1.3.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
 
@@ -21,4 +29,4 @@ DEPENDENCIES
   jeweler
   json
   rake
-  rspec
+  rspec (~> 2.0)
diff --git a/Rakefile b/Rakefile
index 46d90a2..99eea3d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -18,16 +18,10 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |spec|
+  # spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
 end
 
 task :default => :spec
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d20e990..f337159 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -5,9 +5,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'hashie'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
 end