Upgrade to RSpec2

.gitignore

@@ -1,3 +1,3 @@
-pkg/*
+*.gem
 /Gemfile.lock
 

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

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

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