brew vendor-gems: commit updates.

This commit is contained in:
BrewTestBot 2023-01-30 18:05:21 +00:00
parent d457b63581
commit 268f3fc8ed
No known key found for this signature in database
GPG Key ID: 82D7D104050B0F0F
51 changed files with 47 additions and 47 deletions

View File

@ -26,7 +26,7 @@ end
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/concurrent-ruby-1.2.0/lib/concurrent-ruby") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/concurrent-ruby-1.2.0/lib/concurrent-ruby")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/i18n-1.12.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/i18n-1.12.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/minitest-5.17.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/minitest-5.17.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/tzinfo-2.0.5/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/tzinfo-2.0.6/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/zeitwerk-2.6.6/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/zeitwerk-2.6.6/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/activesupport-6.1.7.2/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/activesupport-6.1.7.2/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/public_suffix-5.0.1/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/public_suffix-5.0.1/lib")

View File

@ -1,18 +0,0 @@
# encoding: UTF-8
# frozen_string_literal: true
module TZInfo
# Object#untaint is deprecated in Ruby >= 2.7 and will be removed in 3.2.
# UntaintExt adds a refinement to make Object#untaint a no-op and avoid the
# warning.
#
# @private
module UntaintExt # :nodoc:
refine Object do
def untaint
self
end
end
end
private_constant :UntaintExt
end

View File

@ -17,12 +17,8 @@ module TZInfo
end end
end end
# Object#untaint is a deprecated no-op in Ruby >= 2.7 and will be removed in
# 3.2. Add a refinement to either silence the warning, or supply the method if require_relative 'tzinfo/ruby_core_support'
# needed.
if !Object.new.respond_to?(:untaint) || RUBY_VERSION =~ /\A(\d+)\.(\d+)(?:\.|\z)/ && ($1 == '2' && $2.to_i >= 7 || $1.to_i >= 3)
require_relative 'tzinfo/untaint_ext'
end
require_relative 'tzinfo/version' require_relative 'tzinfo/version'

View File

@ -4,10 +4,6 @@
require 'strscan' require 'strscan'
module TZInfo module TZInfo
# Use send as a workaround for erroneous 'wrong number of arguments' errors
# with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
send(:using, UntaintExt) if TZInfo.const_defined?(:UntaintExt)
module DataSources module DataSources
# An {InvalidPosixTimeZone} exception is raised if an invalid POSIX-style # An {InvalidPosixTimeZone} exception is raised if an invalid POSIX-style
# time zone string is encountered. # time zone string is encountered.
@ -43,12 +39,12 @@ module TZInfo
s = StringScanner.new(tz_string) s = StringScanner.new(tz_string)
check_scan(s, /([^-+,\d<][^-+,\d]*) | <([^>]+)>/x) check_scan(s, /([^-+,\d<][^-+,\d]*) | <([^>]+)>/x)
std_abbrev = @string_deduper.dedupe((s[1] || s[2]).untaint) std_abbrev = @string_deduper.dedupe(RubyCoreSupport.untaint(s[1] || s[2]))
check_scan(s, /([-+]?\d+)(?::(\d+)(?::(\d+))?)?/) check_scan(s, /([-+]?\d+)(?::(\d+)(?::(\d+))?)?/)
std_offset = get_offset_from_hms(s[1], s[2], s[3]) std_offset = get_offset_from_hms(s[1], s[2], s[3])
if s.scan(/([^-+,\d<][^-+,\d]*) | <([^>]+)>/x) if s.scan(/([^-+,\d<][^-+,\d]*) | <([^>]+)>/x)
dst_abbrev = @string_deduper.dedupe((s[1] || s[2]).untaint) dst_abbrev = @string_deduper.dedupe(RubyCoreSupport.untaint(s[1] || s[2]))
if s.scan(/([-+]?\d+)(?::(\d+)(?::(\d+))?)?/) if s.scan(/([-+]?\d+)(?::(\d+)(?::(\d+))?)?/)
dst_offset = get_offset_from_hms(s[1], s[2], s[3]) dst_offset = get_offset_from_hms(s[1], s[2], s[3])

View File

@ -2,10 +2,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module TZInfo module TZInfo
# Use send as a workaround for erroneous 'wrong number of arguments' errors
# with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
send(:using, UntaintExt) if TZInfo.const_defined?(:UntaintExt)
module DataSources module DataSources
# A {TZInfoDataNotFound} exception is raised if the tzinfo-data gem could # A {TZInfoDataNotFound} exception is raised if the tzinfo-data gem could
# not be found (i.e. `require 'tzinfo/data'` failed) when selecting the Ruby # not be found (i.e. `require 'tzinfo/data'` failed) when selecting the Ruby
@ -52,7 +48,7 @@ module TZInfo
data_file = File.join('', 'tzinfo', 'data.rb') data_file = File.join('', 'tzinfo', 'data.rb')
path = $".reverse_each.detect {|p| p.end_with?(data_file) } path = $".reverse_each.detect {|p| p.end_with?(data_file) }
if path if path
@base_path = File.join(File.dirname(path), 'data').untaint @base_path = RubyCoreSupport.untaint(File.join(File.dirname(path), 'data'))
else else
@base_path = 'tzinfo/data' @base_path = 'tzinfo/data'
end end

View File

@ -2,10 +2,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module TZInfo module TZInfo
# Use send as a workaround for erroneous 'wrong number of arguments' errors
# with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
send(:using, UntaintExt) if TZInfo.const_defined?(:UntaintExt)
module DataSources module DataSources
# An {InvalidZoneinfoDirectory} exception is raised if {ZoneinfoDataSource} # An {InvalidZoneinfoDirectory} exception is raised if {ZoneinfoDataSource}
# is initialized with a specific zoneinfo path that is not a valid zoneinfo # is initialized with a specific zoneinfo path that is not a valid zoneinfo
@ -444,7 +440,7 @@ module TZInfo
end end
unless entry =~ /\./ || exclude.include?(entry) unless entry =~ /\./ || exclude.include?(entry)
entry.untaint RubyCoreSupport.untaint(entry)
path = dir + [entry] path = dir + [entry]
full_path = File.join(@zoneinfo_dir, *path) full_path = File.join(@zoneinfo_dir, *path)

View File

@ -2,10 +2,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module TZInfo module TZInfo
# Use send as a workaround for erroneous 'wrong number of arguments' errors
# with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
send(:using, UntaintExt) if TZInfo.const_defined?(:UntaintExt)
module DataSources module DataSources
# An {InvalidZoneinfoFile} exception is raised if an attempt is made to load # An {InvalidZoneinfoFile} exception is raised if an attempt is made to load
# an invalid zoneinfo file. # an invalid zoneinfo file.
@ -448,7 +444,7 @@ module TZInfo
abbrev_end = abbrev.index("\0", abbrev_start) abbrev_end = abbrev.index("\0", abbrev_start)
raise InvalidZoneinfoFile, "Missing abbreviation null terminator in file '#{file.path}'." unless abbrev_end raise InvalidZoneinfoFile, "Missing abbreviation null terminator in file '#{file.path}'." unless abbrev_end
abbr = @string_deduper.dedupe(abbrev[abbrev_start...abbrev_end].force_encoding(Encoding::UTF_8).untaint) abbr = @string_deduper.dedupe(RubyCoreSupport.untaint(abbrev[abbrev_start...abbrev_end].force_encoding(Encoding::UTF_8)))
TimezoneOffset.new(base_utc_offset, std_offset, abbr) TimezoneOffset.new(base_utc_offset, std_offset, abbr)
end end

View File

@ -0,0 +1,38 @@
module TZInfo
# Methods to support different versions of Ruby.
#
# @private
module RubyCoreSupport #:nodoc:
class << self
# Object#untaint is deprecated and becomes a no-op in Ruby >= 2.7. It has
# been removed from Ruby 3.2.
if !Object.new.respond_to?(:untaint) || RUBY_VERSION =~ /\A(\d+)\.(\d+)(?:\.|\z)/ && ($1 == '2' && $2.to_i >= 7 || $1.to_i >= 3)
# :nocov_functional_untaint:
# Returns the supplied `Object`
#
# @param o [Object] the `Object` to untaint.
# @return [Object] `o`.
def untaint(o)
o
end
# :nocov_functional_untaint:
else
# :nocov_no_functional_untaint:
# Untaints and returns the supplied `Object`.
#
# @param o [Object] the `Object` to untaint.
# @return [Object] `o`.
def untaint(o)
o.untaint
end
# :nocov_no_functional_untaint:
end
end
end
private_constant :RubyCoreSupport
end

View File

@ -3,5 +3,5 @@
module TZInfo module TZInfo
# The TZInfo version number. # The TZInfo version number.
VERSION = '2.0.5' VERSION = '2.0.6'
end end