rspec-support 3.10.2 → 3.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b30f3003419ac0253a0804a457ff3d9fc97309c7eafb345aa9e94e379352d8
-  data.tar.gz: fbacd747f72cb8bc4e06af5559e48150065d0a32580c73744dcc2355c2f6aa9b
+  metadata.gz: a580b5b26cfb56a1e613cad6616ec21a00199d740d6a8bb8397f4b611ec9e4fc
+  data.tar.gz: f2e5766d860651df933ded46383ca9ad84a827da16adb32d5c929eb339d9795c
 SHA512:
-  metadata.gz: eb71f6ad88d243a87719fb8aa5f7ba383f090920d8bb3df0b2da859d07d99fc9e3641f92ef6b94ee68d216b7056667406bd216256c35a8db72a62bd6f81d993c
-  data.tar.gz: 07eae42126cc684e1c925bed6a19c1137522a7e5a694ed16cae8162fa166737d9266d3d22f32088789f062e4892f4203aa996c0d1c0dc11efe927c0e34188085
+  metadata.gz: bd34bd2968390c78df88c9f573b4b7b2ad9b5952d8ea8735c5bedcc16327daaae650f41dfeb880068064c838959b0c61a4e5f05daa77076597992f04ac26c515
+  data.tar.gz: 5459f5188f8e7533ded56ba86c6b39ad6a89aeadee363f365aea08337affaed2c81b1bfd8e4c5c8a62397113d53c037ea6ec2fb8ba4922ec5e60b4e1b945b201

data/Changelog.md

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

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

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.10.2'
+      STRING = '3.10.3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.10.2
+  version: 3.10.3
 platform: ruby
 authors:
 - David Chelimsky
@@ -48,7 +48,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-11-03 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.2/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.10.3/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.2.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
-summary: rspec-support-3.10.2
+summary: rspec-support-3.10.3
 test_files: []