rspec-core 3.4.4 → 3.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80afd0a6f2838eb53ebb2217151c1fb0923b24f7
-  data.tar.gz: 6e16ffeac1295c98109d282d4ba08cfb64686f0a
+  metadata.gz: 764d595de1ccd035e52340a849aa668815e8dae7
+  data.tar.gz: f7e933e063ee39c7813b9a9618f19b74174ab569
 SHA512:
-  metadata.gz: 940d7b7c9ae596935443556c7faf294c917daa995441d5123ef93c21902bb8be092ae981c0afc1cac0f6f551a743865b3209f5b1710671980ae4cbd082d983a1
-  data.tar.gz: 97e2e19769e250c59a00a205cf8e2388deae8de8290e3d2d372c4a582db638c296ec318b75ff86036e96ec462501910272bf4bb3ed421daca77f11f9f62a203c
+  metadata.gz: e18131d908d6c1ab5329e13005261cc07aaabade69dfd9ccb09078ec6c2f7efb43231f229168b9eab2ea2ccdde573c55f42cf7beca42e9e2f8cf107e58873944
+  data.tar.gz: 8e38f681409c92781111082573df67e2e138670f1e063a24088eb92102943818eef279e33bef02cac8c38aa73d9228a105f4bcfd39963409ddf51e90ccb4af91

checksums.yaml.gz.sig

@@ -1,5 +1,4 @@
-
_rE׻�E���
�������"U_��1w�3$h���b�e��L��k�,�Ժ)��K���i�sK��P|�.�۔<
-e���@y�z>(�U�
-|����^�̞����]����0��	��B�nڀ��QQM��"��B�`]zeIν{�J\>"�
S))����`Gg[ȣϹ����9;����-��/�
-A�"	7ɞ.�R*�+4p�+A�)�����Wg?Dx0o��bRlJ�sE8a��S$V�6g��n�Y70��t�˄x�,)](�\�	��IQ%�޿�Y�Z��s+"�1
-@�,��[+}���U~���G�mN)I�C��Hl��l�4�M֬Z�{�Q�+j�����f��:�I+§89��
E��ǀ�H��!�>�A�͝2ց+�G5�
��0��-��C�b��~��
+__�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��

data/Changelog.md

@@ -1,27 +1,8 @@
 ### Development
-[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.4...3-4-maintenance)
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0.beta1...master)
 
-### 3.4.4 / 2016-03-09
-[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.3...3.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...3.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.5.0.beta1 / 2016-02-06
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.2...v3.5.0.beta1)
 
 ### 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/example.rb

@@ -9,7 +9,7 @@ module RSpec
     #
     # This allows us to provide rich metadata about each individual
     # example without adding tons of methods directly to the ExampleGroup
-    # that users may inadvertantly redefine.
+    # that users may inadvertently redefine.
     #
     # Useful for configuring logging and/or taking some action based
     # on the state of an example's metadata.

data/lib/rspec/core/example_group.rb

@@ -347,7 +347,7 @@ module RSpec
         @descendant_filtered_examples = nil
         @_descendants = nil
         @parent_groups = nil
-        @declaration_locations = nil
+        @declaration_line_numbers = nil
       end
 
       # Adds an example to the example group
@@ -414,6 +414,8 @@ module RSpec
         )
         ExampleGroups.assign_const(self)
 
+        @currently_executing_a_context_hook = false
+
         hooks.register_globals(self, RSpec.configuration.hooks)
         RSpec.configuration.configure_group(self)
       end
@@ -486,15 +488,24 @@ module RSpec
         end
       end
 
+      # Returns true if a `before(:context)` or `after(:context)`
+      # hook is currently executing.
+      def self.currently_executing_a_context_hook?
+        @currently_executing_a_context_hook
+      end
+
       # @private
       def self.run_before_context_hooks(example_group_instance)
         set_ivars(example_group_instance, superclass_before_context_ivars)
 
+        @currently_executing_a_context_hook = true
+
         ContextHookMemoized::Before.isolate_for_context_hook(example_group_instance) do
           hooks.run(:before, :context, example_group_instance)
         end
       ensure
         store_before_context_ivars(example_group_instance)
+        @currently_executing_a_context_hook = false
       end
 
       if RUBY_VERSION.to_f >= 1.9
@@ -525,11 +536,14 @@ module RSpec
       def self.run_after_context_hooks(example_group_instance)
         set_ivars(example_group_instance, before_context_ivars)
 
+        @currently_executing_a_context_hook = true
+
         ContextHookMemoized::After.isolate_for_context_hook(example_group_instance) do
           hooks.run(:after, :context, example_group_instance)
         end
       ensure
         before_context_ivars.clear
+        @currently_executing_a_context_hook = false
       end
 
       # Runs all the examples in this group.
@@ -599,10 +613,10 @@ module RSpec
       end
 
       # @private
-      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)
+      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)
       end
 
       # @return [String] the unique id of this example group. Pass

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

@@ -408,6 +408,8 @@ module RSpec
           # ignore it.
           return if Pending::PendingExampleFixedError === exception
 
+          return if exception == self
+
           all_exceptions << exception
 
           if exception.class.name =~ /RSpec/

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

@@ -23,6 +23,13 @@ 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)
@@ -57,29 +64,29 @@ module RSpec
           def line_range_of_expression
             @line_range_of_expression ||= begin
               line_range = line_range_of_location_nodes_in_expression
-              initial_unclosed_tokens = unclosed_tokens_in_line_range(line_range)
-              unclosed_tokens = initial_unclosed_tokens
+              initial_unclosed_parens = unclosed_paren_tokens_in_line_range(line_range)
+              unclosed_parens = initial_unclosed_parens
 
-              until (initial_unclosed_tokens & unclosed_tokens).empty?
+              until (initial_unclosed_parens & unclosed_parens).empty?
                 line_range = (line_range.begin)..(line_range.end + 1)
-                unclosed_tokens = unclosed_tokens_in_line_range(line_range)
+                unclosed_parens = unclosed_paren_tokens_in_line_range(line_range)
               end
 
               line_range
             end
           end
 
-          def unclosed_tokens_in_line_range(line_range)
+          def unclosed_paren_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 token.opening?
+              if PAREN_TOKEN_TYPE_PAIRS.keys.include?(token.type)
                 unclosed_tokens << token
               else
                 index = unclosed_tokens.rindex do |unclosed_token|
-                  unclosed_token.closed_by?(token)
+                  PAREN_TOKEN_TYPE_PAIRS[unclosed_token.type] == token.type
                 end
                 unclosed_tokens.delete_at(index) if index
               end

data/lib/rspec/core/metadata.rb

@@ -106,11 +106,6 @@ 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.

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,14 +49,13 @@ module RSpec
         end
 
         def location_filter_applies?(locations, metadata)
-          Metadata.ascend(metadata).any? do |meta|
-            file_path = meta[:absolute_file_path]
-            line_num  = meta[:line_number]
+          line_numbers = example_group_declaration_lines(locations, metadata)
+          line_number_filter_applies?(line_numbers, metadata)
+        end
 
-            locations[file_path].any? do |filter_line_num|
-              line_num == RSpec.world.preceding_declaration_line(file_path, filter_line_num)
-            end
-          end
+        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?
         end
 
         def proc_filter_applies?(key, proc, metadata)
@@ -67,6 +66,16 @@ 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/option_parser.rb

@@ -151,7 +151,7 @@ module RSpec::Core
                                          begin
                                            Integer(argument)
                                          rescue ArgumentError
-                                           RSpec.warning "Non integer specified as profile count, seperate " \
+                                           RSpec.warning "Non integer specified as profile count, separate " \
                                                        "your path from options with -- e.g. " \
                                                        "`rspec --profile -- #{argument}`",
                                                          :call_site => nil

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 || 1
+        exit $?.exitstatus
       end
 
     private
 
       # @private
       def define(args, &task_block)
-        desc "Run RSpec code examples" unless ::Rake.application.last_description
+        desc "Run RSpec code examples" unless ::Rake.application.last_comment
 
         task name, *args do |_, task_args|
           RakeFileUtils.__send__(:verbose, verbose) do

data/lib/rspec/core/runner.rb

@@ -152,7 +152,7 @@ module RSpec
       # @private
       # rubocop:disable Lint/EnsureReturn
       def self.running_in_drb?
-        if defined?(DRb) && DRb.current_server
+        if defined?(DRb) && DRb.current_server && DRb.current_server.alive?
           require 'socket'
           require 'uri'
           local_ipv4 = IPSocket.getaddress(Socket.gethostname)

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

@@ -6,17 +6,6 @@ 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)
@@ -48,38 +37,6 @@ 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.4.4'
+      STRING = '3.5.0.beta1'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -96,12 +96,10 @@ module RSpec
       # @api private
       #
       # Find line number of previous declaration.
-      def preceding_declaration_line(absolute_file_name, filter_line)
-        line_numbers = descending_declaration_line_numbers_by_file.fetch(absolute_file_name) do
-          return nil
+      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
         end
-
-        line_numbers.find { |num| num <= filter_line }
       end
 
       # @private
@@ -181,22 +179,8 @@ module RSpec
 
     private
 
-      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
+      def declaration_line_numbers
+        @declaration_line_numbers ||= FlatMap.flat_map(example_groups, &:declaration_line_numbers)
       end
 
       def fail_if_config_and_cli_options_invalid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.5.0.beta1
 platform: ruby
 authors:
 - Steven Baker
@@ -46,34 +46,34 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        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
 - !ruby/object:Gem::Dependency
@@ -288,14 +288,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.4.4
+summary: rspec-core-3.5.0.beta1
 test_files: []
 has_rdoc: