Gemfile

@@ -1,5 +1,9 @@
 source "http://rubygems.org"
 
+%w[rspec-core rspec-expectations rspec-mocks].each do |lib|
+  gem lib, :path => File.expand_path("../../#{lib}", __FILE__)
+end
+
 gem "rake"
 gem "cucumber", "0.8.5"
 gem "aruba", "0.2.2"
@@ -11,9 +15,10 @@ gem "rr"
 gem "flexmock"
 gem "nokogiri"
 gem "syntax"
-gem "rspec-core", :path => "."
-gem "rspec-expectations", :path => "../rspec-expectations"
-gem "rspec-mocks", :path => "../rspec-mocks"
+gem "relish", "~> 0.0.3"
+gem "guard-rspec"
+gem "growl"
+gem "rb-fsevent"
 
 unless RUBY_PLATFORM == "java"
   gem "ruby-prof"

Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', :version => 2 do
+  watch('^spec/(.*)_spec.rb')
+  watch('^lib/(.*)\.rb')         { |m| "spec/#{m[1]}_spec.rb" }
+  watch('^spec/spec_helper.rb')  { "spec" }
+end

History.markdown

@@ -1,14 +1,45 @@
 ## rspec-core release history (incomplete)
 
-### 2.0.1 / in development
+### 2.1.0 / 2010-11-07
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.0.1...v2.1.0)
+
+* Enhancments
+  * Add skip_bundler option to rake task to tell rake task to ignore the
+    presence of a Gemfile (jfelchner)
+  * Add gemfile option to rake task to tell rake task what Gemfile to look
+    for (defaults to 'Gemfile')
+  * Allow passing caller trace into Metadata to support extensions (Glenn
+    Vanderburg)
+  * Add deprecation warning for Spec::Runner.configure to aid upgrade from
+    RSpec-1
+  * Add deprecated Spec::Rake::SpecTask to aid upgrade from RSpec-1
+  * Add 'autospec' command with helpful message to aid upgrade from RSpec-1
+  * Add support for filtering with tags on CLI (Lailson Bandeira)
+  * Add a helpful message about RUBYOPT when require fails in bin/rspec
+    (slyphon)
+  * Add "-Ilib" to the default rcov options (Tianyi Cui)
+  * Make the expectation framework configurable (default rspec, of course)
+    (Justin Ko)
+  * Add 'pending' to be conditional (Myron Marston)
+  * Add explicit support for :if and :unless as metadata keys for conditional run
+    of examples (Myron Marston)
+  * Add --fail-fast command line option (Jeff Kreeftmeijer)
 
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.0.0...master)
+* Bug fixes
+  * Eliminate stack overflow with "subject { self }"
+  * Require 'rspec/core' in the Raketask (ensures it required when running rcov)
+
+### 2.0.1 / 2010-10-18
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.0.0...v2.0.1)
 
 * Bug fixes
-  * restore color when using spork + autotest
+  * Restore color when using spork + autotest
   * Pending examples without docstrings render the correct message (Josep M. Bach)
   * Fixed bug where a failure in a spec file ending in anything but _spec.rb would
     fail in a confusing way.
+  * Support backtrace lines from erb templates in html formatter (Alex Crichton)
 
 ### 2.0.0 / 2010-10-10
 
@@ -27,7 +58,7 @@
 
 * Enhancements
   * implicitly require unknown formatters so you don't have to require the
-    file explicitly on the commmand line (Michael Grosser) 
+    file explicitly on the commmand line (Michael Grosser)
   * add --out/-o option to assign output target
   * added fail_fast configuration option to abort on first failure
   * support a Hash subject (its([:key]) { should == value }) (Josep M. Bach)

README.markdown

@@ -2,13 +2,20 @@
 
 Behaviour Driven Development for Ruby
 
-## Upgrading from rspec-1.x
+## Documentation
 
-See [Upgrade.markdown](http://github.com/rspec/rspec-core/blob/master/Upgrade.markdown)
+* [Cucumber features](http://relishapp.com/rspec/rspec-core/v/2-0)
+* [RDoc](http://rubydoc.info/gems/rspec-core/2.0.1/frames)
 
 ## Install
 
-    gem install rspec -v 2.0.0
+    gem install rspec      # for rspec-core, rspec-expectations, rspec-mocks
+    gem install rspec-core # for rspec-core only
+
+## Upgrading from rspec-1.x
+
+See [Upgrade.markdown](http://github.com/rspec/rspec-core/blob/master/Upgrade.markdown)
+
 
 This will install the rspec, rspec-core, rspec-expectations and rspec-mocks
 gems.

Rakefile

@@ -18,10 +18,6 @@ class Cucumber::Rake::Task::ForkedCucumberRunner
   end
 end
 
-task :cleanup_rcov_files do
-  rm_rf 'coverage.data'
-end
-
 desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_path = 'bin/rspec'
@@ -30,25 +26,28 @@ end
 
 Cucumber::Rake::Task.new(:cucumber)
 
-namespace :spec do
-  desc "Run all examples using rcov"
-  RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+namespace :rcov do
+  task :cleanup do
+    rm_rf 'coverage.data'
+  end
+
+  RSpec::Core::RakeTask.new :spec do |t|
     t.rcov = true
     t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
-    t.rcov_opts << %[--text-report --sort coverage --no-html --aggregate coverage.data]
+    t.rcov_opts << %[--no-html --aggregate coverage.data]
   end
-end
 
-namespace :cucumber do
-  desc "Run cucumber features using rcov"
-  Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
+  Cucumber::Rake::Task.new :cucumber do |t|
     t.cucumber_opts = %w{--format progress}
     t.rcov = true
     t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
     t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
   end
+
 end
 
+task :rcov => ["rcov:cleanup", "rcov:spec", "rcov:cucumber"]
+
 task :default => [:spec, :cucumber]
 
 task :clobber do
@@ -60,7 +59,7 @@ end
 desc "Push cukes to relishapp using the relish-client-gem"
 task :relish, :version do |t, args|
   raise "rake relish[VERSION]" unless args[:version]
-  sh "bundle exec relish --organization rspec --project rspec-core -v #{args[:version]} push"
+  sh "relish push --organization rspec --project rspec-core -v #{args[:version]}"
 end
 
 Rake::RDocTask.new do |rdoc|