brew vendor-gems: commit updates.
This commit is contained in:
parent
d457b63581
commit
268f3fc8ed
@ -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/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/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/activesupport-6.1.7.2/lib")
|
||||
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/public_suffix-5.0.1/lib")
|
||||
|
@ -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
|
@ -17,12 +17,8 @@ module TZInfo
|
||||
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
|
||||
# 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/ruby_core_support'
|
||||
|
||||
require_relative 'tzinfo/version'
|
||||
|
@ -4,10 +4,6 @@
|
||||
require 'strscan'
|
||||
|
||||
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
|
||||
# An {InvalidPosixTimeZone} exception is raised if an invalid POSIX-style
|
||||
# time zone string is encountered.
|
||||
@ -43,12 +39,12 @@ module TZInfo
|
||||
|
||||
s = StringScanner.new(tz_string)
|
||||
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+))?)?/)
|
||||
std_offset = get_offset_from_hms(s[1], s[2], s[3])
|
||||
|
||||
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+))?)?/)
|
||||
dst_offset = get_offset_from_hms(s[1], s[2], s[3])
|
@ -2,10 +2,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
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
|
||||
# A {TZInfoDataNotFound} exception is raised if the tzinfo-data gem could
|
||||
# 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')
|
||||
path = $".reverse_each.detect {|p| p.end_with?(data_file) }
|
||||
if path
|
||||
@base_path = File.join(File.dirname(path), 'data').untaint
|
||||
@base_path = RubyCoreSupport.untaint(File.join(File.dirname(path), 'data'))
|
||||
else
|
||||
@base_path = 'tzinfo/data'
|
||||
end
|
@ -2,10 +2,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
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
|
||||
# An {InvalidZoneinfoDirectory} exception is raised if {ZoneinfoDataSource}
|
||||
# is initialized with a specific zoneinfo path that is not a valid zoneinfo
|
||||
@ -444,7 +440,7 @@ module TZInfo
|
||||
end
|
||||
|
||||
unless entry =~ /\./ || exclude.include?(entry)
|
||||
entry.untaint
|
||||
RubyCoreSupport.untaint(entry)
|
||||
path = dir + [entry]
|
||||
full_path = File.join(@zoneinfo_dir, *path)
|
||||
|
@ -2,10 +2,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
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
|
||||
# An {InvalidZoneinfoFile} exception is raised if an attempt is made to load
|
||||
# an invalid zoneinfo file.
|
||||
@ -448,7 +444,7 @@ module TZInfo
|
||||
abbrev_end = abbrev.index("\0", abbrev_start)
|
||||
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)
|
||||
end
|
38
Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/tzinfo-2.0.6/lib/tzinfo/ruby_core_support.rb
vendored
Normal file
38
Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/tzinfo-2.0.6/lib/tzinfo/ruby_core_support.rb
vendored
Normal 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
|
@ -3,5 +3,5 @@
|
||||
|
||||
module TZInfo
|
||||
# The TZInfo version number.
|
||||
VERSION = '2.0.5'
|
||||
VERSION = '2.0.6'
|
||||
end
|
Loading…
x
Reference in New Issue
Block a user