From 470c8043af5979f977fb701d04f7ca4394c098ae Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nlloyds@gmail.com>
Date: Mon, 20 Jun 2011 21:44:35 -0500
Subject: [PATCH 1/2] fix rspec warnings

---
 Rakefile            | 4 ++--
 spec/spec_helper.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index f693bb1..eeba521 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,7 +13,7 @@ task :default => :spec
 task :release => :man
 
 desc "Run all specs"
-Rspec::Core::RakeTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
@@ -22,7 +22,7 @@ task :rcov => "rcov:build" do
   %x{ open coverage/index.html }
 end
 
-Rspec::Core::RakeTask.new("rcov:build") do |t|
+RSpec::Core::RakeTask.new("rcov:build") do |t|
   t.pattern = 'spec/**/*_spec.rb'
   t.rcov = true
   t.rcov_opts = [ "--exclude", ".bundle", "--exclude", "spec" ]
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a6f1cc6..dbd2468 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -52,7 +52,7 @@ def example_export_file(filename)
   data
 end
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.color_enabled = true
   config.include FakeFS::SpecHelpers
   config.mock_with :rr

From f65538c1b13084e8a39412567b9f5f7d1eae34ba Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nlloyds@gmail.com>
Date: Mon, 20 Jun 2011 21:58:16 -0500
Subject: [PATCH 2/2] update rspec to 2.6

---
 Gemfile.lock    | 20 +++++++++-----------
 foreman.gemspec |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d7387f3..8b6bac8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,16 +28,14 @@ GEM
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
     rr (1.0.2)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.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)
     term-ansicolor (1.0.5)
     thor (0.14.6)
 
@@ -52,4 +50,4 @@ DEPENDENCIES
   rcov (~> 0.9.8)
   ronn
   rr (~> 1.0.2)
-  rspec (~> 2.0.0)
+  rspec (~> 2.6.0)
diff --git a/foreman.gemspec b/foreman.gemspec
index 583efd1..b622286 100644
--- a/foreman.gemspec
+++ b/foreman.gemspec
@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'fakefs', '~> 0.2.1'
   gem.add_development_dependency 'rcov',   '~> 0.9.8'
   gem.add_development_dependency 'rr',     '~> 1.0.2'
-  gem.add_development_dependency 'rspec',  '~> 2.0.0'
+  gem.add_development_dependency 'rspec',  '~> 2.6.0'
 end