rspec-core 2.5.0 → 2.5.1

data/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"

data/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)

data/lib/autotest/rspec2.rb

@@ -5,15 +5,10 @@ class RSpecCommandError < StandardError; end
 
 class Autotest::Rspec2 < Autotest
 
-  attr_reader :cl_args, :skip_bundler
-  alias_method :skip_bundler?, :skip_bundler
-
   SPEC_PROGRAM = File.expand_path('../../../bin/rspec', __FILE__)
 
   def initialize
     super()
-    @cl_args = ARGV.dup << "--tty"
-    @skip_bundler = @cl_args.delete("--skip-bundler")
     clear_mappings
     setup_rspec_project_mappings
 
@@ -46,9 +41,8 @@ class Autotest::Rspec2 < Autotest
   end
 
   def make_test_cmd(files_to_test)
-    warn_about_bundler if rspec_wants_bundler? && !autotest_wants_bundler?
     files_to_test.empty? ? '' :
-      "#{prefix}#{ruby}#{suffix} -S #{SPEC_PROGRAM} #{cl_args.join(' ')} #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
+      "#{prefix}#{ruby}#{suffix} -S #{SPEC_PROGRAM} --tty #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
   end
 
   def normalize(files_to_test)
@@ -58,55 +52,12 @@ class Autotest::Rspec2 < Autotest
     end
   end
 
-  def warn_about_bundler
-    RSpec.warn_deprecation <<-WARNING
-
-****************************************************************************
-DEPRECATION WARNING: you are using deprecated behaviour that will be removed
-from a future version of RSpec.
-
-RSpec's autotest extension is relying on the presence of a Gemfile in the
-project root directory to generate a command including 'bundle exec'.
-
-You have two options to suppress this message:
-
-If you want to include 'bundle exec' in the command, add a .autotest file to
-the project root with the following content:
-
-  require 'autotest/bundler'
-
-If you want to _not_include 'bundle exec' in the command, pass --skip-bundler
-to autotest as an extra argument, like this:
-
-  autotest -- --skip-bundler
-*****************************************************************
-WARNING
-  end
-
-  alias_method :autotest_prefix, :prefix
-
-  def rspec_prefix
-    (rspec_wants_bundler? && !autotest_wants_bundler?) ? "bundle exec " : ""
-  end
-
-  def prefix
-    skip_bundler? ? "#{rspec_prefix}#{autotest_prefix}".gsub("bundle exec","") : "#{rspec_prefix}#{autotest_prefix}"
-  end
-
-  def autotest_wants_bundler?
-    autotest_prefix =~ /bundle exec/
-  end
-
   def suffix
     using_bundler? ? "" : defined?(:Gem) ? " -rrubygems" : ""
   end
 
-  def rspec_wants_bundler?
-    gemfile? && !skip_bundler?
-  end
-
   def using_bundler?
-    rspec_wants_bundler? || autotest_wants_bundler?
+    prefix =~ /bundle exec/
   end
 
   def gemfile?

data/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

data/spec/autotest/rspec_spec.rb

@@ -6,135 +6,13 @@ describe Autotest::Rspec2 do
   let(:ruby_cmd) { "ruby" }
 
   before do
-    RSpec.stub(:warn_deprecation)
     File.stub(:exist?) { false }
-    @orig_argv = ARGV.dup; ARGV.clear
   end
 
-  after  { ARGV.clear; ARGV.concat(@orig_argv) }
-
-  context "with ARGV" do
-    it "passes ARGV to command" do
-      ARGV.concat(%w[-c -f d])
-      rspec_autotest.cl_args.should eq(%w[-c -f d --tty])
-    end
-
-    context "with --skip-bundler" do
-      before do
-        ARGV.concat(%w[--skip-bundler])
-      end
-      it "extracts --skip-bundler" do
-        rspec_autotest.cl_args.should eq(%w[--tty])
-      end
-
-      it "sets skip_bundler? true" do
-        rspec_autotest.skip_bundler?.should be_true
-      end
-    end
-  end
-
-  describe "handling bundler" do
-    context "gemfile, no prefix" do
-      before do
-        File.stub(:exist?).with("./Gemfile") { true }
-      end
-
-      it "warns of deprecation of implicit inclusion of 'bundle exec'" do
-        RSpec.should_receive(:warn_deprecation)
-        rspec_autotest.make_test_cmd({})
-      end
-
-      it "includes bundle exec" do
-        rspec_autotest.
-          make_test_cmd({'a' => 'b'}).should match(/bundle exec/)
-      end
-    end
-
-    context "gemfile, no prefix, --skip-bundler" do
-      before do
-        File.stub(:exist?).with("./Gemfile") { true }
-        ARGV.concat(%w[--skip-bundler])
-      end
-
-      it "does not warn" do
-        RSpec.should_not_receive(:warn_deprecation)
-        rspec_autotest.make_test_cmd({})
-      end
-
-      it "does not include bundle exec" do
-        rspec_autotest.
-          make_test_cmd({'a' => 'b'}).should_not match(/bundle exec/)
-      end
-    end
-
-    context "no gemfile, prefix" do
-      before do
-        File.stub(:exist?).with("./Gemfile") { false }
-      end
-
-      it "does not warn" do
-        RSpec.should_not_receive(:warn_deprecation)
-        rspec_autotest.make_test_cmd({'a' => 'b'})
-      end
-
-      it "includes bundle exec" do
-        rspec_autotest.prefix = "bundle exec "
-        rspec_autotest.
-          make_test_cmd({'a' => 'b'}).should match(/bundle exec/)
-      end
-    end
-
-    context "gemfile, prefix" do
-      before do
-        File.stub(:exist?).with("./Gemfile") { true }
-        rspec_autotest.prefix = "bundle exec "
-      end
-
-      it "does not warn" do
-        RSpec.should_not_receive(:warn_deprecation)
-        rspec_autotest.make_test_cmd({'a' => 'b'})
-      end
-
-      it "includes bundle exec" do
-        rspec_autotest.prefix = "bundle exec "
-        rspec_autotest.
-          make_test_cmd({'a' => 'b'}).should match(/bundle exec/)
-      end
-    end
-
-    context "gemfile, prefix, --skip-bundler" do
-      before do
-        File.stub(:exist?).with("./Gemfile") { true }
-        rspec_autotest.prefix = "bundle exec "
-        rspec_autotest.stub(:skip_bundler?) { true }
-      end
-
-      it "does not warn" do
-        RSpec.should_not_receive(:warn_deprecation)
-        rspec_autotest.make_test_cmd({'a' => 'b'})
-      end
-
-      it "does not include bundle exec" do
-        rspec_autotest.
-          make_test_cmd({'a' => 'b'}).should_not match(/bundle exec/)
-      end
-    end
-
-    context "no gemfile, no prefix" do
-      before do
-        File.stub(:exist?).with("./Gemfile") { false }
-      end
-
-      it "does not warn" do
-        RSpec.should_not_receive(:warn_deprecation)
-        rspec_autotest.make_test_cmd({'a' => 'b'})
-      end
-
-      it "does not include bundle exec" do
-        rspec_autotest.
-          make_test_cmd({'a' => 'b'}).should_not match(/bundle exec/)
-      end
-    end
+  it "uses autotest's prefix" do
+    rspec_autotest.prefix = "this is the prefix "
+    rspec_autotest.
+      make_test_cmd({'a' => 'b'}).should match(/this is the prefix/)
   end
 
   describe "commands" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Chad Humphries
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 -06:00
+date: 2011-02-06 00:00:00 -06:00
 default_executable: rspec
 dependencies: []
 
@@ -230,7 +230,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.5.0
+summary: rspec-core-2.5.1
 test_files: 
 - features/Autotest.md
 - features/Changelog.md