Drop Ruby < 2.3 support

Changelog.md

@@ -1,3 +1,9 @@
+### Development (unreleased)
+
+Breaking Changes:
+
+* Ruby < 2.3 is no longer supported. (Phil Pirozhkov, #436)
+
 ### 3.10.0 / 2020-10-30
 
 No changes. Released to support other RSpec releases.

Gemfile

@@ -13,51 +13,21 @@ branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp
   end
 end
 
-if RUBY_VERSION < '1.9.3'
-  gem 'rake', '< 11.0.0' # rake 11 requires Ruby 1.9.3 or later
-elsif RUBY_VERSION < '2.0.0'
-  gem 'rake', '< 12.0.0' # rake 12 requires Ruby 2.0.0 or later
-else
-  gem 'rake', '>= 12.3.3'
-end
-
 if ENV['DIFF_LCS_VERSION']
   gem 'diff-lcs', ENV['DIFF_LCS_VERSION']
 else
   gem 'diff-lcs', '~> 1.4', '>= 1.4.3'
 end
 
-if RUBY_VERSION < '2.3.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
-  gem "childprocess", "< 1.0.0"
-elsif RUBY_VERSION < '2.3.0'
-  gem "childprocess", "< 3.0.0"
-else
 gem "childprocess", ">= 3.0.0"
-end
+gem 'ffi', '~> 1.12.0'
 
 ### dep for ci/coverage
 gem 'simplecov', '~> 0.8'
 
-if RUBY_VERSION < '2.0.0' || RUBY_ENGINE == 'java'
-  gem 'json', '< 2.0.0' # is a dependency of simplecov
-else
-  gem 'json', '> 2.3.0'
-end
-
-if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
-  gem 'ffi', '< 1.10'
-elsif RUBY_VERSION < '2.0'
-  # ffi dropped Ruby 1.8 support in 1.9.19 and Ruby 1.9 support in 1.11.0
-  gem 'ffi', '< 1.9.19'
-elsif RUBY_VERSION < '2.3.0'
-  gem 'ffi', '~> 1.12.0'
-else
-  gem 'ffi', '~> 1.13.0'
-end
-
 # No need to run rubocop on earlier versions
 if RUBY_VERSION >= '2.4' && RUBY_ENGINE == 'ruby'
   gem "rubocop", "~> 0.52.1"
 end
 
-eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')
+eval_gemfile 'Gemfile-custom' if File.exist?('Gemfile-custom')

lib/rspec/support.rb

@@ -12,22 +12,13 @@ module Support
     # 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 Kernel.respond_to?(:require_relative)
-        (class << self; self; end).__send__(:define_method, name) do |f|
+      define_singleton_method("require_rspec_#{lib}") do |f|
         require_relative.call("#{lib}/#{f}")
       end
-      else
-        (class << self; self; end).__send__(:define_method, name) do |f|
-          require "rspec/#{lib}/#{f}"
-        end
-      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)
@@ -43,25 +34,8 @@ def self.define_optimized_require_for_rspec(lib, &require_relative)
     #   - 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)
@@ -71,7 +45,6 @@ def self.method_handle_for(object, method_name)
         raise original
       end
     end
-    end
 
     # @api private
     #

lib/rspec/support/caller_filter.rb

@@ -1,5 +1,3 @@
-RSpec::Support.require_rspec_support "ruby_features"
-
 module RSpec
   # Consistent implementation for "cleaning" the caller method to strip out
   # non-rspec lines. This enables errors to be reported at the call site in
@@ -27,7 +25,6 @@ class CallerFilter
     # with this complexity in our `RSpec.deprecate` calls, so we ignore it here.
     IGNORE_REGEX = Regexp.union(LIB_REGEX, "rubygems/core_ext/kernel_require.rb")
 
-    if RSpec::Support::RubyFeatures.caller_locations_supported?
     # This supports args because it's more efficient when the caller specifies
     # these. It allows us to skip frames the caller knows are part of RSpec,
     # and to decrease the increment size if the caller is confident the line will
@@ -72,12 +69,5 @@ def self.first_non_rspec_line(skip_frames=3, increment=5)
         increment *= 2 # The choice of two here is arbitrary.
       end
     end
-    else
-      # Earlier rubies do not support the two argument form of `caller`. This
-      # fallback is logically the same, but slower.
-      def self.first_non_rspec_line(*)
-        caller.find { |line| line !~ IGNORE_REGEX }
-      end
-    end
   end
 end

lib/rspec/support/differ.rb

@@ -102,15 +102,9 @@ def diffably_stringify(array)
         end
       end
 
-      if String.method_defined?(:encoding)
       def multiline?(string)
         string.include?("\n".encode(string.encoding))
       end
-      else
-        def multiline?(string)
-          string.include?("\n")
-        end
-      end
 
       def build_hunks(actual, expected)
         HunkGenerator.new(actual, expected).hunks

lib/rspec/support/directory_maker.rb

@@ -1,5 +1,3 @@
-RSpec::Support.require_rspec_support 'ruby_features'
-
 module RSpec
   module Support
     # @api private

lib/rspec/support/encoded_string.rb

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support "ruby_features"
+
 module RSpec
   module Support
     # @private
@@ -46,7 +48,9 @@ def to_s
       end
       alias :to_str :to_s
 
-      if String.method_defined?(:encoding)
+      def self.pick_encoding(source_a, source_b)
+        Encoding.compatible?(source_a, source_b) || Encoding.default_external
+      end
 
       private
 
@@ -95,16 +99,11 @@ def matching_encoding(string)
         # 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
+        # 'invalid: :replace' also replaces an invalid byte sequence
         #
-          # On MRI 2.1 or above: 63  # '?'
-          # else               : 128 # "\x80"
+        # For example:
+        #   "\x80".force_encoding("Emacs-Mule").encode(:invalid => :replace).bytes.to_a # =>
+        #   => 63  # '?'
         #
         string.encode(@encoding, :invalid => :replace, :undef => :replace, :replace => REPLACE)
       rescue Encoding::ConverterNotFoundError
@@ -113,49 +112,13 @@ def matching_encoding(string)
         string.dup.force_encoding(@encoding).encode(:invalid => :replace, :replace => REPLACE)
       end
 
-        # Prevents raising ArgumentError
-        if String.method_defined?(:scrub)
-          # https://github.com/ruby/ruby/blob/eeb05e8c11/doc/NEWS-2.1.0#L120-L123
-          # https://github.com/ruby/ruby/blob/v2_1_0/string.c#L8242
-          # https://github.com/hsbt/string-scrub
-          # https://github.com/rubinius/rubinius/blob/v2.5.2/kernel/common/string.rb#L1913-L1972
       def remove_invalid_bytes(string)
         string.scrub(REPLACE)
       end
-        else
-          # http://stackoverflow.com/a/8711118/879854
-          # Loop over chars in a string replacing chars
-          # with invalid encoding, which is a pretty good proxy
-          # for the invalid byte sequence that causes an ArgumentError
-          def remove_invalid_bytes(string)
-            string.chars.map do |char|
-              char.valid_encoding? ? char : REPLACE
-            end.join
-          end
-        end
 
       def detect_source_encoding(string)
         string.encoding
       end
-
-        def self.pick_encoding(source_a, source_b)
-          Encoding.compatible?(source_a, source_b) || Encoding.default_external
-        end
-      else
-
-        def self.pick_encoding(_source_a, _source_b)
-        end
-
-        private
-
-        def matching_encoding(string)
-          string
-        end
-
-        def detect_source_encoding(_string)
-          US_ASCII
-        end
-      end
     end
   end
 end

lib/rspec/support/fuzzy_matcher.rb

@@ -17,8 +17,7 @@ def self.values_match?(expected, actual)
         begin
           expected === actual
         rescue ArgumentError
-          # Some objects, like 0-arg lambdas on 1.9+, raise
-          # ArgumentError for `expected === actual`.
+          # Some objects, like 0-arg lambdas, raise ArgumentError when compared with ===.
           false
         end
       end