(PUP-11718) Remove conditionals for old Rubies

Puppet 8 will have a minimum version of Ruby 3.1.0. This commit
removes conditional code to check for versions of Ruby less than
3.1.0.

Author: mhashizume

Gemfile

@@ -42,9 +42,9 @@ group(:test) do
   gem "rspec", "~> 3.1", require: false
   gem "rspec-expectations", ["~> 3.9", "!= 3.9.3"]
   gem "rspec-its", "~> 1.1", require: false
-  gem 'vcr', RUBY_VERSION.to_f >= 3.2 ? '~> 6.1' : '~> 5.0', require: false
+  gem 'vcr', '~> 6.1', require: false
   gem 'webmock', '~> 3.0', require: false
-  gem 'webrick', '~> 1.7', require: false if RUBY_VERSION.to_f >= 3.0
+  gem 'webrick', '~> 1.7', require: false
   gem 'yard', require: false
 
   gem 'rubocop', '1.28.0', require: false, platforms: [:ruby]

lib/puppet/util.rb

@@ -34,15 +34,10 @@ def default_env
   end
   module_function :default_env
 
-  if RUBY_VERSION >= "2.6"
-    def create_erb(content)
-      ERB.new(content, trim_mode: '-')
-    end
-  else
-    def create_erb(content)
-      ERB.new(content, 0, '-')
-    end
+  def create_erb(content)
+    ERB.new(content, trim_mode: '-')
   end
+
   module_function :create_erb
 
   # @param name [String] The name of the environment variable to retrieve

lib/puppet/util/monkey_patches.rb

@@ -29,28 +29,6 @@ def daemonize
   end
 end
 
-if RUBY_VERSION.to_f < 3.0
-  # absolute/relative were optimized to avoid chop_basename in ruby 3
-  # see https://github.com/ruby/ruby/commit/39312cf4d6c2ab3f07d688ad1a467c8f84b58db0
-  require 'pathname'
-  class Pathname
-    if File.dirname('A:') == 'A:.' # DOSish drive letter
-      ABSOLUTE_PATH = /\A(?:[A-Za-z]:|#{SEPARATOR_PAT})/o
-    else
-      ABSOLUTE_PATH = /\A#{SEPARATOR_PAT}/o
-    end
-    private_constant :ABSOLUTE_PATH
-
-    def absolute?
-      ABSOLUTE_PATH.match? @path
-    end
-
-    def relative?
-      !absolute?
-    end
-  end
-end
-
 # (#19151) Reject all SSLv2 ciphers and handshakes
 require_relative '../../puppet/ssl/openssl_loader'
 unless Puppet::Util::Platform.jruby_fips?

spec/unit/http/factory_spec.rb

@@ -140,7 +140,7 @@ def create_connection(site)
   end
 
   context 'tls' do
-    it "sets the minimum version to TLS 1.0", if: RUBY_VERSION.to_f >= 2.5 do
+    it "sets the minimum version to TLS 1.0" do
       conn = create_connection(site)
       expect(conn.min_version).to eq(OpenSSL::SSL::TLS1_VERSION)
     end