rspec-core 3.5.0.beta1 → 3.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 764d595de1ccd035e52340a849aa668815e8dae7
-  data.tar.gz: f7e933e063ee39c7813b9a9618f19b74174ab569
+  metadata.gz: ae10092df64000bc49a31c63ea1e6fb90f8bed34
+  data.tar.gz: 34f6ffdfff90d32dbb96fde2fd9a45e1280bfaeb
 SHA512:
-  metadata.gz: e18131d908d6c1ab5329e13005261cc07aaabade69dfd9ccb09078ec6c2f7efb43231f229168b9eab2ea2ccdde573c55f42cf7beca42e9e2f8cf107e58873944
-  data.tar.gz: 8e38f681409c92781111082573df67e2e138670f1e063a24088eb92102943818eef279e33bef02cac8c38aa73d9228a105f4bcfd39963409ddf51e90ccb4af91
+  metadata.gz: d58b487bff47a2a7d54c86a91e50ec8dadd2f4c5a5a842557cdaa6a2a575dd1409f612a41161ef1862eb15a71b8d9c60bfb3acfc5aec471e0a7fec14467b53d9
+  data.tar.gz: 7e6f624e87c70244933bc521d67d6bed2b3b455556a57aaca8bda715d07a738920414ae179bf432054222507323f002fc2e30a344c999125606672c6dbdccd4f

checksums.yaml.gz.sig

@@ -1,4 +1,4 @@
-__�m�^�=ĽYi��¦���i�8����E�F/���Ұ">�獈-�7�o�kac
�8<�Ȁ�\�ni�Nhr�8̤�*F��I���=
-�R_Il��Mb*�63Ou�@~.)�D�Ynv_��,nzV��e�}k�m�[����D���ɫ<��!�G��[���d|:3.��G�
e����>�
-�u<u8x��j��;��	O8������ �h�H��R�t��#�U� #�|�'~Q�G^c-gS��	iR;�'��D8Q�8����t{�d��g+�<���A�V��?�V
-����?Gh]vX�間��E���$�8��ņ�C���̍z��<�X��P����vTlI��]��VV��M49^�ĝ��;�c�]��?�}��u��tV���L+{��T���^潏�Bķ��Ľv�)7;II,��Z�ɤ�3�A��
+CS+�0������>;���{�t�>զ�Y�`�$Q�h5��-���"�{�C�5�h�:��*�m��L��^���&�����]�fR4�҄��������g�J܊��S�;b�$6�����hu�F
+9t����6)KR�$l4Ƈ�O(��+���-B�* ���bE���n��;U�پJX�r`�7�j�Y�+z%?ϸ�&��)��^��i؏]F�R��e?�_��~� �ݽ6�^lki��cK�U����
+s���*Z
+��0����@�+��uD-�K(-i4N� ,ؚJ�b�	�2>���a�d�%%�Mnp�vT�>�"O�o_�ڪ�.'���QP�&^w�p���F/f+�/@��<��DM

data/Changelog.md

@@ -1,8 +1,41 @@
 ### Development
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0.beta1...master)
 
+Enhancements:
+
+* Remove unneeded `:execution_result` example groups metadata, saving a
+  bit of memory. (Myron Marston, #2172)
+* Apply hooks registered with `config` to previously defined groups.
+  (Myron Marston, #2189)
+* `RSpec::Core::Configuration#reporter` is now public API under semver.
+  (Jon Rowe, #2193)
+* Add new `config.when_first_matching_example_defined` hook. (Myron
+  Marston, #2175)
+
 ### 3.5.0.beta1 / 2016-02-06
-[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.2...v3.5.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.3...v3.5.0.beta1)
+
+### 3.4.4 / 2016-03-09
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.3...v3.4.4)
+
+Bug Fixes:
+
+* Fix `RSpec::Core::RakeTask` so that it works with Rake 11.
+  (Travis Grathwell, #2197)
+
+### 3.4.3 / 2016-02-19
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.2...v3.4.3)
+
+Bug Fixes:
+
+* Prevent a `TypeError` from occuring when running via the rake task when
+  Ruby crashes. (Patrik Wenger, #2161)
+* Only consider example and group declaration lines from a specific file
+  when applying line number filtering, instead of considering all
+  declaration lines from all spec files. (Myron Marston, #2170)
+* Fix failure snippet extraction so that snippets that contain `do-end` style
+  block and end with `end`-only line can be extracted properly.
+  (Yuji Nakayama, #2173)
 
 ### 3.4.2 / 2016-01-26
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.1...v3.4.2)

data/lib/rspec/core.rb

@@ -83,7 +83,6 @@ module RSpec
   def self.configuration
     @configuration ||= RSpec::Core::Configuration.new
   end
-  configuration.expose_dsl_globally = true
 
   # Yields the global configuration to a block.
   # @yield [Configuration] global configuration
@@ -178,4 +177,7 @@ module RSpec
     require MODULES_TO_AUTOLOAD.fetch(name) { return super }
     ::RSpec.const_get(name)
   end
+
+  Core::DSL.expose_globally!
+  Core::SharedExampleGroup::TopLevelDSL.expose_globally!
 end

data/lib/rspec/core/configuration.rb

@@ -343,12 +343,13 @@ module RSpec
       # @private
       attr_writer :files_to_run
       # @private
-      attr_accessor :filter_manager
+      attr_accessor :filter_manager, :world
       # @private
       attr_accessor :static_config_filter_manager
       # @private
       attr_reader :backtrace_formatter, :ordering_manager, :loaded_spec_files
 
+      # rubocop:disable Metrics/AbcSize
       def initialize
         # rubocop:disable Style/GlobalVars
         @start_time = $_rspec_core_load_started_at || ::RSpec::Core::Time.now
@@ -394,9 +395,11 @@ module RSpec
         @derived_metadata_blocks = FilterableItemRepository::QueryOptimized.new(:any?)
         @threadsafe = true
         @max_displayed_failure_line_count = 10
+        @world = World::Null
 
         define_built_in_hooks
       end
+      # rubocop:enable Metrics/AbcSize
 
       # @private
       #
@@ -822,7 +825,7 @@ module RSpec
         end
       end
 
-      # @private
+      # @return [RSpec::Core::Reporter] the currently configured reporter
       def reporter
         # @reporter_buffer should only ever be set in this method to cover
         # initialization of @reporter.
@@ -1158,7 +1161,7 @@ module RSpec
       def include(mod, *filters)
         meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
         @include_modules.append(mod, meta)
-        configure_existing_groups(mod, meta, :safe_include)
+        on_existing_matching_groups(meta) { |group| safe_include(mod, group) }
       end
 
       # Tells RSpec to extend example groups with `mod`. Methods defined in
@@ -1194,7 +1197,7 @@ module RSpec
       def extend(mod, *filters)
         meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
         @extend_modules.append(mod, meta)
-        configure_existing_groups(mod, meta, :safe_extend)
+        on_existing_matching_groups(meta) { |group| safe_extend(mod, group) }
       end
 
       if RSpec::Support::RubyFeatures.module_prepends_supported?
@@ -1233,7 +1236,7 @@ module RSpec
         def prepend(mod, *filters)
           meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
           @prepend_modules.append(mod, meta)
-          configure_existing_groups(mod, meta, :safe_prepend)
+          on_existing_matching_groups(meta) { |group| safe_prepend(mod, group) }
         end
       end
 
@@ -1247,21 +1250,6 @@ module RSpec
         configure_group_with group, @prepend_modules, :safe_prepend
       end
 
-      # @private
-      def configure_group_with(group, module_list, application_method)
-        module_list.items_for(group.metadata).each do |mod|
-          __send__(application_method, mod, group)
-        end
-      end
-
-      # @private
-      def configure_existing_groups(mod, meta, application_method)
-        RSpec.world.all_example_groups.each do |group|
-          next unless meta.empty? || MetadataFilter.apply?(:any?, meta, group.metadata)
-          __send__(application_method, mod, group)
-        end
-      end
-
       # @private
       #
       # Used internally to extend the singleton class of a single example's
@@ -1281,13 +1269,6 @@ module RSpec
         end
       end
 
-      if RSpec::Support::RubyFeatures.module_prepends_supported?
-        # @private
-        def safe_prepend(mod, host)
-          host.__send__(:prepend, mod) unless host < mod
-        end
-      end
-
       # @private
       def requires=(paths)
         directories = ['lib', default_path].select { |p| File.directory? p }
@@ -1305,31 +1286,6 @@ module RSpec
         Regexp.union(regexes)
       end
 
-      # @private
-      if RUBY_VERSION.to_f >= 1.9
-        # @private
-        def safe_include(mod, host)
-          host.__send__(:include, mod) unless host < mod
-        end
-
-        # @private
-        def safe_extend(mod, host)
-          host.extend(mod) unless host.singleton_class < mod
-        end
-      else # for 1.8.7
-        # :nocov:
-        # @private
-        def safe_include(mod, host)
-          host.__send__(:include, mod) unless host.included_modules.include?(mod)
-        end
-
-        # @private
-        def safe_extend(mod, host)
-          host.extend(mod) unless (class << host; self; end).included_modules.include?(mod)
-        end
-        # :nocov:
-      end
-
       # @private
       def configure_mock_framework
         RSpec::Core::ExampleGroup.__send__(:include, mock_framework)
@@ -1352,7 +1308,7 @@ module RSpec
         # in that case, the spec file was loaded by `ruby` and
         # isn't loaded by us here so we only know about it because
         # of an example group being registered in it.
-        RSpec.world.registered_example_group_files.each do |f|
+        world.registered_example_group_files.each do |f|
           loaded_spec_files << f # the registered files are already expended absolute paths
         end
 
@@ -1597,6 +1553,41 @@ module RSpec
         @derived_metadata_blocks.append(block, meta)
       end
 
+      # Defines a callback that runs after the first example with matching
+      # metadata is defined. If no examples are defined with matching metadata,
+      # it will not get called at all.
+      #
+      # This can be used to ensure some setup is performed (such as bootstrapping
+      # a DB or loading a specific file that adds significantly to the boot time)
+      # if needed (as indicated by the presence of an example with matching metadata)
+      # but avoided otherwise.
+      #
+      # @example
+      #   RSpec.configure do |config|
+      #     config.when_first_matching_example_defined(:db) do
+      #       # Load a support file that does some heavyweight setup,
+      #       # including bootstrapping the DB, but only if we have loaded
+      #       # any examples tagged with `:db`.
+      #       require 'support/db'
+      #     end
+      #   end
+      def when_first_matching_example_defined(*filters, &block)
+        specified_meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
+
+        callback = lambda do |example_or_group_meta|
+          # Example groups do not have `:example_group` metadata
+          # (instead they have `:parent_example_group` metadata).
+          return unless example_or_group_meta.key?(:example_group)
+
+          # Ensure the callback only fires once.
+          @derived_metadata_blocks.items_for(specified_meta).delete(callback)
+
+          block.call
+        end
+
+        @derived_metadata_blocks.append(callback, specified_meta)
+      end
+
       # @private
       def apply_derived_metadata_to(metadata)
         @derived_metadata_blocks.items_for(metadata).each do |block|
@@ -1613,9 +1604,13 @@ module RSpec
       # @see #prepend_before
       # @see #after
       # @see #append_after
-      def before(*args, &block)
-        handle_suite_hook(args, @before_suite_hooks, :push,
-                          Hooks::BeforeHook, block) || super(*args, &block)
+      def before(scope=nil, *meta, &block)
+        handle_suite_hook(scope, meta) do
+          @before_suite_hooks << Hooks::BeforeHook.new(block, {})
+        end || begin
+          on_existing_matching_groups({}) { |g| g.before(scope, *meta, &block) }
+          super(scope, *meta, &block)
+        end
       end
       alias_method :append_before, :before
 
@@ -1632,9 +1627,13 @@ module RSpec
       # @see #before
       # @see #after
       # @see #append_after
-      def prepend_before(*args, &block)
-        handle_suite_hook(args, @before_suite_hooks, :unshift,
-                          Hooks::BeforeHook, block) || super(*args, &block)
+      def prepend_before(scope=nil, *meta, &block)
+        handle_suite_hook(scope, meta) do
+          @before_suite_hooks.unshift Hooks::BeforeHook.new(block, {})
+        end || begin
+          on_existing_matching_groups({}) { |g| g.prepend_before(scope, *meta, &block) }
+          super(scope, *meta, &block)
+        end
       end
 
       # Defines a `after` hook. See {Hooks#after} for full docs.
@@ -1646,9 +1645,13 @@ module RSpec
       # @see #append_after
       # @see #before
       # @see #prepend_before
-      def after(*args, &block)
-        handle_suite_hook(args, @after_suite_hooks, :unshift,
-                          Hooks::AfterHook, block) || super(*args, &block)
+      def after(scope=nil, *meta, &block)
+        handle_suite_hook(scope, meta) do
+          @after_suite_hooks.unshift Hooks::AfterHook.new(block, {})
+        end || begin
+          on_existing_matching_groups({}) { |g| g.after(scope, *meta, &block) }
+          super(scope, *meta, &block)
+        end
       end
       alias_method :prepend_after, :after
 
@@ -1665,9 +1668,22 @@ module RSpec
       # @see #append_after
       # @see #before
       # @see #prepend_before
-      def append_after(*args, &block)
-        handle_suite_hook(args, @after_suite_hooks, :push,
-                          Hooks::AfterHook, block) || super(*args, &block)
+      def append_after(scope=nil, *meta, &block)
+        handle_suite_hook(scope, meta) do
+          @after_suite_hooks << Hooks::AfterHook.new(block, {})
+        end || begin
+          on_existing_matching_groups({}) { |g| g.append_after(scope, *meta, &block) }
+          super(scope, *meta, &block)
+        end
+      end
+
+      # Registers `block` as an `around` hook.
+      #
+      # See {Hooks#around} for full `around` hook docs.
+      def around(scope=nil, *meta, &block)
+        on_existing_matching_groups({}) { |g| g.around(scope, *meta, &block) }
+
+        super(scope, *meta, &block)
       end
 
       # @private
@@ -1704,11 +1720,10 @@ module RSpec
 
     private
 
-      def handle_suite_hook(args, collection, append_or_prepend, hook_type, block)
-        scope, meta = *args
+      def handle_suite_hook(scope, meta)
         return nil unless scope == :suite
 
-        if meta
+        unless meta.empty?
           # TODO: in RSpec 4, consider raising an error here.
           # We warn only for backwards compatibility.
           RSpec.warn_with "WARNING: `:suite` hooks do not support metadata since " \
@@ -1717,7 +1732,7 @@ module RSpec
                           "The metadata you have provided (#{meta.inspect}) will be ignored."
         end
 
-        collection.__send__(append_or_prepend, hook_type.new(block, {}))
+        yield
       end
 
       def run_hooks_with(hooks, hook_context)
@@ -1814,7 +1829,7 @@ module RSpec
       end
 
       def assert_no_example_groups_defined(config_option)
-        return unless RSpec.world.example_groups.any?
+        return unless world.example_groups.any?
 
         raise MustBeConfiguredBeforeExampleGroupsError.new(
           "RSpec's #{config_option} configuration option must be configured before " \
@@ -1863,6 +1878,44 @@ module RSpec
         @last_run_statuses = nil
         @spec_files_with_failures = nil
       end
+
+      def configure_group_with(group, module_list, application_method)
+        module_list.items_for(group.metadata).each do |mod|
+          __send__(application_method, mod, group)
+        end
+      end
+
+      def on_existing_matching_groups(meta)
+        world.all_example_groups.each do |group|
+          yield group if meta.empty? || MetadataFilter.apply?(:any?, meta, group.metadata)
+        end
+      end
+
+      if RSpec::Support::RubyFeatures.module_prepends_supported?
+        def safe_prepend(mod, host)
+          host.__send__(:prepend, mod) unless host < mod
+        end
+      end
+
+      if RUBY_VERSION.to_f >= 1.9
+        def safe_include(mod, host)
+          host.__send__(:include, mod) unless host < mod
+        end
+
+        def safe_extend(mod, host)
+          host.extend(mod) unless host.singleton_class < mod
+        end
+      else # for 1.8.7
+        # :nocov:
+        def safe_include(mod, host)
+          host.__send__(:include, mod) unless host.included_modules.include?(mod)
+        end
+
+        def safe_extend(mod, host)
+          host.extend(mod) unless (class << host; self; end).included_modules.include?(mod)
+        end
+        # :nocov:
+      end
     end
     # rubocop:enable Metrics/ClassLength
   end

data/lib/rspec/core/dsl.rb

@@ -40,7 +40,9 @@ module RSpec
         example_group_aliases << name
 
         (class << RSpec; self; end).__send__(:define_method, name) do |*args, &example_group_block|
-          RSpec.world.register RSpec::Core::ExampleGroup.__send__(name, *args, &example_group_block)
+          group = RSpec::Core::ExampleGroup.__send__(name, *args, &example_group_block)
+          RSpec.world.record(group)
+          group
         end
 
         expose_example_group_alias_globally(name) if exposed_globally?

data/lib/rspec/core/example.rb

@@ -178,6 +178,16 @@ module RSpec
         @example_group_class = example_group_class
         @example_block       = example_block
 
+        # Register the example with the group before creating the metadata hash.
+        # This is necessary since creating the metadata hash triggers
+        # `when_first_matching_example_defined` callbacks, in which users can
+        # load RSpec support code which defines hooks. For that to work, the
+        # examples and example groups must be registered at the time the
+        # support code is called or be defined afterwards.
+        # Begin defined beforehand but registered afterwards causes hooks to
+        # not be applied where they should.
+        example_group_class.examples << self
+
         @metadata = Metadata::ExampleHash.create(
           @example_group_class.metadata, user_metadata,
           example_group_class.method(:next_runnable_index_for),

data/lib/rspec/core/example_group.rb

@@ -143,9 +143,7 @@ module RSpec
           options.update(:skip => RSpec::Core::Pending::NOT_YET_IMPLEMENTED) unless block
           options.update(extra_options)
 
-          example = RSpec::Core::Example.new(self, desc, options, block)
-          examples << example
-          example
+          RSpec::Core::Example.new(self, desc, options, block)
         end
       end
 
@@ -235,27 +233,27 @@ module RSpec
           thread_data = RSpec::Support.thread_local_data
           top_level   = self == ExampleGroup
 
-          if top_level
-            if thread_data[:in_example_group]
-              raise "Creating an isolated context from within a context is " \
-                    "not allowed. Change `RSpec.#{name}` to `#{name}` or " \
-                    "move this to a top-level scope."
+          registration_collection =
+            if top_level
+              if thread_data[:in_example_group]
+                raise "Creating an isolated context from within a context is " \
+                      "not allowed. Change `RSpec.#{name}` to `#{name}` or " \
+                      "move this to a top-level scope."
+              end
+
+              thread_data[:in_example_group] = true
+              RSpec.world.example_groups
+            else
+              children
             end
 
-            thread_data[:in_example_group] = true
-          end
-
           begin
-
             description = args.shift
             combined_metadata = metadata.dup
             combined_metadata.merge!(args.pop) if args.last.is_a? Hash
             args << combined_metadata
 
-            subclass(self, description, args, &example_group_block).tap do |child|
-              children << child
-            end
-
+            subclass(self, description, args, registration_collection, &example_group_block)
           ensure
             thread_data.delete(:in_example_group) if top_level
           end
@@ -347,7 +345,7 @@ module RSpec
         @descendant_filtered_examples = nil
         @_descendants = nil
         @parent_groups = nil
-        @declaration_line_numbers = nil
+        @declaration_locations = nil
       end
 
       # Adds an example to the example group
@@ -379,9 +377,9 @@ module RSpec
       # @!endgroup
 
       # @private
-      def self.subclass(parent, description, args, &example_group_block)
+      def self.subclass(parent, description, args, registration_collection, &example_group_block)
         subclass = Class.new(parent)
-        subclass.set_it_up(description, *args, &example_group_block)
+        subclass.set_it_up(description, args, registration_collection, &example_group_block)
         subclass.module_exec(&example_group_block) if example_group_block
 
         # The LetDefinitions module must be included _after_ other modules
@@ -394,7 +392,7 @@ module RSpec
       end
 
       # @private
-      def self.set_it_up(description, *args, &example_group_block)
+      def self.set_it_up(description, args, registration_collection, &example_group_block)
         # Ruby 1.9 has a bug that can lead to infinite recursion and a
         # SystemStackError if you include a module in a superclass after
         # including it in a subclass: https://gist.github.com/845896
@@ -405,6 +403,16 @@ module RSpec
         # here.
         ensure_example_groups_are_configured
 
+        # Register the example with the group before creating the metadata hash.
+        # This is necessary since creating the metadata hash triggers
+        # `when_first_matching_example_defined` callbacks, in which users can
+        # load RSpec support code which defines hooks. For that to work, the
+        # examples and example groups must be registered at the time the
+        # support code is called or be defined afterwards.
+        # Begin defined beforehand but registered afterwards causes hooks to
+        # not be applied where they should.
+        registration_collection << self
+
         user_metadata = Metadata.build_hash_from(args)
 
         @metadata = Metadata::ExampleGroupHash.create(
@@ -444,10 +452,19 @@ module RSpec
       # @private
       def self.next_runnable_index_for(file)
         if self == ExampleGroup
-          RSpec.world.num_example_groups_defined_in(file)
+          # We add 1 so the ids start at 1 instead of 0. This is
+          # necessary for this branch (but not for the other one)
+          # because we register examples and groups with the
+          # `children` and `examples` collection BEFORE this
+          # method is called as part of metadata hash creation,
+          # but the example group is recorded with
+          # `RSpec.world.example_group_counts_by_spec_file` AFTER
+          # the metadata hash is created and the group is returned
+          # to the caller.
+          RSpec.world.num_example_groups_defined_in(file) + 1
         else
           children.count + examples.count
-        end + 1
+        end
       end
 
       # @private
@@ -613,10 +630,10 @@ module RSpec
       end
 
       # @private
-      def self.declaration_line_numbers
-        @declaration_line_numbers ||= [metadata[:line_number]] +
-          examples.map { |e| e.metadata[:line_number] } +
-          FlatMap.flat_map(children, &:declaration_line_numbers)
+      def self.declaration_locations
+        @declaration_locations ||= [Metadata.location_tuple_from(metadata)] +
+          examples.map { |e| Metadata.location_tuple_from(e.metadata) } +
+          FlatMap.flat_map(children, &:declaration_locations)
       end
 
       # @return [String] the unique id of this example group. Pass

data/lib/rspec/core/formatters/snippet_extractor.rb

@@ -23,13 +23,6 @@ module RSpec
         if RSpec::Support::RubyFeatures.ripper_supported?
           NoExpressionAtLineError = Class.new(StandardError)
 
-          PAREN_TOKEN_TYPE_PAIRS = {
-            :on_lbracket    => :on_rbracket,
-            :on_lparen      => :on_rparen,
-            :on_lbrace      => :on_rbrace,
-            :on_heredoc_beg => :on_heredoc_end
-          }
-
           attr_reader :source, :beginning_line_number, :max_line_count
 
           def self.extract_expression_lines_at(file_path, beginning_line_number, max_line_count=nil)
@@ -64,29 +57,29 @@ module RSpec
           def line_range_of_expression
             @line_range_of_expression ||= begin
               line_range = line_range_of_location_nodes_in_expression
-              initial_unclosed_parens = unclosed_paren_tokens_in_line_range(line_range)
-              unclosed_parens = initial_unclosed_parens
+              initial_unclosed_tokens = unclosed_tokens_in_line_range(line_range)
+              unclosed_tokens = initial_unclosed_tokens
 
-              until (initial_unclosed_parens & unclosed_parens).empty?
+              until (initial_unclosed_tokens & unclosed_tokens).empty?
                 line_range = (line_range.begin)..(line_range.end + 1)
-                unclosed_parens = unclosed_paren_tokens_in_line_range(line_range)
+                unclosed_tokens = unclosed_tokens_in_line_range(line_range)
               end
 
               line_range
             end
           end
 
-          def unclosed_paren_tokens_in_line_range(line_range)
+          def unclosed_tokens_in_line_range(line_range)
             tokens = FlatMap.flat_map(line_range) do |line_number|
               source.tokens_by_line_number[line_number]
             end
 
             tokens.each_with_object([]) do |token, unclosed_tokens|
-              if PAREN_TOKEN_TYPE_PAIRS.keys.include?(token.type)
+              if token.opening?
                 unclosed_tokens << token
               else
                 index = unclosed_tokens.rindex do |unclosed_token|
-                  PAREN_TOKEN_TYPE_PAIRS[unclosed_token.type] == token.type
+                  unclosed_token.closed_by?(token)
                 end
                 unclosed_tokens.delete_at(index) if index
               end

data/lib/rspec/core/hooks.rb

@@ -342,14 +342,7 @@ module RSpec
     private
 
       # @private
-      class Hook
-        attr_reader :block, :options
-
-        def initialize(block, options)
-          @block = block
-          @options = options
-        end
-      end
+      Hook = Struct.new(:block, :options)
 
       # @private
       class BeforeHook < Hook

data/lib/rspec/core/metadata.rb

@@ -106,6 +106,11 @@ module RSpec
         "#{metadata[:rerun_file_path]}[#{metadata[:scoped_id]}]"
       end
 
+      # @private
+      def self.location_tuple_from(metadata)
+        [metadata[:absolute_file_path], metadata[:line_number]]
+      end
+
       # @private
       # Used internally to populate metadata hashes with computed keys
       # managed by RSpec.
@@ -123,7 +128,6 @@ module RSpec
         def populate
           ensure_valid_user_keys
 
-          metadata[:execution_result] = Example::ExecutionResult.new
           metadata[:block]            = block
           metadata[:description_args] = description_args
           metadata[:description]      = build_description_from(*metadata[:description_args])
@@ -214,6 +218,7 @@ module RSpec
           end)
           group_metadata.update(example_metadata)
 
+          example_metadata[:execution_result] = Example::ExecutionResult.new
           example_metadata[:example_group] = group_metadata
           example_metadata[:shared_group_inclusion_backtrace] = SharedExampleGroupInclusionStackFrame.current_backtrace
           example_metadata.delete(:parent_example_group)

data/lib/rspec/core/metadata_filter.rb

@@ -15,9 +15,9 @@ module RSpec
         # @private
         def filter_applies?(key, value, metadata)
           silence_metadata_example_group_deprecations do
-            return location_filter_applies?(value, metadata)          if key == :locations
-            return id_filter_applies?(value, metadata)                if key == :ids
-            return filters_apply?(key, value, metadata)               if Hash === value
+            return location_filter_applies?(value, metadata) if key == :locations
+            return id_filter_applies?(value, metadata)       if key == :ids
+            return filters_apply?(key, value, metadata)      if Hash === value
 
             return false unless metadata.key?(key)
             return true if TrueClass === value && !!metadata[key]
@@ -49,13 +49,14 @@ module RSpec
         end
 
         def location_filter_applies?(locations, metadata)
-          line_numbers = example_group_declaration_lines(locations, metadata)
-          line_number_filter_applies?(line_numbers, metadata)
-        end
+          Metadata.ascend(metadata).any? do |meta|
+            file_path = meta[:absolute_file_path]
+            line_num  = meta[:line_number]
 
-        def line_number_filter_applies?(line_numbers, metadata)
-          preceding_declaration_lines = line_numbers.map { |n| RSpec.world.preceding_declaration_line(n) }
-          !(relevant_line_numbers(metadata) & preceding_declaration_lines).empty?
+            locations[file_path].any? do |filter_line_num|
+              line_num == RSpec.world.preceding_declaration_line(file_path, filter_line_num)
+            end
+          end
         end
 
         def proc_filter_applies?(key, proc, metadata)
@@ -66,16 +67,6 @@ module RSpec
           end
         end
 
-        def relevant_line_numbers(metadata)
-          Metadata.ascend(metadata).map { |meta| meta[:line_number] }
-        end
-
-        def example_group_declaration_lines(locations, metadata)
-          FlatMap.flat_map(Metadata.ascend(metadata)) do |meta|
-            locations[meta[:absolute_file_path]]
-          end.uniq
-        end
-
         def filters_apply?(key, value, metadata)
           subhash = metadata[key]
           return false unless Hash === subhash || HashImitatable === subhash

data/lib/rspec/core/rake_task.rb

@@ -81,14 +81,14 @@ module RSpec
 
         return unless fail_on_error
         $stderr.puts "#{command} failed" if verbose
-        exit $?.exitstatus
+        exit $?.exitstatus || 1
       end
 
     private
 
       # @private
       def define(args, &task_block)
-        desc "Run RSpec code examples" unless ::Rake.application.last_comment
+        desc "Run RSpec code examples" unless ::Rake.application.last_description
 
         task name, *args do |_, task_args|
           RakeFileUtils.__send__(:verbose, verbose) do

data/lib/rspec/core/runner.rb

@@ -150,19 +150,28 @@ module RSpec
       end
 
       # @private
-      # rubocop:disable Lint/EnsureReturn
       def self.running_in_drb?
-        if defined?(DRb) && DRb.current_server && DRb.current_server.alive?
-          require 'socket'
-          require 'uri'
-          local_ipv4 = IPSocket.getaddress(Socket.gethostname)
-          local_drb = ["127.0.0.1", "localhost", local_ipv4].any? { |addr| addr == URI(DRb.current_server.uri).host }
-        end
-      rescue DRb::DRbServerNotFound
-      ensure
-        return local_drb || false
+        return false unless defined?(DRb)
+
+        server = begin
+                   DRb.current_server
+                 rescue DRb::DRbServerNotFound
+                   return false
+                 end
+
+        return false unless server && server.alive?
+
+        require 'socket'
+        require 'uri'
+
+        local_ipv4 = begin
+                       IPSocket.getaddress(Socket.gethostname)
+                     rescue SocketError
+                       return false
+                     end
+
+        ["127.0.0.1", "localhost", local_ipv4].any? { |addr| addr == URI(DRb.current_server.uri).host }
       end
-      # rubocop:enable Lint/EnsureReturn
 
       # @private
       def self.trap_interrupt
@@ -175,7 +184,7 @@ module RSpec
           exit!(1)
         else
           RSpec.world.wants_to_quit = true
-          STDERR.puts "\nRSpec is shutting down and will print the summary report... Interrupt again to force quit."
+          $stderr.puts "\nRSpec is shutting down and will print the summary report... Interrupt again to force quit."
         end
       end
     end

data/lib/rspec/core/source/token.rb

@@ -6,6 +6,17 @@ module RSpec
       # @private
       # A wrapper for Ripper token which is generated with `Ripper.lex`.
       class Token
+        CLOSING_TYPES_BY_OPENING_TYPE = {
+          :on_lbracket    => :on_rbracket,
+          :on_lparen      => :on_rparen,
+          :on_lbrace      => :on_rbrace,
+          :on_heredoc_beg => :on_heredoc_end
+        }.freeze
+
+        CLOSING_KEYWORDS_BY_OPENING_KEYWORD = {
+          'do' => 'end'
+        }.freeze
+
         attr_reader :token
 
         def self.tokens_from_ripper_tokens(ripper_tokens)
@@ -37,6 +48,38 @@ module RSpec
         def inspect
           "#<#{self.class} #{type} #{string.inspect}>"
         end
+
+        def keyword?
+          type == :on_kw
+        end
+
+        def opening?
+          opening_delimiter? || opening_keyword?
+        end
+
+        def closed_by?(other)
+          closed_by_delimiter?(other) || closed_by_keyword?(other)
+        end
+
+        private
+
+        def opening_delimiter?
+          CLOSING_TYPES_BY_OPENING_TYPE.key?(type)
+        end
+
+        def opening_keyword?
+          return false unless keyword?
+          CLOSING_KEYWORDS_BY_OPENING_KEYWORD.key?(string)
+        end
+
+        def closed_by_delimiter?(other)
+          other.type == CLOSING_TYPES_BY_OPENING_TYPE[type]
+        end
+
+        def closed_by_keyword?(other)
+          return false unless other.keyword?
+          other.string == CLOSING_KEYWORDS_BY_OPENING_KEYWORD[string]
+        end
       end
     end
   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.5.0.beta1'
+      STRING = '3.5.0.beta2'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -12,6 +12,7 @@ module RSpec
 
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration
+        configuration.world = self
         @example_groups = []
         @example_group_counts_by_spec_file = Hash.new(0)
         @filtered_examples = Hash.new do |hash, group|
@@ -47,12 +48,10 @@ module RSpec
 
       # @api private
       #
-      # Register an example group.
-      def register(example_group)
+      # Records an example group.
+      def record(example_group)
         @configuration.on_example_group_definition_callbacks.each { |block| block.call(example_group) }
-        example_groups << example_group
         @example_group_counts_by_spec_file[example_group.metadata[:absolute_file_path]] += 1
-        example_group
       end
 
       # @private
@@ -96,10 +95,12 @@ module RSpec
       # @api private
       #
       # Find line number of previous declaration.
-      def preceding_declaration_line(filter_line)
-        declaration_line_numbers.sort.inject(nil) do |highest_prior_declaration_line, line|
-          line <= filter_line ? line : highest_prior_declaration_line
+      def preceding_declaration_line(absolute_file_name, filter_line)
+        line_numbers = descending_declaration_line_numbers_by_file.fetch(absolute_file_name) do
+          return nil
         end
+
+        line_numbers.find { |num| num <= filter_line }
       end
 
       # @private
@@ -179,8 +180,22 @@ module RSpec
 
     private
 
-      def declaration_line_numbers
-        @declaration_line_numbers ||= FlatMap.flat_map(example_groups, &:declaration_line_numbers)
+      def descending_declaration_line_numbers_by_file
+        @descending_declaration_line_numbers_by_file ||= begin
+          declaration_locations = FlatMap.flat_map(example_groups, &:declaration_locations)
+          hash_of_arrays = Hash.new { |h, k| h[k] = [] }
+
+          # TODO: change `inject` to `each_with_object` when we drop 1.8.7 support.
+          line_nums_by_file = declaration_locations.inject(hash_of_arrays) do |hash, (file_name, line_number)|
+            hash[file_name] << line_number
+            hash
+          end
+
+          line_nums_by_file.each_value do |list|
+            list.sort!
+            list.reverse!
+          end
+        end
       end
 
       def fail_if_config_and_cli_options_invalid
@@ -192,6 +207,24 @@ module RSpec
           1 # exit code
         )
       end
+
+      # @private
+      # Provides a null implementation for initial use by configuration.
+      module Null
+        def self.registered_example_group_files
+          []
+        end
+
+        # :nocov:
+        def self.example_groups
+          []
+        end
+
+        def self.all_example_groups
+          []
+        end
+        # :nocov:
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta1
+  version: 3.5.0.beta2
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -54,28 +54,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta1
+        version: 3.5.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta1
-- !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
+        version: 3.5.0.beta2
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -293,9 +279,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.5.0.beta1
+summary: rspec-core-3.5.0.beta2
 test_files: []
 has_rdoc: