brew vendor-gems: commit updates.
This commit is contained in:
parent
04db2c3127
commit
7c74fae38e
122
Library/Homebrew/vendor/bundle/bundler/setup.rb
vendored
122
Library/Homebrew/vendor/bundle/bundler/setup.rb
vendored
@ -3,65 +3,65 @@ require 'rbconfig'
|
|||||||
ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
|
ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
|
||||||
ruby_version = RbConfig::CONFIG["ruby_version"]
|
ruby_version = RbConfig::CONFIG["ruby_version"]
|
||||||
path = File.expand_path('..', __FILE__)
|
path = File.expand_path('..', __FILE__)
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.5/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/concurrent-ruby-1.1.5/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.6.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/i18n-1.7.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.12.2/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/minitest-5.12.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/thread_safe-0.3.6/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.5/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/tzinfo-1.2.5/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-5.2.3/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/activesupport-5.2.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/ast-2.4.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/backports-3.15.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/backports-3.15.0/lib"
|
||||||
$:.unshift "#{path}/"
|
$:.unshift "#{path}/"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.2/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/connection_pool-2.2.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/json-2.2.0"
|
$:.unshift "#{path}/../ruby/2.3.0/extensions/universal-darwin-19/2.6.0/json-2.2.0"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json-2.2.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/json-2.2.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.2/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/docile-1.3.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.10.2/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/simplecov-html-0.10.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.16.1/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/simplecov-0.16.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tins-1.21.1/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/tins-1.21.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/term-ansicolor-1.7.1/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/term-ansicolor-1.7.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thor-0.20.3/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/thor-0.20.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coveralls-0.8.23/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/coveralls-0.8.23/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/diff-lcs-1.3/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/diff-lcs-1.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/unf_ext-0.0.7.6"
|
$:.unshift "#{path}/../ruby/2.3.0/extensions/universal-darwin-19/2.6.0/unf_ext-0.0.7.6"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf_ext-0.0.7.6/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/unf_ext-0.0.7.6/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf-0.1.4/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/unf-0.1.4/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/domain_name-0.5.20190701/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/domain_name-0.5.20190701/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/hpricot-0.8.6"
|
$:.unshift "#{path}/../ruby/2.3.0/extensions/universal-darwin-19/2.6.0/hpricot-0.8.6"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/hpricot-0.8.6/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/hpricot-0.8.6/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/http-cookie-1.0.3/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/http-cookie-1.0.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/jaro_winkler-1.5.3"
|
$:.unshift "#{path}/../ruby/2.3.0/extensions/universal-darwin-19/2.6.0/jaro_winkler-1.5.3"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/jaro_winkler-1.5.3/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/jaro_winkler-1.5.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mime-types-data-3.2019.0904/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/mime-types-data-3.2019.0904/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mime-types-3.3/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/mime-types-3.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/net-http-digest_auth-1.4.1/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/net-http-digest_auth-1.4.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/net-http-persistent-3.1.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/net-http-persistent-3.1.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mini_portile2-2.4.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/mini_portile2-2.4.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/nokogiri-1.10.4"
|
$:.unshift "#{path}/../ruby/2.3.0/extensions/universal-darwin-19/2.6.0/nokogiri-1.10.4"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/nokogiri-1.10.4/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/nokogiri-1.10.4/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ntlm-http-0.1.1/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/ntlm-http-0.1.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/webrobots-0.1.2/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/webrobots-0.1.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mechanize-2.7.6/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/mechanize-2.7.6/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mustache-1.1.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/mustache-1.1.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.17.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/parallel-1.17.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-2.29.2/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/parallel_tests-2.29.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-2.6.5.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/parser-2.6.5.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.5.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/plist-3.5.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rainbow-3.0.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/rdiscount-2.2.0.1"
|
$:.unshift "#{path}/../ruby/2.3.0/extensions/universal-darwin-19/2.6.0/rdiscount-2.2.0.1"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.1/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rdiscount-2.2.0.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ronn-0.7.3/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/ronn-0.7.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-support-3.8.3/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rspec-support-3.8.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-core-3.8.2/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rspec-core-3.8.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-expectations-3.8.5/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rspec-expectations-3.8.5/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-mocks-3.8.2/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rspec-mocks-3.8.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.8.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rspec-3.8.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-its-1.3.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rspec-its-1.3.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-retry-0.6.1/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rspec-retry-0.6.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rspec-wait-0.0.9/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.1/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/ruby-progressbar-1.10.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.6.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/unicode-display_width-1.6.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.75.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rubocop-0.75.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.5.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rubocop-performance-1.5.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.36.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/rubocop-rspec-1.36.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib"
|
$:.unshift "#{path}/../ruby/2.3.0/gems/ruby-macho-2.2.0/lib"
|
||||||
|
|||||||
@ -115,7 +115,7 @@ module I18n
|
|||||||
# *PLURALIZATION*
|
# *PLURALIZATION*
|
||||||
#
|
#
|
||||||
# Translation data can contain pluralized translations. Pluralized translations
|
# Translation data can contain pluralized translations. Pluralized translations
|
||||||
# are arrays of singluar/plural versions of translations like <tt>['Foo', 'Foos']</tt>.
|
# are arrays of singular/plural versions of translations like <tt>['Foo', 'Foos']</tt>.
|
||||||
#
|
#
|
||||||
# Note that <tt>I18n::Backend::Simple</tt> only supports an algorithm for English
|
# Note that <tt>I18n::Backend::Simple</tt> only supports an algorithm for English
|
||||||
# pluralization rules. Other algorithms can be supported by custom backends.
|
# pluralization rules. Other algorithms can be supported by custom backends.
|
||||||
@ -173,7 +173,7 @@ module I18n
|
|||||||
#
|
#
|
||||||
# It is recommended to use/implement lambdas in an "idempotent" way. E.g. when
|
# It is recommended to use/implement lambdas in an "idempotent" way. E.g. when
|
||||||
# a cache layer is put in front of I18n.translate it will generate a cache key
|
# a cache layer is put in front of I18n.translate it will generate a cache key
|
||||||
# from the argument values passed to #translate. Therefor your lambdas should
|
# from the argument values passed to #translate. Therefore your lambdas should
|
||||||
# always return the same translations/values per unique combination of argument
|
# always return the same translations/values per unique combination of argument
|
||||||
# values.
|
# values.
|
||||||
def translate(key = nil, *, throw: false, raise: false, locale: nil, **options) # TODO deprecate :raise
|
def translate(key = nil, *, throw: false, raise: false, locale: nil, **options) # TODO deprecate :raise
|
||||||
@ -202,7 +202,7 @@ module I18n
|
|||||||
# Wrapper for <tt>translate</tt> that adds <tt>:raise => true</tt>. With
|
# Wrapper for <tt>translate</tt> that adds <tt>:raise => true</tt>. With
|
||||||
# this option, if no translation is found, it will raise <tt>I18n::MissingTranslationData</tt>
|
# this option, if no translation is found, it will raise <tt>I18n::MissingTranslationData</tt>
|
||||||
def translate!(key, options = EMPTY_HASH)
|
def translate!(key, options = EMPTY_HASH)
|
||||||
translate(key, options.merge(:raise => true))
|
translate(key, **options.merge(:raise => true))
|
||||||
end
|
end
|
||||||
alias :t! :translate!
|
alias :t! :translate!
|
||||||
|
|
||||||
@ -81,7 +81,7 @@ module I18n
|
|||||||
key = format
|
key = format
|
||||||
type = object.respond_to?(:sec) ? 'time' : 'date'
|
type = object.respond_to?(:sec) ? 'time' : 'date'
|
||||||
options = options.merge(:raise => true, :object => object, :locale => locale)
|
options = options.merge(:raise => true, :object => object, :locale => locale)
|
||||||
format = I18n.t(:"#{type}.formats.#{key}", options)
|
format = I18n.t(:"#{type}.formats.#{key}", **options)
|
||||||
end
|
end
|
||||||
|
|
||||||
format = translate_localization_format(locale, object, format, options)
|
format = translate_localization_format(locale, object, format, options)
|
||||||
@ -122,7 +122,7 @@ module I18n
|
|||||||
# first translation that can be resolved. Otherwise it tries to resolve
|
# first translation that can be resolved. Otherwise it tries to resolve
|
||||||
# the translation directly.
|
# the translation directly.
|
||||||
def default(locale, object, subject, options = EMPTY_HASH)
|
def default(locale, object, subject, options = EMPTY_HASH)
|
||||||
options = options.dup.reject { |key, value| key == :default }
|
options = options.reject { |key, value| key == :default }
|
||||||
case subject
|
case subject
|
||||||
when Array
|
when Array
|
||||||
subject.each do |item|
|
subject.each do |item|
|
||||||
@ -143,7 +143,7 @@ module I18n
|
|||||||
result = catch(:exception) do
|
result = catch(:exception) do
|
||||||
case subject
|
case subject
|
||||||
when Symbol
|
when Symbol
|
||||||
I18n.translate(subject, options.merge(:locale => locale, :throw => true))
|
I18n.translate(subject, **options.merge(:locale => locale, :throw => true))
|
||||||
when Proc
|
when Proc
|
||||||
date_or_time = options.delete(:object) || object
|
date_or_time = options.delete(:object) || object
|
||||||
resolve(locale, object, subject.call(date_or_time, options))
|
resolve(locale, object, subject.call(date_or_time, options))
|
||||||
@ -96,9 +96,13 @@ module I18n
|
|||||||
end
|
end
|
||||||
|
|
||||||
def translations
|
def translations
|
||||||
backends.first.instance_eval do
|
backends.reverse.each_with_object({}) do |backend, memo|
|
||||||
init_translations unless initialized?
|
partial_translations = backend.instance_eval do
|
||||||
translations
|
init_translations unless initialized?
|
||||||
|
translations
|
||||||
|
end
|
||||||
|
|
||||||
|
memo.deep_merge!(partial_translations)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -21,8 +21,6 @@ module I18n
|
|||||||
class Simple
|
class Simple
|
||||||
using I18n::HashRefinements
|
using I18n::HashRefinements
|
||||||
|
|
||||||
(class << self; self; end).class_eval { public :include }
|
|
||||||
|
|
||||||
module Implementation
|
module Implementation
|
||||||
include Base
|
include Base
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ module I18n
|
|||||||
end
|
end
|
||||||
|
|
||||||
def gettext(msgid, options = EMPTY_HASH)
|
def gettext(msgid, options = EMPTY_HASH)
|
||||||
I18n.t(msgid, { :default => msgid, :separator => '|' }.merge(options))
|
I18n.t(msgid, **{:default => msgid, :separator => '|'}.merge(options))
|
||||||
end
|
end
|
||||||
alias _ gettext
|
alias _ gettext
|
||||||
|
|
||||||
@ -4,7 +4,7 @@
|
|||||||
module I18n
|
module I18n
|
||||||
DEFAULT_INTERPOLATION_PATTERNS = [
|
DEFAULT_INTERPOLATION_PATTERNS = [
|
||||||
/%%/,
|
/%%/,
|
||||||
/%\{(\w+)\}/, # matches placeholders like "%{foo}"
|
/%\{([\w|]+)\}/, # matches placeholders like "%{foo} or %{foo|word}"
|
||||||
/%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/ # matches placeholders like "%<foo>.d"
|
/%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/ # matches placeholders like "%<foo>.d"
|
||||||
].freeze
|
].freeze
|
||||||
INTERPOLATION_PATTERN = Regexp.union(DEFAULT_INTERPOLATION_PATTERNS)
|
INTERPOLATION_PATTERN = Regexp.union(DEFAULT_INTERPOLATION_PATTERNS)
|
||||||
@ -66,6 +66,7 @@ module I18n
|
|||||||
|
|
||||||
def [](locale)
|
def [](locale)
|
||||||
raise InvalidLocale.new(locale) if locale.nil?
|
raise InvalidLocale.new(locale) if locale.nil?
|
||||||
|
raise Disabled.new('fallback#[]') if locale == false
|
||||||
locale = locale.to_sym
|
locale = locale.to_sym
|
||||||
super || store(locale, compute(locale))
|
super || store(locale, compute(locale))
|
||||||
end
|
end
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
module I18n
|
module I18n
|
||||||
VERSION = "1.6.0"
|
VERSION = "1.7.0"
|
||||||
end
|
end
|
||||||
Loading…
x
Reference in New Issue
Block a user