Fix broken 2 99 build

.travis.yml

@@ -5,12 +5,13 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - ree
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode
   - rbx-19mode
-  - 2.0.0
 matrix:
   allow_failures:
     - rvm: rbx-19mode

Changelog.md

@@ -1,3 +1,188 @@
+### 2.99.0.beta2 Development
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.99.0.beta1...2-99-maintenance)
+
+Enhancements:
+
+* Add `is_expected` for one-liners that read well with the
+  `expect`-based syntax. `is_expected` is simply defined as
+  `expect(subject)` and can be used in an expression like:
+  `it { is_expected.to read_well }`. (Myron Marston)
+
+Deprecations:
+
+* Deprecate inexact `mock_with` config options. RSpec 3 will only support
+  the exact symbols `:rspec`, `:mocha`, `:flexmock`, `:rr` or `:nothing`
+  (or any module that implements the adapter interface). RSpec 2 did
+  fuzzy matching but this will not be supported going forward.
+  (Myron Marston)
+
+Bug Fixes:
+
+* Fix failure (undefined method `path`) in end-of-run summary
+  when `raise_errors_for_deprecations!` is configured. (Myron Marston)
+* Fix issue were overridding spec ordering from the command line wasnt
+  fully recognised interally. (Jon Rowe)
+
+### 2.99.0.beta1 / 2013-11-07
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.7...v2.99.0.beta1)
+
+Enhancements
+
+* Block-based DSL methods that run in the context of an example
+  (`it`, `before(:each)`, `after(:each)`, `let` and `subject`)
+  now yield the example as a block argument. (David Chelimsky)
+* Warn when the name of more than one example group is submitted to
+  `include_examples` and it's aliases. (David Chelimsky)
+* Add `expose_current_running_example_as` config option for
+  use during the upgrade process when external gems use the
+  deprecated `RSpec::Core::ExampleGroup#example` and
+  `RSpec::Core::ExampleGroup#running_example` methods. (Myron Marston)
+* Limit spamminess of deprecation messages. (Bradley Schaefer, Loren Segal)
+* Add `config.raise_errors_for_deprecations!` option, which turns
+  deprecations warnings into errors to surface the full backtrace
+  of the call site. (Myron Marston)
+
+Deprecations
+
+* Deprecate `RSpec::Core::ExampleGroup#example` and
+  `RSpec::Core::ExampleGroup#running_example` methods. If you need
+  access to the example (e.g. to get its metadata), use a block argument
+  instead. (David Chelimsky)
+* Deprecate use of `autotest/rspec2` in favour of `rspec-autotest`. (Jon Rowe)
+* Deprecate RSpec's built-in debugger support. Use a CLI option like
+  `-rruby-debug` (for the ruby-debug gem) or `-rdebugger` (for the
+  debugger gem) instead. (Myron Marston)
+* Deprecate `RSpec.configuration.treat_symbols_as_metadata_keys_with_true_values = false`.
+  RSpec 3 will not support having this option set to `false`. (Myron Marston)
+* Deprecate accessing a `let` or `subject` declaration in
+  a `after(:all)` hook. (Myron Marston, Jon Rowe)
+* Deprecate built-in `its` usage in favor of `rspec-its` gem due to planned
+  removal in RSpec 3. (Peter Alfvin)
+* Deprecate `RSpec::Core::PendingExampleFixedError` in favor of
+  `RSpec::Core::Pending::PendingExampleFixedError`. (Myron Marston)
+* Deprecate `RSpec::Core::Configuration#out` and
+  `RSpec::Core::Configuration#output` in favor of
+  `RSpec::Core::Configuration#output_stream`. (Myron Marston)
+* Deprecate legacy ordering APIs.
+  * You should use `register_ordering(:global)` instead of these:
+    * `RSpec::Core::Configuration#order_examples`
+    * `RSpec::Core::Configuration#order_groups`
+    * `RSpec::Core::Configuration#order_groups_and_examples`
+  * These are deprecated with no replacement because in RSpec 3
+    ordering is a property of individual example groups rather than
+    just a global property of the entire test suite:
+    * `RSpec::Core::Configuration#order`
+    * `RSpec::Core::Configuration#randomize?`
+  * `--order default` is deprecated in favor of `--order defined`
+  (Myron Marston)
+
+### 2.14.7 / 2013-10-29
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.6...v2.14.7)
+
+Bug fixes:
+
+* Fix regression in 2.14.6 that broke the Fivemat formatter.
+  It depended upon either
+  `example.execution_result[:exception].pending_fixed?` (which
+  was removed in 2.14.6 to fix an issue with frozen error objects)
+  or `RSpec::Core::PendingExampleFixedError` (which was renamed
+  to `RSpec::Core::Pending::PendingExampleFixedError` in 2.8.
+  This fix makes a constant alias for the old error name.
+  (Myron Marston)
+
+### 2.14.6 / 2013-10-15
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.5...v2.14.6)
+
+Bug fixes:
+
+* Format stringified numbers correctly when mathn library is loaded.
+  (Jay Hayes)
+* Fix an issue that prevented the use of frozen error objects. (Lars
+  Gierth)
+
+### 2.14.5 / 2013-08-13
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.4...v2.14.5)
+
+Bug fixes:
+
+* Fix a `NoMethodError` that was being raised when there were no shared
+  examples or contexts declared and `RSpec.world.reset` is invoked.
+  (thepoho, Jon Rowe, Myron Marston)
+* Fix a deprecation warning that was being incorrectly displayed when
+  `shared_examples` are declared at top level in a `module` scope.
+  (Jon Rowe)
+* Fix after(:all) hooks so consecutive (same context) scopes will run even if
+  one raises an error. (Jon Rowe, Trejkaz)
+* JsonFormatter no longer dies if `dump_profile` isn't defined (Alex / @MasterLambaster, Jon Rowe)
+
+### 2.14.4 / 2013-07-21
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.3...v2.14.4)
+
+Bug fixes
+
+* Fix regression in 2.14: ensure configured requires (via `-r` option)
+  are loaded before spec files are loaded. This allows the spec files
+  to programatically change the file pattern (Jon Rowe).
+* Autoload `RSpec::Mocks` and `RSpec::Expectations` when referenced if
+  they are not already loaded (`RSpec::Matches` has been autoloaded
+  for a while). In the `rspec` gem, we changed it recently to stop
+  loading `rspec/mocks` and `rspec/expectations` by default, as some
+  users reported problems where they were intending to use mocha,
+  not rspec-mocks, but rspec-mocks was loaded and causing a conflict.
+  rspec-core loads mocks and expectations at the appropriate time, so
+  it seemed like a safe change -- but caused a problem for some authors
+  of libraries that integrate with RSpec. This fixes that problem.
+  (Myron Marston)
+* Gracefully handle a command like `rspec --profile path/to/spec.rb`:
+  the `path/to/spec.rb` arg was being wrongly treated as the `profile`
+  integer arg, which got cast `0` using `to_i`, causing no profiled
+  examples to be printed. (Jon Rowe)
+
+### 2.14.3 / 2013-07-13
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.2...v2.14.3)
+
+Bug fixes
+
+* Fix deprecation notices issued from `RSpec::Core::RakeTask` so
+  that they work properly when all of rspec-core is not loaded.
+  (This was a regression in 2.14) (Jon Rowe)
+
+### 2.14.2 / 2013-07-09
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.1...v2.14.2)
+
+Bug fixes
+
+* Fix regression caused by 2.14.1 release: formatters that
+  report that they `respond_to?` a notification, but had
+  no corresponding method would raise an error when registered.
+  The new fix is to just implement `start` on the deprecation
+  formatter to fix the original JRuby/ruby-debug issue.
+  (Jon Rowe)
+
+### 2.14.1 / 2013-07-08
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.0...v2.14.1)
+
+Bug fixes
+
+* Address deprecation formatter failure when using `ruby-debug` on
+  JRuby: fix `RSpec::Core::Reporter` to not send a notification
+  when the formatter's implementation of the notification method
+  comes from `Kernel` (Alex Portnov, Jon Rowe).
+
+### 2.14.0 / 2013-07-06
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.0.rc1...v2.14.0)
+
+Enhancements
+
+* Apply focus to examples defined with `fit` (equivalent of
+  `it "description", focus: true`) (Michael de Silva)
+
+Bug fix
+
+* Ensure methods defined by `let` take precedence over others
+  when there is a name collision (e.g. from an included module).
+  (Jon Rowe, Andy Lindeman and Myron Marston)
+
 ### 2.14.0.rc1 / 2013-05-27
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.13.1...v2.14.0.rc1)
 
@@ -27,7 +212,7 @@ Enhancements
   (Konstantin Haase).
 * Add cucumber documentation for --require command line option
   (Bradley Schaefer)
-* Expose configruation options via config:
+* Expose configuration options via config:
   * `config.libs` returns the libs configured to be added onto the load path
   * `full_backtrace?` returns the state of the backtrace cleaner
   * `debug?` returns true when the debugger is loaded

Gemfile

@@ -4,10 +4,10 @@ gemspec
 
 %w[rspec rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
-  if File.exist?(library_path)
+  if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path
   else
-    gem lib, :git => "git://github.com/rspec/#{lib}.git"
+    gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => '2-99-maintenance'
   end
 end
 

benchmarks/caller.rb

@@ -0,0 +1,81 @@
+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+
+require 'benchmark'
+require 'rspec/caller_filter'
+
+n = 10000
+
+puts "#{n} times - ruby #{RUBY_VERSION}"
+puts
+
+puts "* Using a chunked fetch is quicker than the old method of array-access."
+Benchmark.bm(20) do |bm|
+  bm.report("CallerFilter") do
+    n.times do
+      RSpec::CallerFilter.first_non_rspec_line
+    end
+  end
+
+  bm.report("Direct caller access") do
+    n.times do
+      caller(1)[4]
+    end
+  end
+end
+
+puts
+puts "* Chunking fetches of caller adds a ~17% overhead."
+Benchmark.bm(20) do |bm|
+  bm.report("Chunked") do
+    n.times do
+      caller(1, 2)
+      caller(3, 2)
+      caller(5, 2)
+    end
+  end
+
+  bm.report("All at once") do
+    n.times do
+      caller(1, 6)
+    end
+  end
+end
+
+puts
+puts "* `caller` scales linearly with length parameter."
+Benchmark.bm(20) do |bm|
+  (1..10).each do |x|
+    bm.report(x) do
+      n.times do
+        caller(1, x)
+      end
+    end
+  end
+end
+
+
+# > ruby benchmarks/caller.rb
+# 10000 times - ruby 2.0.0
+#
+# * Using a chunked fetch is quicker than the old method of array-access.
+#                            user     system      total        real
+# CallerFilter            0.140000   0.010000   0.150000 (  0.145381)
+# Direct caller access   0.170000   0.000000   0.170000 (  0.180610)
+#
+# * Chunking fetches of caller adds a ~17% overhead.
+#                            user     system      total        real
+# Chunked                0.150000   0.000000   0.150000 (  0.181162)
+# All at once            0.130000   0.010000   0.140000 (  0.138732)
+#
+# * `caller` scales linearly with length parameter.
+#                            user     system      total        real
+# 1                      0.030000   0.000000   0.030000 (  0.035000)
+# 2                      0.050000   0.000000   0.050000 (  0.059879)
+# 3                      0.080000   0.000000   0.080000 (  0.098468)
+# 4                      0.090000   0.010000   0.100000 (  0.097619)
+# 5                      0.110000   0.000000   0.110000 (  0.126220)
+# 6                      0.130000   0.000000   0.130000 (  0.136739)
+# 7                      0.150000   0.000000   0.150000 (  0.159055)
+# 8                      0.160000   0.010000   0.170000 (  0.172416)
+# 9                      0.180000   0.000000   0.180000 (  0.203038)
+# 10                     0.200000   0.000000   0.200000 (  0.210551)

features/command_line/line_number_option.feature

@@ -46,9 +46,9 @@ Feature: --line_number option
 
       describe 9 do
 
-        it { should be > 8 }
+        it { is_expected.to be > 8 }
 
-        it { should be < 10 }
+        it { is_expected.not_to be < 10 }
 
       end
       """

features/command_line/order.feature

@@ -1,13 +1,10 @@
 Feature: --order (new in rspec-core-2.8)
 
   Use the `--order` option to tell RSpec how to order the files, groups, and
-  examples. Options are `default` and `rand`:
+  examples. Options are `defined` and `rand`.
 
-  Default is:
-
-    * files are ordered based on the underlying file system's order (typically
-      case-sensitive alpha on *nix OS's and case-insenstive alpha in Windows)
-    * groups/examples are loaded in the order in which they are declared
+  `defined` is the default, which executes groups and examples in the
+  order they are defined as the spec files are loaded.
 
   Use `rand` to randomize the order of files, groups within files, and
   examples within groups.*
@@ -20,10 +17,10 @@ Feature: --order (new in rspec-core-2.8)
 
   <h3>Examples</h3>
 
-      --order default
+      --order defined
       --order rand
       --order rand:123
       --seed 123 # same as --order rand:123
 
-  The `default` option is only necessary when you have `--order rand` stored in a
+  The `defined` option is only necessary when you have `--order rand` stored in a
   config file (e.g. `.rspec`) and you want to override it from the command line.

features/command_line/pattern_option.feature

@@ -29,3 +29,21 @@ Feature: pattern option
       """
     When I run `rspec --pattern "spec/**/*.spec"`
     Then the output should contain "1 example, 0 failures"
+
+  Scenario: override the default pattern in configuration
+    Given a file named "spec/spec_helper.rb" with:
+      """ruby
+        RSpec.configure do |config|
+          config.pattern << ',**/*.spec'
+        end
+      """
+    And a file named "spec/example.spec" with:
+      """ruby
+      describe "addition" do
+        it "adds things" do
+          (1 + 2).should eq(3)
+        end
+      end
+      """
+    When I run `rspec -rspec_helper`
+    Then the output should contain "1 example, 0 failures"

features/command_line/warnings_option.feature

@@ -2,6 +2,7 @@ Feature: run with warnings enabled
 
   You can use the `--warnings` option to run specs with warnings enabled
 
+  @unsupported-on-rbx
   Scenario:
     Given a file named "example_spec.rb" with:
       """ruby
@@ -14,6 +15,7 @@ Feature: run with warnings enabled
     When I run `rspec --warnings example_spec.rb`
     Then the output should contain "warning"
 
+  @unsupported-on-rbx
   Scenario:
     Given a file named "example_spec.rb" with:
       """ruby