rspec-support 3.8.0 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 631283161faf72604c2081235f9acbbda6ea980f
-  data.tar.gz: 99170c1beccff1f998787873e0bd156af46ca9ef
+SHA256:
+  metadata.gz: cd43ff0da6f307b7e9ccc56ceb9e3fdd972f27b7d160b8ba860c6625bb62f39b
+  data.tar.gz: a0c09feee171d7a1b02793888c995d9dd42f20660b6449db9c79eeed4a297b3f
 SHA512:
-  metadata.gz: 23464780384e45e24c4a8a8255dce0f78d0afd406723d817d68ef66d20a8c0d973d40bdc6bee54188e9714c6ffb20b116045a08bb9c90aa11cb2ec2bdea453a6
-  data.tar.gz: 4b08b17ebd14c92b615d9d6838d1be78c32b9e695933c895bb99710693bec391736ce26864f139c0e22f794e085367aa5cf0081b659068994cffddbfea23f0bc
+  metadata.gz: 247e3e818ef3c367c1ecbc4938dca5a0ca7c9b185c1b608900461e146ea1f8c5053e0d97adc692cd0871debeb764407a3403682ce425aebf1de6511f17f366fc
+  data.tar.gz: b3b600ca9061f37b529af60308df73b4c9724de1d173ee01eda44c0f61404396d8f2af7a52b071db93299bb607905e8b1aa3ddac29cc364ef41136a1815735d1

data/Changelog.md

@@ -1,3 +1,133 @@
+### Development
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.12.1...3-12-maintenance)
+
+### 3.12.1 / 2023-06-26
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.12.0...v3.12.1)
+
+Bug Fixes:
+
+* Fix `RSpec::Support.thread_local_data` to be Thread local but not Fiber local.
+  (Jon Rowe, #581)
+
+### 3.12.0 / 2022-10-26
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.11.1...v3.12.0)
+Enhancements:
+
+* Add `RSpec::Support::RubyFeatures.distincts_kw_args_from_positional_hash?`
+  (Jean byroot Boussier, #535)
+
+### 3.11.1 / 2022-09-12
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.11.0...v3.11.1)
+
+Bug Fixes:
+
+* Fix ripper detection on TruffleRuby. (Brandon Fish, #541)
+
+### 3.11.0 / 2022-02-09
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.10.3...v3.11.0)
+
+No changes. Released to support other RSpec releases.
+
+### 3.10.3 / 2021-11-03
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.10.2...v3.10.3)
+
+Bug Fixes:
+
+* Use `Mutex#owned?` to allow `RSpec::Support::ReentrantMutex` to work in
+  nested Fibers on Ruby 3.0 and later. (Benoit Daloze, #503, #504)
+* Support `end`-less methods in `RSpec::Support::Source::Token`
+  so that RSpec won't hang when an `end`-less method raises an error. (Yuji Nakayama, #505)
+
+### 3.10.2 / 2021-01-28
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.10.1...v3.10.2)
+
+Bug Fixes:
+
+* Fix issue with `RSpec::Support.define_optimized_require_for_rspec` on JRuby
+  9.1.17.0 (Jon Rowe, #492)
+
+### 3.10.1 / 2020-12-27
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.10.0...v3.10.1)
+
+Bug Fixes:
+
+* Fix deprecation expectations to fail correctly when
+  asserting on messages. (Phil Pirozhkov, #453)
+
+### 3.10.0 / 2020-10-30
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.9.4...v3.10.0)
+
+No changes. Released to support other RSpec releases.
+
+### 3.9.4 / 2020-10-23
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.9.3...v3.9.4)
+
+Bug Fixes:
+
+* Flag ripper as supported on Truffle Ruby. (Brandon Fish, #427)
+* Prevent stubbing `File.read` from breaking source extraction.
+  (Jon Rowe, #431)
+
+### 3.9.3 / 2020-05-02
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.9.2...v3.9.3)
+
+Bug Fixes:
+
+* Mark ripper as unsupported on Truffle Ruby. (Brandon Fish, #395)
+* Mark ripper as unsupported on JRuby 9.2.0.0. (Brian Hawley, #400)
+* Capture `Mutex.new` for our `RSpec::Support:Mutex` in order to
+  allow stubbing `Mutex.new`. (Jon Rowe, #411)
+
+### 3.9.2 / 2019-12-30
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.9.1...v3.9.2)
+
+Bug Fixes:
+
+* Remove unneeded eval. (Matijs van Zuijlen, #394)
+
+### 3.9.1 / 2019-12-28
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.9.0...v3.9.1)
+
+Bug Fixes:
+
+* Remove warning caused by keyword arguments on Ruby 2.7.0.
+  (Jon Rowe, #392)
+
+### 3.9.0 / 2019-10-07
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.8.3...v3.9.0)
+
+*NO CHANGES*
+
+Version 3.9.0 was released to allow other RSpec gems to release 3.9.0.
+
+### 3.8.3 / 2019-10-02
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.8.2...v3.8.3)
+
+Bug Fixes:
+
+* Escape \r when outputting strings inside arrays.
+  (Tomita Masahiro, Jon Rowe, #378)
+* Ensure that optional hash arguments are recognised correctly vs keyword
+  arguments. (Evgeni Dzhelyov, #366)
+
+### 3.8.2 / 2019-06-10
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.8.1...v3.8.2)
+
+Bug Fixes:
+
+* Ensure that an empty hash is recognised as empty keyword arguments when
+  applicable. (Thomas Walpole, #375)
+* Ensure that diffing truthy values produce diffs consistently.
+  (Lucas Nestor, #377)
+
+### 3.8.1 / 2019-03-03
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.8.0...v3.8.1)
+
+Bug Fixes:
+
+* Ensure that inspecting a `SimpleDelegator` based object works regardless of
+  visibilty of the `__getobj__` method. (Jon Rowe, #369)
+
 ### 3.8.0 / 2018-08-04
 [Full Changelog](http://github.com/rspec/rspec-support/compare/v3.7.1...v3.8.0)
 

data/README.md

@@ -1,4 +1,4 @@
-# RSpec::Support
+# RSpec::Support [![Build Status](https://github.com/rspec/rspec-support/workflows/RSpec%20CI/badge.svg)](https://github.com/rspec/rspec-support/actions)
 
 `RSpec::Support` provides common functionality to `RSpec::Core`,
 `RSpec::Expectations` and `RSpec::Mocks`. It is considered
@@ -8,12 +8,12 @@ suitable for internal use only at this time.
 
 Install one or more of the `RSpec` gems.
 
-Want to run against the `master` branch? You'll need to include the dependent
+Want to run against the `main` branch? You'll need to include the dependent
 RSpec repos as well. Add the following to your `Gemfile`:
 
 ```ruby
 %w[rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
-  gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'master'
+  gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'main'
 end
 ```
 

data/lib/rspec/support/caller_filter.rb

@@ -25,7 +25,7 @@ module RSpec
     # when `CallerFilter.first_non_rspec_line` is called from the top level of a required
     # file, but it depends on if rubygems is loaded or not. We don't want to have to deal
     # with this complexity in our `RSpec.deprecate` calls, so we ignore it here.
-    IGNORE_REGEX = Regexp.union(LIB_REGEX, "rubygems/core_ext/kernel_require.rb")
+    IGNORE_REGEX = Regexp.union(LIB_REGEX, "rubygems/core_ext/kernel_require.rb", "<internal:")
 
     if RSpec::Support::RubyFeatures.caller_locations_supported?
       # This supports args because it's more efficient when the caller specifies
@@ -34,7 +34,7 @@ module RSpec
       # be found in a small number of stack frames from `skip_frames`.
       #
       # Note that there is a risk to passing a `skip_frames` value that is too high:
-      # If it skippped the first non-rspec line, then this method would return the
+      # If it skipped the first non-rspec line, then this method would return the
       # 2nd or 3rd (or whatever) non-rspec line. Thus, you generally shouldn't pass
       # values for these parameters, particularly since most places that use this are
       # not hot spots (generally it gets used for deprecation warnings). However,
@@ -69,7 +69,7 @@ module RSpec
           return line.to_s if line
 
           skip_frames += increment
-          increment   *= 2 # The choice of two here is arbitrary.
+          increment *= 2 # The choice of two here is arbitrary.
         end
       end
     else

data/lib/rspec/support/differ.rb

@@ -6,12 +6,12 @@ require 'pp'
 
 module RSpec
   module Support
-    # rubocop:disable ClassLength
+    # rubocop:disable Metrics/ClassLength
     class Differ
       def diff(actual, expected)
         diff = ""
 
-        if actual && expected
+        unless actual.nil? || expected.nil?
           if all_strings?(actual, expected)
             if any_multiline_strings?(actual, expected)
               diff = diff_as_string(coerce_to_string(actual), coerce_to_string(expected))
@@ -24,7 +24,7 @@ module RSpec
         diff.to_s
       end
 
-      # rubocop:disable MethodLength
+      # rubocop:disable Metrics/MethodLength
       def diff_as_string(actual, expected)
         encoding = EncodedString.pick_encoding(actual, expected)
 
@@ -52,7 +52,7 @@ module RSpec
       rescue Encoding::CompatibilityError
         handle_encoding_errors(actual, expected)
       end
-      # rubocop:enable MethodLength
+      # rubocop:enable Metrics/MethodLength
 
       def diff_as_object(actual, expected)
         actual_as_string = object_to_string(actual)
@@ -97,7 +97,7 @@ module RSpec
           if Array === entry
             entry.inspect
           else
-            entry.to_s.gsub("\n", "\\n")
+            entry.to_s.gsub("\n", "\\n").gsub("\r", "\\r")
           end
         end
       end
@@ -210,6 +210,6 @@ module RSpec
         end
       end
     end
-    # rubocop:enable ClassLength
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rspec/support/encoded_string.rb

@@ -5,31 +5,11 @@ module RSpec
       # Reduce allocations by storing constants.
       UTF_8    = "UTF-8"
       US_ASCII = "US-ASCII"
-      #
-      # In MRI 2.1 'invalid: :replace' changed to also replace an invalid byte sequence
-      # see https://github.com/ruby/ruby/blob/v2_1_0/NEWS#L176
-      # https://www.ruby-forum.com/topic/6861247
-      # https://twitter.com/nalsh/status/553413844685438976
-      #
-      # For example, given:
-      #   "\x80".force_encoding("Emacs-Mule").encode(:invalid => :replace).bytes.to_a
-      #
-      # On MRI 2.1 or above: 63  # '?'
-      # else               : 128 # "\x80"
-      #
+
       # Ruby's default replacement string is:
       #   U+FFFD ("\xEF\xBF\xBD"), for Unicode encoding forms, else
       #   ?      ("\x3F")
       REPLACE = "?"
-      ENCODE_UNCONVERTABLE_BYTES =  {
-        :invalid => :replace,
-        :undef   => :replace,
-        :replace => REPLACE
-      }
-      ENCODE_NO_CONVERTER = {
-        :invalid => :replace,
-        :replace => REPLACE
-      }
 
       def initialize(string, encoding=nil)
         @encoding = encoding
@@ -80,7 +60,7 @@ module RSpec
         #     vs "\x80".encode('UTF-8','ASCII-8BIT', undef: :replace, replace: '<undef>')
         #     # => '<undef>'
         #   Encoding::CompatibilityError
-        #     when Encoding.compatibile?(str1, str2) is nil
+        #     when Encoding.compatible?(str1, str2) is nil
         #     e.g. utf_16le_emoji_string.split("\n")
         #     e.g. valid_unicode_string.encode(utf8_encoding) << ascii_string
         #   Encoding::InvalidByteSequenceError:
@@ -112,9 +92,25 @@ module RSpec
           string = remove_invalid_bytes(string)
           string.encode(@encoding)
         rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-          string.encode(@encoding, ENCODE_UNCONVERTABLE_BYTES)
+          # Originally defined as a constant to avoid unneeded allocations, this hash must
+          # be defined inline (without {}) to avoid warnings on Ruby 2.7
+          #
+          # In MRI 2.1 'invalid: :replace' changed to also replace an invalid byte sequence
+          # see https://github.com/ruby/ruby/blob/v2_1_0/NEWS#L176
+          # https://www.ruby-forum.com/topic/6861247
+          # https://twitter.com/nalsh/status/553413844685438976
+          #
+          # For example, given:
+          #   "\x80".force_encoding("Emacs-Mule").encode(:invalid => :replace).bytes.to_a
+          #
+          # On MRI 2.1 or above: 63  # '?'
+          # else               : 128 # "\x80"
+          #
+          string.encode(@encoding, :invalid => :replace, :undef => :replace, :replace => REPLACE)
         rescue Encoding::ConverterNotFoundError
-          string.dup.force_encoding(@encoding).encode(ENCODE_NO_CONVERTER)
+          # Originally defined as a constant to avoid unneeded allocations, this hash must
+          # be defined inline (without {}) to avoid warnings on Ruby 2.7
+          string.dup.force_encoding(@encoding).encode(:invalid => :replace, :replace => REPLACE)
         end
 
         # Prevents raising ArgumentError

data/lib/rspec/support/method_signature_verifier.rb

@@ -8,7 +8,7 @@ module RSpec
     # keyword args of a given method.
     #
     # @private
-    class MethodSignature # rubocop:disable ClassLength
+    class MethodSignature # rubocop:disable Metrics/ClassLength
       attr_reader :min_non_kw_args, :max_non_kw_args, :optional_kw_args, :required_kw_args
 
       def initialize(method)
@@ -77,14 +77,19 @@ module RSpec
           given_kw_args - @allowed_kw_args
         end
 
+        # If the last argument is Hash, Ruby will treat only symbol keys as keyword arguments
+        # the rest will be grouped in another Hash and passed as positional argument.
         def has_kw_args_in?(args)
-          Hash === args.last && could_contain_kw_args?(args)
+          Hash === args.last &&
+            could_contain_kw_args?(args) &&
+            (args.last.empty? || args.last.keys.any? { |x| x.is_a?(Symbol) })
         end
 
         # Without considering what the last arg is, could it
         # contain keyword arguments?
         def could_contain_kw_args?(args)
           return false if args.count <= min_non_kw_args
+
           @allows_any_kw_args || @allowed_kw_args.any?
         end
 
@@ -117,7 +122,7 @@ module RSpec
             end
           end
 
-          @max_non_kw_args = @min_non_kw_args  + optional_non_kw_args
+          @max_non_kw_args = @min_non_kw_args + optional_non_kw_args
           @allowed_kw_args = @required_kw_args + @optional_kw_args
         end
       else
@@ -280,7 +285,7 @@ module RSpec
         @arbitrary_kw_args = @unlimited_args = false
       end
 
-      def with_expectation(expectation) # rubocop:disable MethodLength
+      def with_expectation(expectation) # rubocop:disable Metrics/MethodLength
         return self unless MethodSignatureExpectation === expectation
 
         if expectation.empty?
@@ -357,7 +362,14 @@ module RSpec
 
       def split_args(*args)
         kw_args = if @signature.has_kw_args_in?(args)
-                    args.pop.keys
+                    last = args.pop
+                    non_kw_args = last.reject { |k, _| k.is_a?(Symbol) }
+                    if non_kw_args.empty?
+                      last.keys
+                    else
+                      args << non_kw_args
+                      last.select { |k, _| k.is_a?(Symbol) }.keys
+                    end
                   else
                     []
                   end

data/lib/rspec/support/mutex.rb

@@ -9,7 +9,7 @@ module RSpec
     # Some methods we don't need are deleted. Anything I don't
     # understand (there's quite a bit, actually) is left in.
     #
-    # Some formating changes are made to appease the robot overlord:
+    # Some formatting changes are made to appease the robot overlord:
     #   https://travis-ci.org/rspec/rspec-core/jobs/54410874
     # @private
     class Mutex

data/lib/rspec/support/object_formatter.rb

@@ -225,7 +225,7 @@ module RSpec
         end
 
         def inspect
-          "#<#{object.class}(#{formatter.format(object.__getobj__)})>"
+          "#<#{object.class}(#{formatter.format(object.send(:__getobj__))})>"
         end
       end
 

data/lib/rspec/support/reentrant_mutex.rb

@@ -27,23 +27,48 @@ module RSpec
 
     private
 
-      def enter
-        @mutex.lock if @owner != Thread.current
-        @owner = Thread.current
-        @count += 1
-      end
+      # This is fixing a bug #501 that is specific to Ruby 3.0. The new implementation
+      # depends on `owned?` that was introduced in Ruby 2.0, so both should work for Ruby 2.x.
+      if RUBY_VERSION.to_f >= 3.0
+        def enter
+          @mutex.lock unless @mutex.owned?
+          @count += 1
+        end
 
-      def exit
-        @count -= 1
-        return unless @count == 0
-        @owner = nil
-        @mutex.unlock
+        def exit
+          unless @mutex.owned?
+            raise ThreadError, "Attempt to unlock a mutex which is locked by another thread/fiber"
+          end
+          @count -= 1
+          @mutex.unlock if @count == 0
+        end
+      else
+        def enter
+          @mutex.lock if @owner != Thread.current
+          @owner = Thread.current
+          @count += 1
+        end
+
+        def exit
+          @count -= 1
+          return unless @count == 0
+          @owner = nil
+          @mutex.unlock
+        end
       end
     end
 
     if defined? ::Mutex
       # On 1.9 and up, this is in core, so we just use the real one
-      Mutex = ::Mutex
+      class Mutex < ::Mutex
+        # If you mock Mutex.new you break our usage of Mutex, so
+        # instead we capture the original method to return Mutexs.
+        NEW_MUTEX_METHOD = Mutex.method(:new)
+
+        def self.new
+          NEW_MUTEX_METHOD.call
+        end
+      end
     else # For 1.8.7
       # :nocov:
       RSpec::Support.require_rspec_support "mutex"

data/lib/rspec/support/ruby_features.rb

@@ -7,7 +7,7 @@ module RSpec
     #
     # Provides query methods for different OS or OS features.
     module OS
-      module_function
+    module_function
 
       def windows?
         !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
@@ -22,7 +22,7 @@ module RSpec
     #
     # Provides query methods for different rubies
     module Ruby
-      module_function
+    module_function
 
       def jruby?
         RUBY_PLATFORM == 'java'
@@ -47,6 +47,10 @@ module RSpec
       def mri?
         !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
       end
+
+      def truffleruby?
+        defined?(RUBY_ENGINE) && RUBY_ENGINE == 'truffleruby'
+      end
     end
 
     # @api private
@@ -54,9 +58,9 @@ module RSpec
     # Provides query methods for ruby features that differ among
     # implementations.
     module RubyFeatures
-      module_function
+    module_function
 
-      if Ruby.jruby?
+      if Ruby.jruby? && RUBY_VERSION.to_f < 1.9
         # On JRuby 1.7 `--1.8` mode, `Process.respond_to?(:fork)` returns true,
         # but when you try to fork, it raises an error:
         #   NotImplementedError: fork is not available on this platform
@@ -90,6 +94,15 @@ module RSpec
         end
       end
 
+      if RUBY_VERSION.to_f >= 2.7
+        def supports_taint?
+          false
+        end
+      else
+        def supports_taint?
+          true
+        end
+      end
       ripper_requirements = [ComparableVersion.new(RUBY_VERSION) >= '1.9.2']
 
       ripper_requirements.push(false) if Ruby.rbx?
@@ -98,9 +111,14 @@ module RSpec
         ripper_requirements.push(Ruby.jruby_version >= '1.7.5')
         # Ripper on JRuby 9.0.0.0.rc1 - 9.1.8.0 reports wrong line number
         # or cannot parse source including `:if`.
-        ripper_requirements.push(!Ruby.jruby_version.between?('9.0.0.0.rc1', '9.1.8.0'))
+        # Ripper on JRuby 9.x.x.x < 9.1.17.0 can't handle keyword arguments
+        # Neither can JRuby 9.2, e.g. < 9.2.1.0
+        ripper_requirements.push(!Ruby.jruby_version.between?('9.0.0.0.rc1', '9.2.0.0'))
       end
 
+      # TruffleRuby disables ripper due to low performance
+      ripper_requirements.push(false) if Ruby.truffleruby?
+
       if ripper_requirements.all?
         def ripper_supported?
           true
@@ -111,6 +129,10 @@ module RSpec
         end
       end
 
+      def distincts_kw_args_from_positional_hash?
+        RUBY_VERSION >= '3.0.0'
+      end
+
       if Ruby.mri?
         def kw_args_supported?
           RUBY_VERSION >= '2.0.0'

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

@@ -54,12 +54,16 @@ module RSpec
           type == :on_kw
         end
 
+        def equals_operator?
+          type == :on_op && string == '='
+        end
+
         def opening?
           opening_delimiter? || opening_keyword?
         end
 
         def closed_by?(other)
-          closed_by_delimiter?(other) || closed_by_keyword?(other)
+          delimiter_closed_by?(other) || keyword_closed_by?(other)
         end
 
       private
@@ -73,13 +77,16 @@ module RSpec
           CLOSING_KEYWORDS_BY_OPENING_KEYWORD.key?(string)
         end
 
-        def closed_by_delimiter?(other)
+        def delimiter_closed_by?(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]
+        def keyword_closed_by?(other)
+          return false unless keyword?
+          return true if other.string == CLOSING_KEYWORDS_BY_OPENING_KEYWORD[string]
+
+          # Ruby 3's `end`-less method definition: `def method_name = body`
+          string == 'def' && other.equals_operator? && location.line == other.location.line
         end
       end
     end

data/lib/rspec/support/source.rb

@@ -8,6 +8,16 @@ module RSpec
     class Source
       attr_reader :source, :path
 
+      # This class protects us against having File read and expand_path
+      # stubbed out within tests.
+      class File
+        class << self
+          [:read, :expand_path].each do |method_name|
+            define_method(method_name, &::File.method(method_name))
+          end
+        end
+      end
+
       def self.from_file(path)
         source = File.read(path)
         new(source, path)

data/lib/rspec/support/spec/deprecation_helpers.rb

@@ -1,35 +1,22 @@
 module RSpecHelpers
-  def expect_no_deprecation
-    expect(RSpec.configuration.reporter).not_to receive(:deprecation)
-  end
-
   def expect_deprecation_with_call_site(file, line, snippet=//)
-    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
-      expect(options[:call_site]).to include([file, line].join(':'))
-      expect(options[:deprecated]).to match(snippet)
-    end
+    expect(RSpec.configuration.reporter).to receive(:deprecation).
+      with(include(:deprecated => match(snippet), :call_site => include([file, line].join(':'))))
   end
 
   def expect_deprecation_without_call_site(snippet=//)
-    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
-      expect(options[:call_site]).to eq nil
-      expect(options[:deprecated]).to match(snippet)
-    end
+    expect(RSpec.configuration.reporter).to receive(:deprecation).
+      with(include(:deprecated => match(snippet), :call_site => eq(nil)))
   end
 
   def expect_warn_deprecation_with_call_site(file, line, snippet=//)
-    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
-      message = options[:message]
-      expect(message).to match(snippet)
-      expect(message).to include([file, line].join(':'))
-    end
+    expect(RSpec.configuration.reporter).to receive(:deprecation).
+      with(include(:message => match(snippet), :call_site => include([file, line].join(':'))))
   end
 
   def expect_warn_deprecation(snippet=//)
-    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
-      message = options[:message]
-      expect(message).to match(snippet)
-    end
+    expect(RSpec.configuration.reporter).to receive(:deprecation).
+      with(include(:message => match(snippet)))
   end
 
   def allow_deprecation
@@ -39,19 +26,16 @@ module RSpecHelpers
   def expect_no_deprecations
     expect(RSpec.configuration.reporter).not_to receive(:deprecation)
   end
+  alias expect_no_deprecation expect_no_deprecations
 
   def expect_warning_without_call_site(expected=//)
-    expect(::Kernel).to receive(:warn) do |message|
-      expect(message).to match expected
-      expect(message).to_not match(/Called from/)
-    end
+    expect(::Kernel).to receive(:warn).
+      with(match(expected).and(satisfy { |message| !(/Called from/ =~ message) }))
   end
 
   def expect_warning_with_call_site(file, line, expected=//)
-    expect(::Kernel).to receive(:warn) do |message|
-      expect(message).to match expected
-      expect(message).to match(/Called from #{file}:#{line}/)
-    end
+    expect(::Kernel).to receive(:warn).
+      with(match(expected).and(match(/Called from #{file}:#{line}/)))
   end
 
   def expect_no_warnings

data/lib/rspec/support/spec/diff_helpers.rb

@@ -0,0 +1,31 @@
+require 'diff/lcs'
+
+module RSpec
+  module Support
+    module Spec
+      module DiffHelpers
+        # In the updated version of diff-lcs several diff headers change format slightly
+        # compensate for this and change minimum version in RSpec 4
+        if ::Diff::LCS::VERSION.to_f < 1.4
+          def one_line_header(line_number=2)
+            "-1,#{line_number} +1,#{line_number}"
+          end
+        else
+          def one_line_header(_=2)
+            "-1 +1"
+          end
+        end
+
+        if Diff::LCS::VERSION.to_f < 1.4 || Diff::LCS::VERSION >= "1.4.4"
+          def removing_two_line_header
+            "-1,3 +1"
+          end
+        else
+          def removing_two_line_header
+            "-1,3 +1,5"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/support/spec/in_sub_process.rb

@@ -7,8 +7,7 @@ module RSpec
 
         # Useful as a way to isolate a global change to a subprocess.
 
-        # rubocop:disable MethodLength
-        def in_sub_process(prevent_warnings=true)
+        def in_sub_process(prevent_warnings=true) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           exception_reader, exception_writer = IO.pipe
           result_reader, result_writer = IO.pipe
 
@@ -46,7 +45,6 @@ module RSpec
           result_reader.close
           result
         end
-        # rubocop:enable MethodLength
         alias :in_sub_process_if_possible :in_sub_process
 
         def marshal_dump_with_unmarshable_object_handling(object)

data/lib/rspec/support/spec/shell_out.rb

@@ -53,16 +53,40 @@ module RSpec
         end
       end
 
-      def strip_known_warnings(input)
-        input.split("\n").reject do |l|
+      LINES_TO_IGNORE =
+        [
           # Ignore bundler warning.
-          l =~ %r{bundler/source/rubygems} ||
+          %r{bundler/source/rubygems},
           # Ignore bundler + rubygems warning.
-          l =~ %r{site_ruby/\d\.\d\.\d/rubygems} ||
+          %r{site_ruby/\d\.\d\.\d/rubygems},
+          %r{jruby-\d\.\d\.\d+\.\d/lib/ruby/stdlib/rubygems},
           # This is required for windows for some reason
-          l =~ %r{lib/bundler/rubygems} ||
+          %r{lib/bundler/rubygems},
           # This is a JRuby file that generates warnings on 9.0.3.0
-          l =~ %r{lib/ruby/stdlib/jar}
+          %r{lib/ruby/stdlib/jar},
+          # This is a JRuby file that generates warnings on 9.1.7.0
+          %r{org/jruby/RubyKernel\.java},
+          # This is a JRuby gem that generates warnings on 9.1.7.0
+          %r{ffi-1\.13\.\d+-java},
+          %r{uninitialized constant FFI},
+          # These are related to the above, there is a warning about io from FFI
+          %r{jruby-\d\.\d\.\d+\.\d/lib/ruby/stdlib/io},
+          %r{io/console on JRuby shells out to stty for most operations},
+          # This is a JRuby 9.1.17.0 error on Github Actions
+          %r{io/console not supported; tty will not be manipulated},
+          # This is a JRuby 9.2.1.x error
+          %r{jruby/kernel/gem_prelude},
+          %r{lib/jruby\.jar!/jruby/preludes},
+          # Ignore some JRuby errors for gems
+          %r{jruby/\d\.\d(\.\d)?/gems/aruba},
+          %r{jruby/\d\.\d(\.\d)?/gems/ffi},
+        ]
+
+      def strip_known_warnings(input)
+        input.split("\n").reject do |l|
+          LINES_TO_IGNORE.any? { |to_ignore| l =~ to_ignore } ||
+          # Remove blank lines
+          l == "" || l.nil?
         end.join("\n")
       end
 
@@ -71,7 +95,7 @@ module RSpec
       if Ruby.jruby?
         def filter(output)
           output.each_line.reject do |line|
-            line.include?("lib/ruby/shared/rubygems/defaults/jruby")
+            line.include?("lib/ruby/shared/rubygems")
           end.join($/)
         end
       else

data/lib/rspec/support/spec/stderr_splitter.rb

@@ -6,6 +6,7 @@ module RSpec
       def initialize(original)
         @orig_stderr    = original
         @output_tracker = ::StringIO.new
+        @last_line = nil
       end
 
       respond_to_name = (::RUBY_VERSION.to_f < 1.9) ? :respond_to? : :respond_to_missing?
@@ -38,8 +39,19 @@ module RSpec
       def write(line)
         return if line =~ %r{^\S+/gems/\S+:\d+: warning:} # http://rubular.com/r/kqeUIZOfPG
 
+        # Ruby 2.7.0 warnings from keyword arguments span multiple lines, extend check above
+        # to look for the next line.
+        return if @last_line =~ %r{^\S+/gems/\S+:\d+: warning:} &&
+                  line =~ %r{warning: The called method .* is defined here}
+
+        # Ruby 2.7.0 complains about hashes used in place of keyword arguments
+        # Aruba 0.14.2 uses this internally triggering that here
+        return if line =~ %r{lib/ruby/2\.7\.0/fileutils\.rb:622: warning:}
+
         @orig_stderr.write(line)
         @output_tracker.write(line)
+      ensure
+        @last_line = line
       end
 
       def has_output?

data/lib/rspec/support/spec/string_matcher.rb

@@ -4,7 +4,6 @@ require 'rspec/matchers'
 # which also relies on EncodedString. Instead, confirm the
 # strings have the same bytes.
 RSpec::Matchers.define :be_identical_string do |expected|
-
   if String.method_defined?(:encoding)
     match do
       expected_encoding? &&

data/lib/rspec/support/spec.rb

@@ -2,6 +2,7 @@ require 'rspec/support'
 require 'rspec/support/spec/in_sub_process'
 
 RSpec::Support.require_rspec_support "spec/deprecation_helpers"
+RSpec::Support.require_rspec_support "spec/diff_helpers"
 RSpec::Support.require_rspec_support "spec/with_isolated_stderr"
 RSpec::Support.require_rspec_support "spec/stderr_splitter"
 RSpec::Support.require_rspec_support "spec/formatting_support"
@@ -35,9 +36,9 @@ RSpec.configure do |c|
 
   c.example_status_persistence_file_path = "./spec/examples.txt"
 
-  c.define_derived_metadata :failing_on_appveyor do |meta|
-    meta[:pending] ||= "This spec fails on AppVeyor and needs someone to fix it."
-  end if ENV['APPVEYOR']
+  c.define_derived_metadata :failing_on_windows_ci do |meta|
+    meta[:pending] ||= "This spec fails on Windows CI and needs someone to fix it."
+  end if RSpec::Support::OS.windows? && ENV['CI']
 end
 
 module RSpec
@@ -64,8 +65,8 @@ module RSpec
 
       def self.start_simplecov(&block)
         SimpleCov.start do
-          add_filter "./bundle/"
-          add_filter "./tmp/"
+          add_filter "bundle/"
+          add_filter "tmp/"
           add_filter do |source_file|
             # Filter out `spec` directory except when it is under `lib`
             # (as is the case in rspec-support)

data/lib/rspec/support/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.8.0'
+      STRING = '3.12.1'
     end
   end
 end

data/lib/rspec/support/with_keywords_when_needed.rb

@@ -0,0 +1,33 @@
+RSpec::Support.require_rspec_support("method_signature_verifier")
+
+module RSpec
+  module Support
+    module WithKeywordsWhenNeeded
+      # This module adds keyword sensitive support for core ruby methods
+      # where we cannot use `ruby2_keywords` directly.
+
+      module_function
+
+      if RSpec::Support::RubyFeatures.kw_args_supported?
+        # Remove this in RSpec 4 in favour of explicitly passed in kwargs where
+        # this is used. Works around a warning in Ruby 2.7
+
+        def class_exec(klass, *args, &block)
+          if MethodSignature.new(block).has_kw_args_in?(args)
+            binding.eval(<<-CODE, __FILE__, __LINE__)
+            kwargs = args.pop
+            klass.class_exec(*args, **kwargs, &block)
+            CODE
+          else
+            klass.class_exec(*args, &block)
+          end
+        end
+        ruby2_keywords :class_exec if respond_to?(:ruby2_keywords, true)
+      else
+        def class_exec(klass, *args, &block)
+          klass.class_exec(*args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/rspec/support.rb

@@ -14,7 +14,12 @@ module RSpec
     def self.define_optimized_require_for_rspec(lib, &require_relative)
       name = "require_rspec_#{lib}"
 
-      if Kernel.respond_to?(:require_relative)
+      if RUBY_PLATFORM == 'java' && !Kernel.respond_to?(:require)
+        # JRuby 9.1.17.0 has developed a regression for require
+        (class << self; self; end).__send__(:define_method, name) do |f|
+          Kernel.send(:require, "rspec/#{lib}/#{f}")
+        end
+      elsif Kernel.respond_to?(:require_relative)
         (class << self; self; end).__send__(:define_method, name) do |f|
           require_relative.call("#{lib}/#{f}")
         end
@@ -84,8 +89,14 @@ module RSpec
     end
 
     # A single thread local variable so we don't excessively pollute that namespace.
-    def self.thread_local_data
-      Thread.current[:__rspec] ||= {}
+    if RUBY_VERSION.to_f >= 2
+      def self.thread_local_data
+        Thread.current.thread_variable_get(:__rspec) || Thread.current.thread_variable_set(:__rspec, {})
+      end
+    else
+      def self.thread_local_data
+        Thread.current[:__rspec] ||= {}
+      end
     end
 
     # @api private
@@ -139,7 +150,7 @@ module RSpec
       end
     end
 
-    # The Differ is only needed when a a spec fails with a diffable failure.
+    # The Differ is only needed when a spec fails with a diffable failure.
     # In the more common case of all specs passing or the only failures being
     # non-diffable, we can avoid the extra cost of loading the differ, diff-lcs,
     # pp, etc by avoiding an unnecessary require. Instead, autoload will take

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.12.1
 platform: ruby
 authors:
 - David Chelimsky
@@ -10,7 +10,7 @@ authors:
 - Sam Phippen
 - Xaviery Shay
 - Bradley Schaefer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -48,34 +48,20 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2018-08-04 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !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
@@ -122,6 +108,7 @@ files:
 - lib/rspec/support/source/token.rb
 - lib/rspec/support/spec.rb
 - lib/rspec/support/spec/deprecation_helpers.rb
+- lib/rspec/support/spec/diff_helpers.rb
 - lib/rspec/support/spec/formatting_support.rb
 - lib/rspec/support/spec/in_sub_process.rb
 - lib/rspec/support/spec/library_wide_checks.rb
@@ -132,11 +119,17 @@ files:
 - lib/rspec/support/spec/with_isolated_stderr.rb
 - lib/rspec/support/version.rb
 - lib/rspec/support/warnings.rb
+- lib/rspec/support/with_keywords_when_needed.rb
 homepage: https://github.com/rspec/rspec-support
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/rspec/rspec-support/issues
+  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.12.1/Changelog.md
+  documentation_uri: https://rspec.info/documentation/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
+  source_code_uri: https://github.com/rspec/rspec-support
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -152,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
-summary: rspec-support-3.8.0
+summary: rspec-support-3.12.1
 test_files: []