From 71e23348830842a5be4f529d33145575157c4b24 Mon Sep 17 00:00:00 2001
From: Rob Olson <rob@squareup.com>
Date: Wed, 29 Jun 2011 14:12:40 -0700
Subject: [PATCH] Upgrade to RSpec2

---
 .gitignore          |  2 +-
 Rakefile            | 18 +++---------------
 rack-geo.gemspec    |  2 +-
 spec/spec.opts      |  4 ----
 spec/spec_helper.rb |  9 +++++----
 5 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 spec/spec.opts

diff --git a/.gitignore b/.gitignore
index 49a3f9c..639fa83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-pkg/*
+*.gem
 /Gemfile.lock
 
diff --git a/Rakefile b/Rakefile
index e6fadde..7f30742 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,19 +1,7 @@
-require 'rubygems'
+require 'bundler/setup'
 require 'rake'
-require 'spec/rake/spectask'
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ["--options", "spec/spec.opts"]
-  t.spec_files = FileList["spec/**/*_spec.rb"]
-  t.rcov = ENV["RCOV"]
-  t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
-  t.verbose = true
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-desc "Remove trailing whitespace"
-task :whitespace do
-  sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
-end
diff --git a/rack-geo.gemspec b/rack-geo.gemspec
index 5ef29df..a0e2e1c 100644
--- a/rack-geo.gemspec
+++ b/rack-geo.gemspec
@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack', '~> 1.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rack-test', '~> 0.5'
-  s.add_development_dependency 'rspec', '1.3.0'
+  s.add_development_dependency 'rspec', '~> 2.6'
 end
diff --git a/spec/spec.opts b/spec/spec.opts
deleted file mode 100644
index 391705b..0000000
--- a/spec/spec.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---colour
---format progress
---loadby mtime
---reverse
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e3c5d85..7bbe5d5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,8 @@
-require 'rubygems'
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
+require 'bundler/setup'
 
 require 'rack-geo'
-require 'spec/expectations'
 require 'rack/test'
+require 'rspec'
+
+RSpec.configure do |config|
+end