rspec-core 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3092c05455e9d13f8b3210dbd2639f924247d702
-  data.tar.gz: 4bce575854d38e0b31caa77ca2d7556a6f0a8158
+  metadata.gz: c5447ecf782b107af7573626ade27fdf62fb0307
+  data.tar.gz: ca82f9eb6c9f35b3c0b59c104eeb34752320cab2
 SHA512:
-  metadata.gz: fcb2fe193cfd0fa78a4165457be57c998bb18626568bbe47744af259d86e75ee2312285eabbf7a0ee734b7ea94461e06a8fcf7412247c9dd78e9341eaf613a68
-  data.tar.gz: 1928429c6a01daf9e6b6ed9e30a0308e03590868ff7131b61c9d316dc12ed0a65544818bb99f80e2ae9a78a787d2ca92d2d5a07c278c611c4b2302bcce101064
+  metadata.gz: 2452515ed3b91a42b6afda517a914819e73c6fbfce3e8cc724ca7067388e9f75318cf62a1ca7787529d5cec8c8c0d7441ebe3f475fd5f64ebfa7c29db2d88b24
+  data.tar.gz: d4de137f453c1188858c4e5a77a208182f24f7dce0241f04691217082aaf601fc88faacdfcb5fbbb5ab4470fbfd51bf197fa995a85e069629011b2b12039acd4

data.tar.gz.sig

@@ -1 +1 @@
-y�ar򊨡s���lL8<���^� W��*2 �V�9l�^��t��M�B��	��:�}z��%����a?�\���i�v~�"P�B-{oi�\@x������?��R��*5Œ�L��R��3~���	Nj��������-.`���uq��V�d�6VSy��Ç��0�����D'��['!6�ѳ�{�
+�_@�+�חb4ұTi��;Y�n��� �&��w��v08�:RĦx�OAC��_�tb4�_��-9�{�9t���R��iS}�ע|4�՟�v]׻��j����|D/kFWyK:�	}F��Y�B���!�x5�۸g� �[i��uG��ۚH5e

data/Changelog.md

@@ -1,3 +1,19 @@
+### 3.0.2 / 2014-06-19
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.0.1...v3.0.2)
+
+Bug Fixes:
+
+* Fix regression in CLI option handling that prevented `--tag slow`
+  passed at the command line from overriding `--tag ~slow` in `.rspec`.
+  (Colin Jones, #1602)
+* Fix metadata `:example_group` deprecation warning so that it gets
+  issued at the call site of the configuration that specified it as
+  a filter rather than later when an example group is defined.
+  (Myron Marston, #1562)
+* Make the line that is printed when a shared example group fails indicating
+  where the concrete example group is white, separating it from the stack trace
+  that is produced for the failure. (Sam Phippen, Jon Rowe, #1606)
+
 ### 3.0.1 / 2014-06-12
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.0.0...v3.0.1)
 
@@ -275,7 +291,7 @@ Bug Fixes:
   or `default_path`. (Matijs van Zuijlen)
 
 ### 3.0.0.beta1 / 2013-11-07
-[Full Changelog](http://github.com/rspec/rspec-core/compare/v2.99.0...v3.0.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v2.99.1...v3.0.0.beta1)
 
 Breaking Changes for 3.0.0:
 
@@ -346,6 +362,20 @@ Deprecations:
   longer has an affect now that the behavior it enabled is always
   enabled. (Myron Marston)
 
+### 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/configuration.rb

@@ -850,7 +850,8 @@ module RSpec
       #
       #     filter_run_including :foo # same as filter_run_including :foo => true
       def filter_run_including(*args)
-        filter_manager.include_with_low_priority Metadata.build_hash_from(args)
+        meta = Metadata.build_hash_from(args, :warn_about_example_group_filtering)
+        filter_manager.include_with_low_priority meta
       end
 
       alias_method :filter_run, :filter_run_including
@@ -863,7 +864,8 @@ module RSpec
       # This overrides any inclusion filters/tags set on the command line or in
       # configuration files.
       def inclusion_filter=(filter)
-        filter_manager.include_only Metadata.build_hash_from([filter])
+        meta = Metadata.build_hash_from([filter], :warn_about_example_group_filtering)
+        filter_manager.include_only meta
       end
 
       alias_method :filter=, :inclusion_filter=
@@ -906,7 +908,8 @@ module RSpec
       #
       #     filter_run_excluding :foo # same as filter_run_excluding :foo => true
       def filter_run_excluding(*args)
-        filter_manager.exclude_with_low_priority Metadata.build_hash_from(args)
+        meta = Metadata.build_hash_from(args, :warn_about_example_group_filtering)
+        filter_manager.exclude_with_low_priority meta
       end
 
       # Clears and reassigns the `exclusion_filter`. Set to `nil` if you don't
@@ -917,7 +920,8 @@ module RSpec
       # This overrides any exclusion filters/tags set on the command line or in
       # configuration files.
       def exclusion_filter=(filter)
-        filter_manager.exclude_only Metadata.build_hash_from([filter])
+        meta = Metadata.build_hash_from([filter], :warn_about_example_group_filtering)
+        filter_manager.exclude_only meta
       end
 
       # Returns the `exclusion_filter`. If none has been set, returns an empty
@@ -959,7 +963,8 @@ module RSpec
       #
       # @see #extend
       def include(mod, *filters)
-        include_or_extend_modules << [:include, mod, Metadata.build_hash_from(filters)]
+        meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
+        include_or_extend_modules << [:include, mod, meta]
       end
 
       # Tells RSpec to extend example groups with `mod`.  Methods defined in
@@ -992,7 +997,8 @@ module RSpec
       #
       # @see #include
       def extend(mod, *filters)
-        include_or_extend_modules << [:extend, mod, Metadata.build_hash_from(filters)]
+        meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
+        include_or_extend_modules << [:extend, mod, meta]
       end
 
       # @private
@@ -1255,7 +1261,8 @@ module RSpec
       #     end
       #   end
       def define_derived_metadata(*filters, &block)
-        @derived_metadata_blocks << [Metadata.build_hash_from(filters), block]
+        meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
+        @derived_metadata_blocks << [meta, block]
       end
 
       # @private

data/lib/rspec/core/configuration_options.rb

@@ -28,8 +28,9 @@ module RSpec
       # Updates the provided {FilterManager} based on the filter options.
       # @param filter_manager [FilterManager] instance to update
       def configure_filter_manager(filter_manager)
-        @filter_manager_inclusions.each { |val| filter_manager.include(val) }
-        @filter_manager_exclusions.each { |val| filter_manager.exclude(val) }
+        @filter_manager_options.each do |command, value|
+          filter_manager.__send__ command, value
+        end
       end
 
       # @return [Hash] the final merged options, drawn from all external sources
@@ -38,12 +39,11 @@ module RSpec
     private
 
       def organize_options
-        @filter_manager_inclusions = []
-        @filter_manager_exclusions = []
+        @filter_manager_options = []
 
         @options = (file_options << command_line_options << env_options).each { |opts|
-          @filter_manager_inclusions << opts.delete(:inclusion_filter) if opts.key?(:inclusion_filter)
-          @filter_manager_exclusions << opts.delete(:exclusion_filter) if opts.key?(:exclusion_filter)
+          @filter_manager_options << [:include, opts.delete(:inclusion_filter)] if opts.key?(:inclusion_filter)
+          @filter_manager_options << [:exclude, opts.delete(:exclusion_filter)] if opts.key?(:exclusion_filter)
         }.inject(:libs => [], :requires => []) { |hash, opts|
           hash.merge(opts) { |key, oldval, newval|
             [:libs, :requires].include?(key) ? oldval + newval : newval

data/lib/rspec/core/hooks.rb

@@ -508,7 +508,9 @@ EOS
         end
 
         def scope_and_options_from(*args)
-          return extract_scope_from(args), Metadata.build_hash_from(args)
+          scope = extract_scope_from(args)
+          meta  = Metadata.build_hash_from(args, :warn_about_example_group_filtering)
+          return scope, meta
         end
 
         def extract_scope_from(args)

data/lib/rspec/core/metadata.rb

@@ -43,13 +43,18 @@ module RSpec
       # Symbols are converted into hash keys with a value of `true`.
       # This is done to support simple tagging using a symbol, rather
       # than needing to do `:symbol => true`.
-      def self.build_hash_from(args)
+      def self.build_hash_from(args, warn_about_example_group_filtering=false)
         hash = args.last.is_a?(Hash) ? args.pop : {}
 
         while args.last.is_a?(Symbol)
           hash[args.pop] = true
         end
 
+        if warn_about_example_group_filtering && hash.key?(:example_group)
+          RSpec.deprecate("Filtering by an `:example_group` subhash",
+                          :replacement => "the subhash to filter directly")
+        end
+
         hash
       end
 
@@ -200,10 +205,23 @@ module RSpec
           Proc.new do |hash, key|
             case key
             when :example_group
-              RSpec.deprecate("The `:example_group` key in an example group's metadata hash",
-                              :replacement => "the example group's hash directly for the " +
-                              "computed keys and `:parent_example_group` to access the parent " +
-                              "example group metadata")
+              # We commonly get here when rspec-core is applying a previously configured
+              # filter rule, such as when a gem configures:
+              #
+              #   RSpec.configure do |c|
+              #     c.include MyGemHelpers, :example_group => { :file_path => /spec\/my_gem_specs/ }
+              #   end
+              #
+              # It's confusing for a user to get a deprecation at this point in the code, so instead
+              # we issue a deprecation from the config APIs that take a metadata hash, and MetadataFilter
+              # sets this thread local to silence the warning here since it would be so confusing.
+              unless RSpec.thread_local_metadata[:silence_metadata_example_group_deprecations]
+                RSpec.deprecate("The `:example_group` key in an example group's metadata hash",
+                                :replacement => "the example group's hash directly for the " +
+                                "computed keys and `:parent_example_group` to access the parent " +
+                                "example group metadata")
+              end
+
               group_hash = example_group_selector.call(hash)
               LegacyExampleGroupHash.new(group_hash) if group_hash
             when :example_group_block

data/lib/rspec/core/metadata_filter.rb

@@ -20,23 +20,25 @@ module RSpec
 
       # @private
       def filter_applies?(key, value, metadata)
-        return filter_applies_to_any_value?(key, value, metadata) if Array === metadata[key] && !(Proc === value)
-        return location_filter_applies?(value, metadata)          if key == :locations
-        return filters_apply?(key, value, metadata)               if Hash === value
+        silence_metadata_example_group_deprecations do
+          return filter_applies_to_any_value?(key, value, metadata) if Array === metadata[key] && !(Proc === value)
+          return location_filter_applies?(value, metadata)          if key == :locations
+          return filters_apply?(key, value, metadata)               if Hash === value
 
-        return false unless metadata.has_key?(key)
+          return false unless metadata.has_key?(key)
 
-        case value
-        when Regexp
-          metadata[key] =~ value
-        when Proc
-          case value.arity
-          when 0 then value.call
-          when 2 then value.call(metadata[key], metadata)
-          else value.call(metadata[key])
+          case value
+          when Regexp
+            metadata[key] =~ value
+          when Proc
+            case value.arity
+            when 0 then value.call
+            when 2 then value.call(metadata[key], metadata)
+            else value.call(metadata[key])
+            end
+          else
+            metadata[key].to_s == value.to_s
           end
-        else
-          metadata[key].to_s == value.to_s
         end
       end
 
@@ -81,6 +83,13 @@ module RSpec
           metadata[:parent_example_group]
         end
       end
+
+      def silence_metadata_example_group_deprecations
+        RSpec.thread_local_metadata[:silence_metadata_example_group_deprecations] = true
+        yield
+      ensure
+        RSpec.thread_local_metadata.delete(:silence_metadata_example_group_deprecations)
+      end
     end
   end
 end

data/lib/rspec/core/notifications.rb

@@ -5,6 +5,13 @@ module RSpec::Core
   # with information about a particular event of interest.
   module Notifications
 
+    # @private
+    class NullColorizer
+      def wrap(line)
+        line
+      end
+    end
+
     # The `StartNotification` represents a notification sent by the reporter
     # when the suite is started. It contains the expected amount of examples
     # to be executed, and the load time of RSpec.
@@ -147,19 +154,7 @@ module RSpec::Core
       #
       # @return [Array(String)] The example failure message
       def message_lines
-        @lines ||=
-          begin
-            lines = ["Failure/Error: #{read_failed_line.strip}"]
-            lines << "#{exception_class_name}:" unless exception_class_name =~ /RSpec/
-            exception.message.to_s.split("\n").each do |line|
-              lines << "  #{line}" if exception.message
-            end
-            if shared_group
-              lines << "Shared Example Group: \"#{shared_group.metadata[:shared_group_name]}\"" +
-                " called from #{backtrace_formatter.backtrace_line(shared_group.location)}"
-            end
-            lines
-          end
+        add_shared_group_line(failure_lines, NullColorizer)
       end
 
       # Returns the message generated for this failure colorized line by line.
@@ -167,7 +162,7 @@ module RSpec::Core
       # @param colorizer [#wrap] An object to colorize the message_lines by
       # @return [Array(String)] The example failure message colorized
       def colorized_message_lines(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
-        message_lines.map do |line|
+        add_shared_group_line(failure_lines, colorizer).map do |line|
           colorizer.wrap line, RSpec.configuration.failure_color
         end
       end
@@ -217,10 +212,39 @@ module RSpec::Core
         name
       end
 
+      def failure_lines
+        @failure_lines ||=
+          begin
+            lines = ["Failure/Error: #{read_failed_line.strip}"]
+            lines << "#{exception_class_name}:" unless exception_class_name =~ /RSpec/
+            exception.message.to_s.split("\n").each do |line|
+              lines << "  #{line}" if exception.message
+            end
+            lines
+          end
+      end
+
+      def add_shared_group_line(lines, colorizer)
+        unless shared_group_line == ""
+          lines << colorizer.wrap(shared_group_line, RSpec.configuration.default_color)
+        end
+        lines
+      end
+
       def shared_group
         @shared_group ||= group_and_parent_groups.find { |group| group.metadata[:shared_group_name] }
       end
 
+      def shared_group_line
+        @shared_group_line ||=
+          if shared_group
+             "Shared Example Group: \"#{shared_group.metadata[:shared_group_name]}\"" +
+              " called from #{backtrace_formatter.backtrace_line(shared_group.location)}"
+          else
+            ""
+          end
+      end
+
       def group_and_parent_groups
         example.example_group.parent_groups + [example.example_group]
       end

data/lib/rspec/core/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Core.
     module Version
       # Current version of RSpec Core, in semantic versioning format.
-      STRING = '3.0.1'
+      STRING = '3.0.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Steven Baker
@@ -34,7 +34,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -265,6 +265,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.0.1
+summary: rspec-core-3.0.2
 test_files: []
 has_rdoc: