rspec-support 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27ddd84c490aacfced87a3d772c93cf8391484030d28f78789ff5e9263811d42
-  data.tar.gz: 515eecb4064c04ac636b6171ad1308532596a13d9b132ac4689893ab76f43bfe
+  metadata.gz: 7087e0924dbb4a0a167857659dd1b85f73952ede008d348c9f1371da653835da
+  data.tar.gz: 236c1ff98b46e3d4b208aae30a4c26bb701d911896746ac0d3573caaefbdaea1
 SHA512:
-  metadata.gz: 3755a83a18dcd1326ac122e8250b0abbe0c50af2e630748478c8dfbf0c0f64f65d59725db3ae5370e382f49409b8f7d1639aa09a75c143d4186a8bfeda36a9e3
-  data.tar.gz: 6a41a8e6f905e1c2a37a776a2438d461859aab8434b1cd20c0aa4ca50fb17d898465535710018c8c01c199fde6e179ffef35feb1cd118dc4b71894a0a12d960b
+  metadata.gz: 93bac1be9a9ba640100c1141213da23784197fccbf4bce0e0488faf073d83d06a8787638cb4468790bd8e9c3fe901ed05cac944155084dc6c8b434da13be7ec4
+  data.tar.gz: b23a93adcb954245564b219519756b274718ecf81b07deee7a9a1a350bfe02afbbdf46f871c9e164ec9247301523556998b616e02b2bccc9c6b72eb93feefa4a

data/Changelog.md

@@ -1,10 +1,49 @@
+### 3.10.0 / 2020-10-30
+
+No changes. Released to support other RSpec releases.
+
+### 3.9.4 / 2020-10-23
+
+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:
 

data/README.md

@@ -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

@@ -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/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
@@ -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 uneeded 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 uneeded 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

@@ -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,7 +58,7 @@ module RSpec
     # Provides query methods for ruby features that differ among
     # implementations.
     module RubyFeatures
-      module_function
+    module_function
 
       if Ruby.jruby?
         # On JRuby 1.7 `--1.8` mode, `Process.respond_to?(:fork)` returns true,
@@ -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,7 +111,8 @@ 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.2.1.0 can't handle keyword arguments.
+        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"

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,30 @@ 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},
+        ]
+
+      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")

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 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.0'
+      STRING = '3.10.0'
     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.0
+  version: 3.10.0
 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-10-07 00:00:00.000000000 Z
+date: 2020-10-30 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.0/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.10.0/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.0.6
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
-summary: rspec-support-3.9.0
+summary: rspec-support-3.10.0
 test_files: []