From c1756302ca22c1795007da9629acf1d2edea8717 Mon Sep 17 00:00:00 2001
From: Nico Hagenburger <nico@hagenburger.net>
Date: Wed, 13 Oct 2010 02:33:20 +0200
Subject: [PATCH] updated to rspec 2.0.0

---
 .rspec              |  2 ++
 Gemfile             |  2 +-
 Rakefile            | 12 ++++--------
 spec/spec.opts      |  4 ----
 spec/spec_helper.rb |  8 ++------
 5 files changed, 9 insertions(+), 19 deletions(-)
 create mode 100644 .rspec
 delete mode 100644 spec/spec.opts

diff --git a/.rspec b/.rspec
new file mode 100644
index 00000000..fd2f27b9
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--colour
+--format s
diff --git a/Gemfile b/Gemfile
index 9fc9776c..f91e271c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source :rubygems
 
 gem "compass", :path => "."
 gem "cucumber"
-gem "rspec"
+gem "rspec", "~>2.0.0"
 gem "rails", "~>3.0.0.rc"
 gem "compass-validator", "3.0.0"
 gem "css_parser"
diff --git a/Rakefile b/Rakefile
index 4caf9ff8..772acd60 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,15 +30,11 @@ To run with an alternate version of Haml & Sass, make test/haml a symlink to tha
 END
 
 begin
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.spec_files = FileList['spec/**/*_spec.rb']
-  end
+  require 'rspec/core/rake_task'
 
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
+  RSpec::Core::RakeTask.new(:spec)
+
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
     spec.rcov = true
   end
 
diff --git a/spec/spec.opts b/spec/spec.opts
deleted file mode 100644
index 47f8fecb..00000000
--- a/spec/spec.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---colour
---format s
---loadby mtime
---reverse
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a07f52fb..ed8072e9 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,12 +3,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
 require 'compass'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
 IMAGES_TMP_PATH = File.join(File.dirname(__FILE__), 'images-tmp')
 Compass::Sprites.images_path = IMAGES_TMP_PATH
-
-Spec::Runner.configure do |config|
-  
-end