rspec-core 2.4.0 → 2.5.0

data/.gitignore

@@ -1,3 +1,4 @@
+.rvmrc
 *.sw?
 .DS_Store
 coverage*

data/Gemfile

@@ -14,7 +14,7 @@ end
 gem "rake", "0.8.7"
 gem "cucumber", "0.9.4"
 gem "aruba", "0.2.2"
-gem "rcov", "0.9.9"
+gem "rcov", "0.9.9", :platforms => :mri
 gem "relish", "0.2.0"
 gem "guard-rspec", "0.1.9"
 gem "growl", "1.0.3"
@@ -26,10 +26,15 @@ if RUBY_PLATFORM =~ /darwin/
   gem "autotest-growl", "~> 0.2.9"
 end
 
-gem "ruby-debug", :platforms => :ruby_18
-gem "ruby-debug19", "~> 0.11.6", :platforms => :ruby_19
+gem "ruby-debug", :platforms => :mri_18
+gem "ruby-debug19", "~> 0.11.6", :platforms => :mri_19
 
-platforms :ruby_18, :ruby_19 do
+case RUBY_VERSION
+  when '1.9.1'; gem 'ruby-debug-base19', '0.11.23'
+  when '1.9.2'; gem 'ruby-debug-base19', '0.11.24'
+end
+
+platforms :mri_18, :mri_19 do
   gem "rb-fsevent", "~> 0.3.9"
   gem "ruby-prof", "~> 0.9.2"
 end

data/Guardfile

@@ -1,5 +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" }
+  watch(/^spec\/(.*)_spec.rb/)
+  watch(/^lib\/(.*)\.rb/)         { |m| "spec/#{m[1]}_spec.rb" }
+  watch(/^spec\/spec_helper.rb/)  { "spec" }
 end

data/README.md

@@ -22,7 +22,7 @@ tracker](https://github.com/rspec/rspec-core/issues).
 
 ## Upgrading from rspec-1.x
 
-See [Upgrade.markdown](http://github.com/rspec/rspec-core/blob/master/Upgrade.markdown)
+See [features/Upgrade.md](http://github.com/rspec/rspec-core/blob/master/features/Upgrade.md)
 
 
 This will install the rspec, rspec-core, rspec-expectations and rspec-mocks

data/features/.nav

@@ -1,18 +1,23 @@
 - Upgrade.md
 - Changelog.md
+- Autotest.md
 - example_groups:
   - basic_structure.feature
   - shared_example_group.feature
+- pending:
+  - pending_examples.feature
 - hooks:
   - before_and_after_hooks.feature
   - around_hooks.feature
-- pending:
-  - pending_examples.feature
+  - filtering.feature
 - subject:
   - implicit_subject.feature
   - explicit_subject.feature
   - attribute_of_subject.feature
   - implicit_receiver.feature
+- helper_methods:
+  - let.feature
+  - arbitrary_methods.feature
 - metadata:
   - described_class.feature
 - filtering:

data/features/{README.markdown → Autotest.md}

@@ -1,15 +1,3 @@
-rspec-core provides the structure for RSpec code examples:
-
-    describe Account do
-      it "has a balance of zero when first opened" do
-        # example code goes here - for more on the 
-        # code inside the examples, see rspec-expectations 
-        # and rspec-mocks
-      end
-    end
-
-### Autotest integration
-
 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:
 
@@ -36,12 +24,21 @@ that directory with the following:
     # in ./autotest/discover.rb
     Autotest.add_discovery {"rspec2"}
 
-## Issues
+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'
+
+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`.
 
-The documentation for rspec-core is a work in progress. We'll be adding
-Cucumber features over time, and clarifying existing ones.  If you have
-specific features you'd like to see added, find the existing documentation
-incomplete or confusing, or, better yet, wish to write a missing Cucumber
-feature yourself, please [submit an
-issue](http://github.com/rspec/rspec-core/issues) or a [pull
-request](http://github.com/rspec/rspec-core).
+    autotest -- --skip-bundler

data/features/Changelog.md

@@ -1,4 +1,59 @@
-## rspec-core release history (incomplete)
+### 2.5.0 / 2011-02-05
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.4.0...v2.5.0)
+
+* Enhancements
+  * Autotest::Rspec2 parses command line args passed to autotest after '--'
+  * --skip-bundler option for autotest command
+  * Autotest regexp fixes (Jon Rowe)
+  * Add filters to html and textmate formatters (Daniel Quimper)
+  * Explicit passing of block (need for JRuby 1.6) (John Firebaugh)
+
+* Bug fixes
+  * fix dom IDs in HTML formatter (Brian Faherty)
+  * fix bug with --drb + formatters when not running in drb
+  * include --tag options in drb args (monocle)
+  * fix regression so now SPEC_OPTS take precedence over CLI options again
+    (Roman Chernyatchik)
+  * only call its(:attribute) once (failing example from Brian Dunn)
+  * fix bizarre bug where rspec would hang after String.alias :to_int :to_i
+    (Damian Nurzynski)
+
+* Deprecations
+  * implicit inclusion of 'bundle exec' when Gemfile present (use autotest's
+    bundler plugin instead)
+
+### 2.4.0 / 2011-01-02
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.3.1...v2.4.0)
+
+* Enhancements
+  * start the debugger on -d so the stack trace is visible when it stops
+    (Clifford Heath)
+  * apply hook filtering to examples as well as groups (Myron Marston)
+  * support multiple formatters, each with their own output
+  * show exception classes in failure messages unless they come from RSpec
+    matchers or message expectations
+  * before(:all) { pending } sets all examples to pending
+
+* Bug fixes
+  * fix bug due to change in behavior of reject in Ruby 1.9.3-dev (Shota Fukumori)
+  * fix bug when running in jruby: be explicit about passing block to super
+    (John Firebaugh)
+  * rake task doesn't choke on paths with quotes (Janmejay Singh)
+  * restore --options option from rspec-1
+  * require 'ostruct' to fix bug with its([key]) (Kim Burgestrand)
+  * --configure option generates .rspec file instead of autotest/discover.rb
+
+### 2.3.1 / 2010-12-16
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.3.0...v2.3.1)
+
+* Bug fixes
+  * send debugger warning message to $stdout if RSpec.configuration.error_stream
+    has not been defined yet. 
+  * HTML Formatter _finally_ properly displays nested groups (Jarmo Pertman)
+  * eliminate some warnings when running RSpec's own suite (Jarmo Pertman)
 
 ### 2.3.0 / 2010-12-12
 
@@ -44,7 +99,7 @@
   * debugger statements _just work_ as long as ruby-debug is installed
     * otherwise you get warned, but not fired
   * Expose example.metadata in around hooks
-  * Performance improvments (see [Upgrade.markdown](https://github.com/rspec/rspec-core/blob/master/Upgrade.markdown))
+  * Performance improvments (much faster now)
 
 * Bug fixes
   * Make sure --fail-fast makes it across drb

data/features/README.md

@@ -0,0 +1,17 @@
+rspec-core provides the structure for RSpec code examples:
+
+    describe Account do
+      it "has a balance of zero when first opened" do
+        # example code goes here - for more on the 
+        # code inside the examples, see rspec-expectations 
+        # and rspec-mocks
+      end
+    end
+
+## Issues
+
+This documentation is [open
+source](https://github.com/rspec/rspec-core/tree/master/features), and a work
+in progress.  If you find it incomplete or confusing, please [submit an
+issue](http://github.com/rspec/rspec-core/issues), or, better yet, [a pull
+request](http://github.com/rspec/rspec-core).

data/features/Upgrade.md

@@ -1,59 +1,17 @@
 # rspec-core-2.3
 
-## autotest integration
-
-Add a .rspec file to the project's root directory to tell RSpec to tell
-Autotest to use RSpec's specialized Autotest class.
-
-NOTE that rspec-core-2.0, 2.1, and 2.2 required an autotest/discover.rb file in
-the project's root directory. This worked with some, but not all versions of
-autotest and/or the autotest command that ships with ZenTest. This new approach
-will work regardless of which version of autotest/ZenTest you are using.
-
-## config.expect_with
+## `config.expect_with`
 
 Use this to configure RSpec to use rspec/expectations (default),
-test/unit/assertions, or both:
+stdlib assertions (Test::Unit with Ruby 1.8, MiniTest with Ruby 1.9),
+or both:
 
     RSpec.configure do |config|
       config.expect_with :rspec          # => rspec/expectations
-      config.expect_with :stdlib         # => test/unit/assertions
+      config.expect_with :stdlib         # => Test::Unit or MinitTest
       config.expect_with :rspec, :stdlib # => both
     end
 
-# rspec-core-2.2
-
-## FASTER!
-
-Made several small optimizations that all add up to a considerable improvement
-in performance. Using a simple benchmark:
-
-    generate 5000 example groups,
-    each with one example,
-    each with one passing expectation
-
-Run using ruby-1.9.2 on Mac OS X w/ 3.06 G
-
-* rspec-2.1
-  * loaded in 0.85 on avg
-  * ran in 2.61 on avg
-* rspec-2.2
-  * loaded in 0.73 on avg (~15% improvement)
-  * ran in 0.94 on avg    (~64% improvement**)
-    
-** this does _not_ mean your suite will be 64% faster, but it does mean that
-   the overhead incurred by RSpec in your suite should be roughly 64% less.
-
-## Command line
-
-### --debug/-d is now deprecated
-
-This command line option is now has no effect (other than a deprecation
-warning). To use the debugger, just add a `debugger` statement anywhere in your
-code. As long as you have ruby-debug installed, it will just work. If you
-don't, then you'll get a friendly warning telling you what's going on, but
-execution will continue.
-
 # rspec-core-2.1
 
 ## Command line
@@ -205,9 +163,9 @@ passed to `it_should_behave_like`.
 See [features/example\_groups/shared\_example\_group.feature](http://github.com/rspec/rspec-core/blob/master/features/example_groups/shared_example_group.feature) for more information.
 
 NOTICE: The including example groups no longer have access to any of the
-methods, hooks, or state defined inside a shared group. This will break specs
-that were using shared example groups to extend the behavior of including
-groups in any way besides their intended purpose: to add examples to a group.
+methods, hooks, or state defined inside a shared group. This will break rspec-1
+specs that were using shared example groups to extend the behavior of including
+groups.
 
 # Upgrading from rspec-1.x
 
@@ -278,23 +236,7 @@ A few things changed in the Rake task used to run specs:
 
 ### autotest
 
-RSpec-2 works with autotest as follows:
-
-    rspec --configure autotest
-
-This adds `./autotest/discover.rb` with:
-
-    Autotest.add_discovery { "rspec2" }
-
-Now, on the command line just type:
-
-    autotest
-
-Or, if you're using bundler:
-
-    bundle exec autotest
-
-The `autospec` command is a thing of the past. 
+`autospec` is dead. Long live `autotest`.
 
 ### RSpec is the new Spec
 

data/features/command_line/configure.feature

@@ -11,7 +11,7 @@ Feature: --configure option
     When I run "rspec --configure autotest"
     Then the following files should exist:
       | .rspec |
-    And the stdout should contain ".rspec file did not exist, so it was created."
+    And the output should contain ".rspec file did not exist, so it was created."
 
   Scenario: .rspec file already exists
     Given a file named ".rspec" with:
@@ -19,4 +19,4 @@ Feature: --configure option
       --color
       """
     When I run "rspec --configure autotest"
-    Then the stdout should contain ".rspec file already exists, so nothing was changed."
+    Then the output should contain ".rspec file already exists, so nothing was changed."

data/features/command_line/example_name_option.feature

@@ -47,40 +47,40 @@ Feature: --example option
 
   Scenario: no matches
     When I run "rspec . --example nothing_like_this"
-    Then the output should contain "0 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: match on one word
     When I run "rspec . --example example"
-    Then the output should contain "7 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: one match in each context
     When I run "rspec . --example 'first example'"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: one match in one file using just the example name
     When I run "rspec . --example 'first example in first group'"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: one match in one file using the example name and the group name
     When I run "rspec . --example 'first group first example in first group'"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: one match in one file using regexp
     When I run "rspec . --example 'first .* first example'"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: all examples in one group
     When I run "rspec . --example 'first group'"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: one match in one file with group name
     When I run "rspec . --example 'second group first example'"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: all examples in one group including examples in nested groups
     When I run "rspec . --example 'third group'"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: Object#method
     When I run "rspec . --example 'Array#length'"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/command_line/exit_status.feature

@@ -13,7 +13,7 @@ Feature: exit status
       """
     When I run "rspec ok_spec.rb"
     Then the exit status should be 0
-    And the stdout should contain "1 example, 0 failures"
+    And the examples should all pass
 
   Scenario: exit with 1 when one example fails
     Given a file named "ko_spec.rb" with:
@@ -26,7 +26,7 @@ Feature: exit status
       """
     When I run "rspec ko_spec.rb"
     Then the exit status should be 1
-    And the stdout should contain "1 example, 1 failure"
+    And the output should contain "1 example, 1 failure"
 
   Scenario: exit with 1 when a nested examples fails
     Given a file named "nested_ko_spec.rb" with:
@@ -41,7 +41,7 @@ Feature: exit status
       """
     When I run "rspec nested_ko_spec.rb"
     Then the exit status should be 1
-    And the stdout should contain "1 example, 1 failure"
+    And the output should contain "1 example, 1 failure"
       
   Scenario: exit with 0 when no examples are run
     Given a file named "a_no_examples_spec.rb" with:
@@ -49,4 +49,4 @@ Feature: exit status
       """
     When I run "rspec a_no_examples_spec.rb"
     Then the exit status should be 0
-    And the stdout should contain "0 examples, 0 failures"
+    And the output should contain "0 examples"

data/features/command_line/line_number_appended_to_path.feature

@@ -30,77 +30,77 @@ Feature: line number appended to file path
 
   Scenario: nested groups - outer group on declaration line
     When I run "rspec example_spec.rb:1 --format doc"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
     And the output should contain "second example in outer group"
     And the output should contain "first example in outer group"
     And the output should contain "example in nested group"
 
   Scenario: nested groups - outer group inside block before example
     When I run "rspec example_spec.rb:2 --format doc"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
     And the output should contain "second example in outer group"
     And the output should contain "first example in outer group"
     And the output should contain "example in nested group"
 
   Scenario: nested groups - inner group on declaration line
     When I run "rspec example_spec.rb:11 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "example in nested group"
     And the output should not contain "second example in outer group"
     And the output should not contain "first example in outer group"
 
   Scenario: nested groups - inner group inside block before example
     When I run "rspec example_spec.rb:12 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "example in nested group"
     And the output should not contain "second example in outer group"
     And the output should not contain "first example in outer group"
 
   Scenario: two examples - first example on declaration line
     When I run "rspec example_spec.rb:3 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "first example in outer group"
     But the output should not contain "second example in outer group"
     And the output should not contain "example in nested group"
 
   Scenario: two examples - first example inside block
     When I run "rspec example_spec.rb:4 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "first example in outer group"
     But the output should not contain "second example in outer group"
     And the output should not contain "example in nested group"
 
   Scenario: two examples - first example on end
     When I run "rspec example_spec.rb:5 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "first example in outer group"
     But the output should not contain "second example in outer group"
     And the output should not contain "example in nested group"
 
   Scenario: two examples - first example after end but before next example
     When I run "rspec example_spec.rb:6 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "first example in outer group"
     But the output should not contain "second example in outer group"
     And the output should not contain "example in nested group"
 
   Scenario: two examples - second example on declaration line
     When I run "rspec example_spec.rb:7 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "second example in outer group"
     But the output should not contain "first example in outer group"
     And the output should not contain "example in nested group"
 
   Scenario: two examples - second example inside block
     When I run "rspec example_spec.rb:7 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "second example in outer group"
     But the output should not contain "first example in outer group"
     And the output should not contain "example in nested group"
 
   Scenario: two examples - second example on end
     When I run "rspec example_spec.rb:7 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain "second example in outer group"
     But the output should not contain "first example in outer group"
     And the output should not contain "example in nested group"