rspec-support 3.9.2 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0608e9d9e32db7972f9ed9edf1acc660be6e859589a5bb40118979f32e3e3093'
-  data.tar.gz: df94499781e6a3f6460990392a90bcea42c4c1aaa028357139787ab1b92716df
+  metadata.gz: f7b30f3003419ac0253a0804a457ff3d9fc97309c7eafb345aa9e94e379352d8
+  data.tar.gz: fbacd747f72cb8bc4e06af5559e48150065d0a32580c73744dcc2355c2f6aa9b
 SHA512:
-  metadata.gz: 7598c046151adc5322cddd117f5809c3b3f9b1271c5db74496d6961e0799c1fbf3a47d2b48f1195be96b3c2ce0baab7c11d2f19709d478fc44848523034b9514
-  data.tar.gz: f548fa1b506985c64d9d612463cb4ffb8b41233a86af16ee26449e936570dbe0d4c2f2d9ad5c7fe3cd1a1b57d3156fba368b2f44627634053c2f1db51f64fc6d
+  metadata.gz: eb71f6ad88d243a87719fb8aa5f7ba383f090920d8bb3df0b2da859d07d99fc9e3641f92ef6b94ee68d216b7056667406bd216256c35a8db72a62bd6f81d993c
+  data.tar.gz: 07eae42126cc684e1c925bed6a19c1137522a7e5a694ed16cae8162fa166737d9266d3d22f32088789f062e4892f4203aa996c0d1c0dc11efe927c0e34188085

data/Changelog.md

@@ -1,3 +1,43 @@
+### 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)
 

data/README.md

@@ -1,4 +1,4 @@
-# RSpec::Support
+# RSpec::Support [![Build Status](https://github.com/rspec/rspec-support/workflows/RSpec%20CI/badge.svg?branch=3-10-maintenance)](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.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

data/lib/rspec/support/caller_filter.rb

@@ -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/comparable_version.rb

@@ -10,7 +10,7 @@ module RSpec
         @string = string
       end
 
-      def <=>(other)
+      def <=>(other) # rubocop:disable Metrics/AbcSize
         other = self.class.new(other) unless other.is_a?(self.class)
 
         return 0 if string == other.string

data/lib/rspec/support/method_signature_verifier.rb

@@ -122,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
@@ -285,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 MethodLength, Metrics/PerceivedComplexity
         return self unless MethodSignatureExpectation === expectation
 
         if expectation.empty?

data/lib/rspec/support/reentrant_mutex.rb

@@ -43,7 +43,15 @@ module RSpec
 
     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
@@ -107,7 +111,9 @@ 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
 
       if ripper_requirements.all?

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.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/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 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,19 +53,35 @@ 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} ||
-          l =~ %r{jruby-\d\.\d\.\d\.\d/lib/ruby/stdlib/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
-          l =~ %r{org/jruby/RubyKernel\.java} ||
+          %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},
+        ]
+
+      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")
@@ -76,7 +92,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,12 +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 argments 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/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.9.2'
+      STRING = '3.10.2'
     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 explictly 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.10.2
 platform: ruby
 authors:
 - David Chelimsky
@@ -10,7 +10,7 @@ authors:
 - Sam Phippen
 - Xaviery Shay
 - Bradley Schaefer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -48,20 +48,20 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !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
@@ -108,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
@@ -118,16 +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:
   bug_tracker_uri: https://github.com/rspec/rspec-support/issues
-  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.9.2/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.10.2/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: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -143,8 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
-summary: rspec-support-3.9.2
+summary: rspec-support-3.10.2
 test_files: []