rspec-core 2.99.0 → 2.99.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDVlNDg3NzUxMWY5NDk2MzQ2ZDQyMDhmNWY4YjJmZmEwOTgwMzZiMw==
-  data.tar.gz: !binary |-
-    MjkzYTI0M2ZkN2IxYzAxYmM1NmY1MWUzYjhmNDY5NGFhNjk0MjZiMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzBjODk5ZmU4ZTEzODk0ZmIyMTkwOTFiNWNhZTg2YWU4Yjc5ZjcxN2JkYWFm
-    YWE4ODk3YWFkZTkwM2M2NGZlZTFjYjI1ODRmNGIyOWY0YjQ0ZjMwNDhjNTUz
-    MDBjZDA3NjI2YWM1NmM2NGVlYzM1ZDE0ZDlmMjVlMmFkZGQ0NTU=
-  data.tar.gz: !binary |-
-    NTkwMmUxMzViOWE1MjQ2NTMzMTEwZWU1ODY4ODgxYjBlZjdkNjU3ODM2NDc5
-    YWRkNjA2M2U0NDE1OWJiOTNiN2E3ZTg3MDk4OTdlOTUwODk2M2JlMzBkZjU1
-    ODZlMjY4MjBkNWQ3YzgzMTUzNmJjZTFkMDllNTlkZTBmYjU0YjU=
+SHA1:
+  metadata.gz: 64d5f3074738a6b968d844fd5a07d7c748e50d47
+  data.tar.gz: d18fa7f7f048fe6de7695c62db9abadaf5ee3f62
+SHA512:
+  metadata.gz: 03b2e42bb17c7dc9ec4167d8b1cc80e43991c7cfd94c91dee3d9a8332b21e7f3e52e92dd72bbd05da69a92f0d00f3b7e308989dab42cfd6aa79fa0a5dd25ccf2
+  data.tar.gz: 2e6ac446dc238f94461b51e98ebe967e91bc4530e81b36b5b56e45318b14de660a32e6526c2a2828a009f3ed04ec5329c596ffc8377a87ebaa3459975431fa1e

data/Changelog.md

@@ -1,3 +1,17 @@
+### 2.99.1 / 2014-06-19
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v2.99.0...v2.99.1)
+
+Bug Fixes:
+
+* Add missing deprecation warning for when `RSpec::Core::Runner` is used
+  multiple times in the same process. In 2.x RSpec's global state was
+  automatically cleared between runs but in 3.0 you need to call `RSpec.reset`
+  manually in these situations. (Sam Phippen, #1587)
+* Prevent deprecation being accidentally issues when doubles used with `be_`
+  matchers due to automatically generated descriptions. (Jon Rowe, #1573)
+* Load `rspec/core` when loading `rspec/core/rake_task` to ensure we can
+  issue deprecations correctly. (Jon Rowe, #1612)
+
 ### 2.99.0 / 2014-06-01
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v2.99.0.rc1...v2.99.0)
 

data/lib/rspec/core.rb

@@ -45,6 +45,14 @@ require_rspec['core/version']
 module RSpec
   autoload :SharedContext, 'rspec/core/shared_context'
 
+  class << self
+    # @private
+    # Counts the number of times RSpec.reset needs to be called to prevent
+    # a warning about reset's no longer being implicitly invoked.
+    attr_accessor :resets_required
+    RSpec.resets_required = 0
+  end
+
   # @private
   def self.wants_to_quit
   # Used internally to determine what to do when a SIGINT is received
@@ -70,9 +78,34 @@ module RSpec
   end
 
   # @private
+  # Query to check if the user has called RSpec.reset
+  def self.user_has_called_reset?
+    @user_has_called_reset ||= false
+  end
+
+  # @private
+  # Warns that RSpec 3.0.0 will no longer call reset for users
+  def self.warn_about_calling_reset
+    RSpec.warn_deprecation(<<-EOD)
+Calling `RSpec::Core::Runner.run` will no longer implicitly invoke
+`RSpec.reset` as of RSpec 3.0.0. If you need RSpec to be reset between your
+calls to `RSpec::Core::Runner.run` please invoke `RSpec.reset` manually in the
+appropriate place.
+EOD
+  end
+
+  # @public
   # Used internally to ensure examples get reloaded between multiple runs in
   # the same process.
   def self.reset
+    RSpec.resets_required -= 1
+    internal_reset
+  end
+
+  # @private
+  # @see RSpec.reset
+  # Warns if the user has invoked RSpec.run twice in the same process.
+  def self.internal_reset
     @world = nil
     @configuration = nil
   end

data/lib/rspec/core/example.rb

@@ -119,6 +119,7 @@ module RSpec
               rescue Exception => e
                 set_exception(e)
               ensure
+                assign_generated_description
                 run_after_each
               end
             end
@@ -130,12 +131,6 @@ module RSpec
             @example_group_instance.instance_variable_set(ivar, nil)
           end
           @example_group_instance = nil
-
-          begin
-            assign_generated_description
-          rescue Exception => e
-            set_exception(e, "while assigning the example description")
-          end
         end
 
         finish(reporter)
@@ -313,6 +308,9 @@ An error occurred #{context}
         if metadata[:description_args].empty? and !pending?
           metadata[:description_args] << RSpec::Matchers.generated_description
         end
+      rescue Exception => e
+        set_exception(e, "while assigning the example description")
+      ensure
         RSpec::Matchers.clear_generated_description
       end
 

data/lib/rspec/core/rake_task.rb

@@ -1,3 +1,4 @@
+require 'rspec/core'
 require 'rspec/core/backward_compatibility'
 require 'rake'
 require 'rake/tasklib'

data/lib/rspec/core/runner.rb

@@ -47,6 +47,18 @@ module RSpec
         end
       end
 
+
+      # @private
+      # Warns that RSpec 3.0.0 will no longer call reset for users
+      def self.warn_about_calling_reset
+        RSpec.configuration.deprecation_stream.puts(<<-EOD)
+Calling `RSpec::Core::Runner.run` will no longer implicitly invoke
+`RSpec.reset` as of RSpec 3.0.0. If you need RSpec to be reset between your
+calls to `RSpec::Core::Runner.run` please invoke `RSpec.reset` manually in the
+appropriate place.
+        EOD
+      end
+
       # Run a suite of RSpec examples.
       #
       # This is used internally by RSpec to run a suite, but is available
@@ -64,6 +76,8 @@ module RSpec
       # #### Returns
       # * +Fixnum+ - exit status code (0/1)
       def self.run(args, err=$stderr, out=$stdout)
+        warn_about_calling_reset if RSpec.resets_required > 0
+        RSpec.resets_required += 1
         trap_interrupt
         options = ConfigurationOptions.new(args)
         options.parse_options
@@ -89,8 +103,9 @@ module RSpec
           new(options).run(err, out)
         end
       ensure
-        RSpec.reset
+        RSpec.internal_reset
       end
     end
+
   end
 end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.99.0'
+      STRING = '2.99.1'
     end
   end
 end

data/spec/command_line/order_spec.rb

@@ -81,6 +81,14 @@ describe 'command line', :ui do
     """
   end
 
+  after do
+    RSpec.resets_required = 0
+  end
+
+  before do
+    RSpec.resets_required = 0
+  end
+
   describe '--order rand' do
     it 'runs the examples and groups in a different order each time' do
       run_command 'tmp/aruba/spec/order_spec.rb --order rand -f doc'
@@ -200,5 +208,7 @@ describe 'command line', :ui do
 
   def run_command(cmd)
     RSpec::Core::Runner.run(cmd.split, stderr, stdout)
+  ensure
+    RSpec.reset
   end
 end

data/spec/rspec/core/memoized_helpers_spec.rb

@@ -106,6 +106,18 @@ module RSpec::Core
         expect(example_yielded_to_subject).to eq example_yielded_to_example
       end
 
+      context "doesn't issue a deprecation when used with doubles" do
+        subject do
+          Struct.new(:value) do
+            def working_with?(double)
+              double.value >= value
+            end
+          end.new 1
+        end
+
+        it { should be_working_with double(:value => 10) }
+      end
+
       [false, nil].each do |falsy_value|
         context "with a value of #{falsy_value.inspect}" do
           it "is evaluated once per example" do

data/spec/rspec/core/runner_spec.rb

@@ -26,10 +26,45 @@ module RSpec::Core
       let(:err) { StringIO.new }
       let(:out) { StringIO.new }
 
+      after { RSpec.resets_required = 0 }
+      before { RSpec.resets_required = 0 }
+
       it "tells RSpec to reset" do
         RSpec.configuration.stub(:files_to_run => [])
-        RSpec.should_receive(:reset)
+        RSpec.should_receive(:internal_reset)
+        RSpec::Core::Runner.run([], err, out)
+      end
+
+      it "does not issue a deprecation warning at the end of the first run" do
+        RSpec.configuration.stub(:files_to_run => [])
+        RSpec.should_receive(:internal_reset)
+        allow(RSpec.configuration).to receive(:deprecation_stream).and_return(err)
         RSpec::Core::Runner.run([], err, out)
+        expect(err.string).to eq("")
+      end
+
+      it "issues a deprecation if warn is invoked twice and reset is not called manually" do
+        RSpec.configuration.stub(:files_to_run => [])
+        RSpec::Core::Runner.run([], err, out)
+        RSpec.configuration.stub(:files_to_run => [])
+        allow(RSpec.configuration).to receive(:deprecation_stream).and_return(err)
+        RSpec::Core::Runner.run([], err, out)
+        expect(err.string).to match(/no longer implicitly/)
+      end
+
+      context "when the user manually invokes reset" do
+        after { RSpec.instance_variable_set(:@reset_called_by_user, false) }
+
+        it "does not issue a deprecation warning" do
+          RSpec.configuration.stub(:files_to_run => [])
+          RSpec::Core::Runner.run([], err, out)
+          RSpec.configuration.stub(:files_to_run => [])
+          RSpec.reset
+          RSpec.configuration.stub(:files_to_run => [])
+          allow(RSpec.configuration).to receive(:deprecation_stream).and_return(err)
+          RSpec::Core::Runner.run([], err, out)
+          expect(err.string).to eq("")
+        end
       end
 
       context "with --drb or -X" do

data/spec/rspec/core_spec.rb

@@ -56,7 +56,7 @@ describe RSpec do
       config_before_reset = RSpec.configuration
       world_before_reset  = RSpec.world
 
-      RSpec.reset
+      RSpec.internal_reset
 
       expect(RSpec.configuration).not_to equal(config_before_reset)
       expect(RSpec.world).not_to equal(world_before_reset)

data/spec/spec_helper.rb

@@ -113,6 +113,7 @@ Spork.prefork do
     end
 
     # runtime options
+    c.raise_errors_for_deprecations!
     c.treat_symbols_as_metadata_keys_with_true_values = true
     c.color = !in_editor?
     c.filter_run :focus

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 2.99.0
+  version: 2.99.1
 platform: ruby
 authors:
 - Steven Baker
@@ -10,76 +10,76 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
 - !ruby/object:Gem::Dependency
@@ -114,42 +114,42 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 description: BDD for Ruby. RSpec runner and example groups.
@@ -160,69 +160,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/autotest/discover.rb
-- lib/autotest/rspec2.rb
-- lib/rspec/autorun.rb
-- lib/rspec/core.rb
-- lib/rspec/core/backtrace_cleaner.rb
-- lib/rspec/core/backward_compatibility.rb
-- lib/rspec/core/caller_filter.rb
-- lib/rspec/core/command_line.rb
-- lib/rspec/core/configuration.rb
-- lib/rspec/core/configuration_options.rb
-- lib/rspec/core/deprecated_mutable_array_proxy.rb
-- lib/rspec/core/deprecation.rb
-- lib/rspec/core/drb_command_line.rb
-- lib/rspec/core/drb_options.rb
-- lib/rspec/core/dsl.rb
-- lib/rspec/core/example.rb
-- lib/rspec/core/example_group.rb
-- lib/rspec/core/extensions/instance_eval_with_args.rb
-- lib/rspec/core/extensions/kernel.rb
-- lib/rspec/core/extensions/module_eval_with_args.rb
-- lib/rspec/core/extensions/ordered.rb
-- lib/rspec/core/filter_manager.rb
-- lib/rspec/core/formatters.rb
-- lib/rspec/core/formatters/base_formatter.rb
-- lib/rspec/core/formatters/base_text_formatter.rb
-- lib/rspec/core/formatters/console_codes.rb
-- lib/rspec/core/formatters/deprecation_formatter.rb
-- lib/rspec/core/formatters/documentation_formatter.rb
-- lib/rspec/core/formatters/helpers.rb
-- lib/rspec/core/formatters/html_formatter.rb
-- lib/rspec/core/formatters/html_printer.rb
-- lib/rspec/core/formatters/json_formatter.rb
-- lib/rspec/core/formatters/progress_formatter.rb
-- lib/rspec/core/formatters/snippet_extractor.rb
-- lib/rspec/core/formatters/text_mate_formatter.rb
-- lib/rspec/core/hooks.rb
-- lib/rspec/core/memoized_helpers.rb
-- lib/rspec/core/metadata.rb
-- lib/rspec/core/metadata_hash_builder.rb
-- lib/rspec/core/minitest_assertions_adapter.rb
-- lib/rspec/core/mocking/with_absolutely_nothing.rb
-- lib/rspec/core/mocking/with_flexmock.rb
-- lib/rspec/core/mocking/with_mocha.rb
-- lib/rspec/core/mocking/with_rr.rb
-- lib/rspec/core/mocking/with_rspec.rb
-- lib/rspec/core/option_parser.rb
-- lib/rspec/core/pending.rb
-- lib/rspec/core/project_initializer.rb
-- lib/rspec/core/rake_task.rb
-- lib/rspec/core/reporter.rb
-- lib/rspec/core/ruby_project.rb
-- lib/rspec/core/runner.rb
-- lib/rspec/core/shared_context.rb
-- lib/rspec/core/shared_example_group.rb
-- lib/rspec/core/shared_example_group/collection.rb
-- lib/rspec/core/test_unit_assertions_adapter.rb
-- lib/rspec/core/version.rb
-- lib/rspec/core/world.rb
-- README.md
-- License.txt
+- ".document"
+- ".yardopts"
 - Changelog.md
-- .yardopts
-- .document
+- License.txt
+- README.md
+- exe/autospec
+- exe/rspec
 - features/Autotest.md
 - features/README.md
 - features/Upgrade.md
@@ -289,6 +233,64 @@ files:
 - features/subject/one_liner_syntax.feature
 - features/support/env.rb
 - features/support/rubinius.rb
+- lib/autotest/discover.rb
+- lib/autotest/rspec2.rb
+- lib/rspec/autorun.rb
+- lib/rspec/core.rb
+- lib/rspec/core/backtrace_cleaner.rb
+- lib/rspec/core/backward_compatibility.rb
+- lib/rspec/core/caller_filter.rb
+- lib/rspec/core/command_line.rb
+- lib/rspec/core/configuration.rb
+- lib/rspec/core/configuration_options.rb
+- lib/rspec/core/deprecated_mutable_array_proxy.rb
+- lib/rspec/core/deprecation.rb
+- lib/rspec/core/drb_command_line.rb
+- lib/rspec/core/drb_options.rb
+- lib/rspec/core/dsl.rb
+- lib/rspec/core/example.rb
+- lib/rspec/core/example_group.rb
+- lib/rspec/core/extensions/instance_eval_with_args.rb
+- lib/rspec/core/extensions/kernel.rb
+- lib/rspec/core/extensions/module_eval_with_args.rb
+- lib/rspec/core/extensions/ordered.rb
+- lib/rspec/core/filter_manager.rb
+- lib/rspec/core/formatters.rb
+- lib/rspec/core/formatters/base_formatter.rb
+- lib/rspec/core/formatters/base_text_formatter.rb
+- lib/rspec/core/formatters/console_codes.rb
+- lib/rspec/core/formatters/deprecation_formatter.rb
+- lib/rspec/core/formatters/documentation_formatter.rb
+- lib/rspec/core/formatters/helpers.rb
+- lib/rspec/core/formatters/html_formatter.rb
+- lib/rspec/core/formatters/html_printer.rb
+- lib/rspec/core/formatters/json_formatter.rb
+- lib/rspec/core/formatters/progress_formatter.rb
+- lib/rspec/core/formatters/snippet_extractor.rb
+- lib/rspec/core/formatters/text_mate_formatter.rb
+- lib/rspec/core/hooks.rb
+- lib/rspec/core/memoized_helpers.rb
+- lib/rspec/core/metadata.rb
+- lib/rspec/core/metadata_hash_builder.rb
+- lib/rspec/core/minitest_assertions_adapter.rb
+- lib/rspec/core/mocking/with_absolutely_nothing.rb
+- lib/rspec/core/mocking/with_flexmock.rb
+- lib/rspec/core/mocking/with_mocha.rb
+- lib/rspec/core/mocking/with_rr.rb
+- lib/rspec/core/mocking/with_rspec.rb
+- lib/rspec/core/option_parser.rb
+- lib/rspec/core/pending.rb
+- lib/rspec/core/project_initializer.rb
+- lib/rspec/core/rake_task.rb
+- lib/rspec/core/reporter.rb
+- lib/rspec/core/ruby_project.rb
+- lib/rspec/core/runner.rb
+- lib/rspec/core/shared_context.rb
+- lib/rspec/core/shared_example_group.rb
+- lib/rspec/core/shared_example_group/collection.rb
+- lib/rspec/core/test_unit_assertions_adapter.rb
+- lib/rspec/core/version.rb
+- lib/rspec/core/world.rb
 - spec/autotest/discover_spec.rb
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
@@ -358,33 +360,31 @@ files:
 - spec/support/shared_example_groups.rb
 - spec/support/silence_dsl_deprecations.rb
 - spec/support/spec_files.rb
-- exe/autospec
-- exe/rspec
 homepage: http://github.com/rspec/rspec-core
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-core-2.99.0
+summary: rspec-core-2.99.1
 test_files:
 - features/Autotest.md
 - features/README.md