prep 2.5.1 release

features/Autotest.md

@@ -1,44 +1,14 @@
-RSpec ships with a specialized subclass of Autotest. You can pass the --style
-option to the autotest command to tell Autotest to load this subclass:
-
-    $ autotest --style rspec2
-
-Alternatively, you can configure your project such that this happens
-automatically, in which case you can just type:
+RSpec ships with a specialized subclass of Autotest. To tell RSpec to tell
+Autotest to use RSpec's extension, just add a `.rspec` file to your project's
+root directory. Then, just type:
 
     $ autotest
 
-Here's how:
-
-#### rspec-2.3 and up
-
-Add a .rspec file to the project's root directory if it's not already there.
-You can use this to configure RSpec options, but you don't have to. As long as
-RSpec sees this file, it will tell Autotest to use the "rspec2" style.
-
-#### rspec-2.2 and down
-
-Add an autotest directory to the project root, and add a file named discover.rb to
-that directory with the following:
-
-    # in ./autotest/discover.rb
-    Autotest.add_discovery {"rspec2"}
-
-NOTE that this approach will not be supported by future versions of ZenTest on
-Ruby-1.9.
-
-### `bundle exec`
-
-By default, RSpec adds `bundle exec` to the command generated by Autotest if
-there is a `Gemfile` in the project root directory.
-
-As of rspec-core-2.5, this automatic inclusion of 'bundle exec' is deprecated.
-If you want to include 'bundle exec', use Autotest's bundler plugin by adding
-a .autotest file to the project root directory with the following:
-
-  require 'autotest/bundler'
+### Bundler
 
-If you want to skip 'bundle exec', pass `--skip-bundler` to the `autotest`
-command and it won't include `bundle exec` even if there is a `Gemfile`.
+If you are using Bundler in your app, and you want the shell command to include
+`bundle exec`, require the Autotest bundler plugin in a `.autotest` file in the project's
+root directory or your home directory:
 
-    autotest -- --skip-bundler
+    # in .autotest
+    require "autotest/bundler"

features/Changelog.md

@@ -1,3 +1,20 @@
+### 2.5.1 / 2011-02-05
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.5.0...v2.5.1)
+
+NOTE: this release breaks compatibility with rspec/autotest/bundler
+integration, but does so in order to greatly simplify it.
+
+With this release, if you want the generated autotest command to include
+'bundle exec', require Autotest's bundler plugin in a .autotest file in the
+project's root directory or in your home directory:
+
+    require "autotest/bundler"
+
+Now you can just type 'autotest' on the commmand line and it will work as you expect.
+
+If you don't want 'bundle exec', there is nothing you have to do.
+
 ### 2.5.0 / 2011-02-05
 
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.4.0...v2.5.0)

lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.5.0'
+      STRING = '2.5.1'
     end
   end
 end