upgrade to rspec 2

4 files changed, 7 insertions, 25 deletions

diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..7438fbe
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--colour
+--format documentation
diff --git a/Rakefile b/Rakefile
index ef1f701..62ca74b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -20,34 +20,17 @@ rescue LoadError
 end
 
 begin
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-    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(:spec) do |spec|
     spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
   end
+
 rescue LoadError
   task :spec do
     abort "Rspec is not available. (sudo) gem install rspec to run unit tests"
   end
 end
 
-
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
-end
-
 task :default => :spec
 
 require 'rake/rdoctask'
diff --git a/spec/mixlib/log_spec.rb b/spec/mixlib/log_spec.rb
index d064871..57c8a5b 100644
--- a/spec/mixlib/log_spec.rb
+++ b/spec/mixlib/log_spec.rb
@@ -18,6 +18,7 @@
 #
 
 require 'tempfile'
+require 'stringio'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 
 describe Mixlib::Log do
@@ -98,7 +99,7 @@ describe Mixlib::Log do
   end
   
   it "should default to STDOUT if init is called with no arguments" do
-    logger_mock = mock(Logger, :null_object => true)
+    logger_mock = Struct.new(:formatter, :level).new
     Logger.stub!(:new).and_return(logger_mock)
     Logger.should_receive(:new).with(STDOUT).and_return(logger_mock)
     Logit.init
diff --git a/spec/spec.opts b/spec/spec.opts
deleted file mode 100644
index 7636dbe..0000000
--- a/spec/spec.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---colour
---format specdoc
---loadby mtime
---reverse