rspec-support 3.13.6 → 4.0.0.beta1

data/lib/rspec/support.rb

@@ -1,5 +1,13 @@
 # frozen_string_literal: true
 
+class Thread
+  attr_accessor :__rspec_local_data
+
+  class << self
+    alias __rspec_current_thread current
+  end
+end
+
 module RSpec
   module Support
     # @api private
@@ -14,27 +22,13 @@ module RSpec
     # hand, does a linear O(N) search over the dirs in the $LOAD_PATH until
     # it can resolve the file relative to one of the dirs.
     def self.define_optimized_require_for_rspec(lib, &require_relative)
-      name = "require_rspec_#{lib}"
-
-      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
-      else
-        (class << self; self; end).__send__(:define_method, name) do |f|
-          require "rspec/#{lib}/#{f}"
-        end
+      define_singleton_method("require_rspec_#{lib}") do |f|
+        require_relative.call("#{lib}/#{f}")
       end
     end
 
     define_optimized_require_for_rspec(:support) { |f| require_relative(f) }
     require_rspec_support "version"
-    require_rspec_support "ruby_features"
 
     # @api private
     KERNEL_METHOD_METHOD = ::Kernel.instance_method(:method)
@@ -50,33 +44,15 @@ module RSpec
     #   - BasicObject subclasses that mixin a Kernel dup (e.g. SimpleDelegator)
     #   - Objects that undefine method and delegate everything to another
     #     object (e.g. Mongoid association objects)
-    if RubyFeatures.supports_rebinding_module_methods?
-      def self.method_handle_for(object, method_name)
-        KERNEL_METHOD_METHOD.bind(object).call(method_name)
-      rescue NameError => original
-        begin
-          handle = object.method(method_name)
-          raise original unless handle.is_a? Method
-          handle
-        rescue Support::AllExceptionsExceptOnesWeMustNotRescue
-          raise original
-        end
-      end
-    else
-      def self.method_handle_for(object, method_name)
-        if ::Kernel === object
-          KERNEL_METHOD_METHOD.bind(object).call(method_name)
-        else
-          object.method(method_name)
-        end
-      rescue NameError => original
-        begin
-          handle = object.method(method_name)
-          raise original unless handle.is_a? Method
-          handle
-        rescue Support::AllExceptionsExceptOnesWeMustNotRescue
-          raise original
-        end
+    def self.method_handle_for(object, method_name)
+      KERNEL_METHOD_METHOD.bind(object).call(method_name)
+    rescue NameError => original
+      begin
+        handle = object.method(method_name)
+        raise original unless handle.is_a? Method
+        handle
+      rescue Support::AllExceptionsExceptOnesWeMustNotRescue
+        raise original
       end
     end
 
@@ -91,14 +67,8 @@ module RSpec
     end
 
     # A single thread local variable so we don't excessively pollute that namespace.
-    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
+    def self.thread_local_data
+      Thread.__rspec_current_thread.__rspec_local_data ||= {}
     end
 
     # @api private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.13.6
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - David Chelimsky
@@ -14,11 +14,11 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIFvjCCA6agAwIBAgIJAPXjfUbCjdXVMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
+  MIIFvjCCA6agAwIBAgIJAPXjfUbCjdXWMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
   VQQGEwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEO
   MAwGA1UECgwFUlNwZWMxEzARBgNVBAMMCnJzcGVjLmluZm8xJTAjBgkqhkiG9w0B
-  CQEWFnJzcGVjQGdvb2dsZWdyb3Vwcy5jb20wHhcNMjUwMjA2MTE0NjU2WhcNMjYw
-  MjA2MTE0NjU2WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24x
+  CQEWFnJzcGVjQGdvb2dsZWdyb3Vwcy5jb20wHhcNMjYwMjE3MTE0ODM0WhcNMjcw
+  MjE3MTE0ODM0WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24x
   EDAOBgNVBAcMB1NlYXR0bGUxDjAMBgNVBAoMBVJTcGVjMRMwEQYDVQQDDApyc3Bl
   Yy5pbmZvMSUwIwYJKoZIhvcNAQkBFhZyc3BlY0Bnb29nbGVncm91cHMuY29tMIIC
   IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsSmjgcHaKlD0jizRJowi2bGI
@@ -34,48 +34,20 @@ cert_chain:
   gpEMqf80lEmhX59VUsm0Pv6OEo+ZPHBvXPiJA6DShQh9t3YtpwyA8uVDMbT/i32u
   2FUsqZbbJcCmkBrGposCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFPPvQ5XT0Nvuhi6k+hrWVv35J+TeMA0GCSqGSIb3DQEBCwUAA4IC
-  AQBGBr0ll2yLrkO6IeK5Q7qZFnANaUCKfi6Of9VztZJXgKAU5KAQxyOidGktoA5N
-  lp+bFKudRkW8jSehqoNaNBdSZ9Bc07EGMXIhUFJZF9rq7Z2SKPwUm6EaSsBK13QR
-  U4K6wuaw5ZJSFzklapoGOJRGnFlnNtlhNFY6+tTwCeblwZbcuYGyGY8+Rg7GbyVl
-  3Tr4Gi1aS/qG/MDXKdE8HWm39dmaAMdbw6dg1VBd0JrX2VqH7xvE1dM/D3OlKrNp
-  gNFRNJig3Y8qPjocZR0cGkhgZoC9wribWxHSNawZm4CoV3fja2HNx9QyM7BaB+as
-  yuqAiBbA7vBcyc8nKATip3mxbyXYXoDD7nmO8JCPP7O/WsgG+U/B2a0kPdvYFoxE
-  Q0Js3GtFCuMvL+0rifqdxBOLtu0Pw9q4RvToTJIl2IR6eTgCb82B1hw9qKf7PjuL
-  BoEsYjjDhGw6FZvcJG8O6uj7aB+z4aF21YR74UGL7sq/RIPNNez5JI95jTGfqCPy
-  6yo0w3zja3yg28QK3Fj+tbOHeSLv9SDQWi/1jiPprGzbxGvbVvjvX11YZc46vkmY
-  AwP+qZPPf97FXXZGEGIYhhHpnj+Ltx9nCetRPiZ4rvYBcXgCWVQSg6eiEofrMwn/
-  AKMCABhZ1Y2eATsfMgdkmIZk7JIPZiSi6eUxPiCMP9M/pw==
+  AQBaeeGIZtBFDP33D1/4sXldSgwntVcL5qC5pcjamLWM4HK4/a6ePMy1uoX+dEnJ
+  J+BjZWURsUfFOob+xnUe8AMSbv9gupckfVehZoBzOvJDaWcALo8GKjJlmVtzEIqZ
+  TvBLO5zQwR4cWIrg0NWjkDOSQOrNNQ2Degv/aOFrR8dFPJSgxZG/IC0/t6s72cEt
+  V4SIe/NLIU4RyBzfgn/RBsalDEF1yIVlDWspMa78clS3bPmntkNyfLwIUwINDHhn
+  swFA8bEKMQWqRlupuRmEiy3nGe6az46YlPXzK5UWfXJ6Lb1wIE8W80TRx0HpSC7j
+  JfXPfQ0PLgiU4nnQqain2bIn96Ooco8kspeqp8rSJ8sbaMPTNmcFuwD3gzWsRnJ3
+  rIaJbmrUcq6DlJ7jfv3u5TPt4JWzDP7oDPf3nXNiF2Cn48Ne598G5lHH6Heyxe39
+  pYZdhEptKJWPHxbJWHXD02omKprkNuQKHpnXrW+mmbiO4IcqAMggiud+DaEQg20x
+  Dae4cNbvK5p3D+5xqvcEO2G4uCMDmJjrSd61kvTLBnm1qroHqrpi9GauEVWZZmD0
+  n0ph8oFAXOsKQWxZ+4uh6yGISk+WhngCZEVPZUjq7SIGAuVhQy2ZgwdjnLEz//lD
+  x0Qexp5yGeoxAL9qKM/RXYKtuRZBJV1z+L9A1YOtwaXXNg==
   -----END CERTIFICATE-----
 date: 1980-01-02 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
-  name: thread_order
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+dependencies: []
 description: Support utilities for RSpec gems
 email: rspec-users@rubyforge.org
 executables: []
@@ -95,7 +67,6 @@ files:
 - lib/rspec/support/hunk_generator.rb
 - lib/rspec/support/matcher_definition.rb
 - lib/rspec/support/method_signature_verifier.rb
-- lib/rspec/support/mutex.rb
 - lib/rspec/support/object_formatter.rb
 - lib/rspec/support/recursive_const_methods.rb
 - lib/rspec/support/reentrant_mutex.rb
@@ -105,8 +76,8 @@ files:
 - lib/rspec/support/source/node.rb
 - lib/rspec/support/source/token.rb
 - lib/rspec/support/spec.rb
+- lib/rspec/support/spec/coverage.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
@@ -123,11 +94,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec/issues
-  changelog_uri: https://github.com/rspec/rspec/blob/rspec-support-v3.13.6/rspec-support/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec/tree/rspec-support-v4.0.0.beta1/rspec-support/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/rspec/rspec/blob/rspec-support-v3.13.6/rspec-support
+  source_code_uri: https://github.com/rspec/rspec/tree/rspec-support-v4.0.0.beta1/rspec-support
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -136,14 +107,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
-summary: rspec-support-3.13.6
+summary: rspec-support-4.0.0.beta1
 test_files: []

data/lib/rspec/support/mutex.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module RSpec
-  module Support
-    # On 1.8.7, it's in the stdlib.
-    # We don't want to load the stdlib, b/c this is a test tool, and can affect
-    # the test environment, causing tests to pass where they should fail.
-    #
-    # So we're transcribing/modifying it from
-    # https://github.com/ruby/ruby/blob/v1_8_7_374/lib/thread.rb#L56
-    # Some methods we don't need are deleted. Anything I don't
-    # understand (there's quite a bit, actually) is left in.
-    #
-    # Some formatting changes are made to appease the robot overlord:
-    #   https://travis-ci.org/rspec/rspec-core/jobs/54410874
-    # @private
-    class Mutex
-      def initialize
-        @waiting = []
-        @locked = false
-        @waiting.taint
-        taint
-      end
-
-      # @private
-      def lock
-        while Thread.critical = true && @locked
-          @waiting.push Thread.current
-          Thread.stop
-        end
-        @locked = true
-        Thread.critical = false
-        self
-      end
-
-      # @private
-      def unlock
-        return unless @locked
-        Thread.critical = true
-        @locked = false
-        wakeup_and_run_waiting_thread
-        self
-      end
-
-      # @private
-      def synchronize
-        lock
-        begin
-          yield
-        ensure
-          unlock
-        end
-      end
-
-    private
-
-      def wakeup_and_run_waiting_thread
-        begin
-          t = @waiting.shift
-          t.wakeup if t
-        rescue ThreadError
-          retry
-        end
-        Thread.critical = false
-        begin
-          t.run if t
-        rescue ThreadError
-          :noop
-        end
-      end
-
-      # Avoid warnings for library wide checks spec
-    end unless defined?(::RSpec::Support::Mutex) || defined?(::Mutex)
-  end
-end

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

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-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
-        elsif ::Diff::LCS::VERSION.to_f < 1.6
-          def one_line_header(_=2)
-            "-1 +1"
-          end
-        else
-          def one_line_header(line_number=2)
-            if line_number - 1 == 1
-              "-1 +1"
-            else
-              "-1,#{line_number - 1} +1,#{line_number - 1}"
-            end
-          end
-        end
-
-        if ::Diff::LCS::VERSION.to_f > 1.5
-          def removing_two_line_header
-            "-1,2 +0,0"
-          end
-        elsif 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