rspec-support 3.10.0 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7087e0924dbb4a0a167857659dd1b85f73952ede008d348c9f1371da653835da
-  data.tar.gz: 236c1ff98b46e3d4b208aae30a4c26bb701d911896746ac0d3573caaefbdaea1
+  metadata.gz: 15b095a31f89b4f715f85a98def34e8d8e401552aa3cbdd8e41e97229acaa7a3
+  data.tar.gz: 7e038fa362d523cc2b271357fd777624479e4952327d286261d3b5d6e503f664
 SHA512:
-  metadata.gz: 93bac1be9a9ba640100c1141213da23784197fccbf4bce0e0488faf073d83d06a8787638cb4468790bd8e9c3fe901ed05cac944155084dc6c8b434da13be7ec4
-  data.tar.gz: b23a93adcb954245564b219519756b274718ecf81b07deee7a9a1a350bfe02afbbdf46f871c9e164ec9247301523556998b616e02b2bccc9c6b72eb93feefa4a
+  metadata.gz: 631144fe2de1984bb09db168acbee96186e9709838f4a3c963d083007da80a529c45db2e80890548f78a07e8c190e374b1a40f669d0ca24c0d15030c306698ec
+  data.tar.gz: e9ecd3254c12547501b1bf973e56bc818189ffe979394603cad8fbbaf6b653b5ac51819ba50fb0df555e473f968f55b7359f8f77d38b36ee0b6ee0f2a96c8b00

data/Changelog.md

@@ -1,8 +1,44 @@
+### Development
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.11.0...3-11-maintenance)
+
+### 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:
 

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

data/lib/rspec/support/reentrant_mutex.rb

@@ -27,17 +27,34 @@ 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
 

data/lib/rspec/support/ruby_features.rb

@@ -60,7 +60,7 @@ module RSpec
     module RubyFeatures
     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
@@ -111,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 on JRuby 9.x.x.x < 9.2.1.0 can't handle keyword arguments.
+        # 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
 

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

@@ -59,7 +59,7 @@ module RSpec
           %r{bundler/source/rubygems},
           # Ignore bundler + rubygems warning.
           %r{site_ruby/\d\.\d\.\d/rubygems},
-          %r{jruby-\d\.\d\.\d\.\d/lib/ruby/stdlib/rubygems},
+          %r{jruby-\d\.\d\.\d+\.\d/lib/ruby/stdlib/rubygems},
           # This is required for windows for some reason
           %r{lib/bundler/rubygems},
           # This is a JRuby file that generates warnings on 9.0.3.0
@@ -70,8 +70,13 @@ module RSpec
           %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{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)
@@ -87,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.rb

@@ -36,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
@@ -65,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.10.0'
+      STRING = '3.11.0'
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.0
 platform: ruby
 authors:
 - David Chelimsky
@@ -48,7 +48,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,7 +125,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-support/issues
-  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.10.0/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.11.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
@@ -145,8 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: rspec-support-3.10.0
+summary: rspec-support-3.11.0
 test_files: []