Upgrade to RSpec 2

request-log-analyzer.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.requirements << "To use the database inserter, ActiveRecord and an appropriate database adapter are required."
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec', '~> 2.0')
 
   s.add_development_dependency('activerecord')
   s.add_development_dependency('sqlite3-ruby')

spec/lib/helpers.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Helpers
+module RequestLogAnalyzer::RSpec::Helpers
 
   # Create or return a new TestingFormat
   def testing_format

spec/lib/macros.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Macros
+module RequestLogAnalyzer::RSpec::Macros
 
   def test_databases
     require 'yaml'

spec/lib/matchers.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Matchers
+module RequestLogAnalyzer::RSpec::Matchers
 
   class HasLineDefinition
 

spec/lib/mocks.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Mocks
+module RequestLogAnalyzer::RSpec::Mocks
 
   def mock_source
     source = mock('RequestLogAnalyzer::Source::Base')

spec/spec_helper.rb

@@ -1,11 +1,10 @@
-$:.reject! { |e| e.include? 'TextMate' }
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-require 'spec/autorun'
+require 'rspec'
 require 'request_log_analyzer'
 
-module RequestLogAnalyzer::Spec
+module RequestLogAnalyzer::RSpec
 end
 
 # Include all files in the spec_helper directory
@@ -15,10 +14,10 @@ module RequestLogAnalyzer::Spec
 
 Dir.mkdir("#{File.dirname(__FILE__)}/../tmp") unless File.exist?("#{File.dirname(__FILE__)}/../tmp")
 
-Spec::Runner.configure do |config|
-  config.include RequestLogAnalyzer::Spec::Matchers
-  config.include RequestLogAnalyzer::Spec::Mocks
-  config.include RequestLogAnalyzer::Spec::Helpers
+RSpec.configure do |config|
+  config.include RequestLogAnalyzer::RSpec::Matchers
+  config.include RequestLogAnalyzer::RSpec::Mocks
+  config.include RequestLogAnalyzer::RSpec::Helpers
 
-  config.extend RequestLogAnalyzer::Spec::Macros
+  config.extend RequestLogAnalyzer::RSpec::Macros
 end

tasks/github-gem.rake

@@ -71,23 +71,23 @@ module GithubGem
 
     # Defines RSpec tasks
     def define_rspec_tasks!
-      require 'spec/rake/spectask'
+      require 'rspec/core/rake_task'
 
       namespace(:spec) do
         desc "Verify all RSpec examples for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:basic) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:basic) do |t|
+          t.pattern = spec_pattern
         end
 
         desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        Spec::Rake::SpecTask.new(:specdoc) do |t|
-          t.spec_files = FileList[spec_pattern]
-          t.spec_opts << '--format' << 'specdoc' << '--color'
+        RSpec::Core::RakeTask.new(:specdoc) do |t|
+          t.pattern = spec_pattern
+          t.rspec_opts = ['--format', 'documentation', '--color']
         end
 
         desc "Run RCov on specs for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:rcov) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:rcov) do |t|
+          t.pattern = spec_pattern
           t.rcov = true
           t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
         end