From a69cdf110352bad08718bf8736817c213a2ea8a4 Mon Sep 17 00:00:00 2001
From: Matthew Lehner <matthewlehner@gmail.com>
Date: Thu, 13 Dec 2012 14:49:15 -0800
Subject: [PATCH 1/2] remove deprecated rspec option from guardfile

---
 Guardfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Guardfile b/Guardfile
index 5279189..f24ee41 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2, :cli => '-c' do
+guard 'rspec', :cli => '-c' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

From 657157fcf6b821518f2044a3e6543fe237e3fbef Mon Sep 17 00:00:00 2001
From: Matthew Lehner <matthewlehner@gmail.com>
Date: Thu, 13 Dec 2012 14:49:31 -0800
Subject: [PATCH 2/2] fix deprecated require for mocha

---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 96ab0b9..d5e604a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require 'mocha'
+require 'mocha/api'
 require 'webmock/rspec'
 
 require 'rack-livereload'