rspec-core 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e63ddb3b6ca4d7f6e9ff8840a31920d58c8381f
-  data.tar.gz: 7be258c6e7b6bcab6570fc1a117511fe0c8070b2
+  metadata.gz: 203d6dff4306be78d671362a48e847eb74c1b115
+  data.tar.gz: 4faa8c73ef35b7a593162c6e338090b697799243
 SHA512:
-  metadata.gz: 8c4c1ec05fdcc0a7693346e32d320d8031be2e270f8d5cfd369d791e2a733ab39a6e6f867354c70d4b8bbf8bc722a841174101a309b46083892f1ef24c8432d6
-  data.tar.gz: 36af8dd8c5c4ffb1034f289dc6107e1e7c552cd6c74ca52c226a96e3279b8a00c3d2edc834b7d74bf1f5f311435f540d8d7c69389a00a3249efc1876a80b641b
+  metadata.gz: 2ed7871a3cdfd07530698efd71d9a96c85b1eef26a8253485a58071adf92a1165c9583d9c9c668a24b66d6f74a9be63b394e16174796324f4b03f7d6537a4a8d
+  data.tar.gz: 2219a50dc96580d34005d7c40a50025f0dc6e1b22fd8e8bf774f0d661f0b31585f69335f221678f800fb12d9b08bac142fe28b67336d4c2e1e89ff824c38ecef

data/Changelog.md

@@ -1,3 +1,20 @@
+### Development
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.3...3-4-maintenance)
+
+### 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.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_group.rb

@@ -347,7 +347,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
@@ -599,10 +599,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/exception_presenter.rb

@@ -92,9 +92,11 @@ module RSpec
 
       private
 
-        def final_exception(exception)
-          if exception.cause
-            final_exception(exception.cause)
+        def final_exception(exception, previous=[])
+          cause = exception.cause
+          if cause && !previous.include?(cause)
+            previous << cause
+            final_exception(cause, previous)
           else
             exception
           end

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/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.

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,7 +81,7 @@ module RSpec
 
         return unless fail_on_error
         $stderr.puts "#{command} failed" if verbose
-        exit $?.exitstatus
+        exit $?.exitstatus || 1
       end
 
     private

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.4.2'
+      STRING = '3.4.3'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -96,10 +96,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 +181,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -293,9 +293,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.4.2
+summary: rspec-core-3.4.3
 test_files: []
 has_rdoc: