Merge pull request #18828 from Homebrew/dependabot/bundler/Library/Homebrew/rubocop-1.69.0

2024-11-26 16:52:58 -08:00 · 2024-11-26 16:52:58 -08:00 · 2039b86ecc
commit 2039b86ecc
parent d6464506ba 4171abf686
14 changed files with 1883 additions and 1090 deletions
--- a/.gitignore
+++ b/.gitignore
@ -138,6 +138,7 @@
 **/vendor/bundle/ruby/*/gems/tapioca-*/
 **/vendor/bundle/ruby/*/gems/thor-*/
 **/vendor/bundle/ruby/*/gems/unicode-display_width-*/
+**/vendor/bundle/ruby/*/gems/unicode-emoji-*/
 **/vendor/bundle/ruby/*/gems/unparser-*/
 **/vendor/bundle/ruby/*/gems/uri_template-*/
 **/vendor/bundle/ruby/*/gems/vernier-*/
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@ -72,16 +72,16 @@ GEM
    rspec-support (3.13.1)
    rspec_junit_formatter (0.6.0)
      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.68.0)
+    rubocop (1.69.0)
      json (~> 2.3)
      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      rubocop-ast (>= 1.36.1, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
    rubocop-ast (1.36.1)
      parser (>= 3.3.1.0)
    rubocop-md (1.2.4)
@ -136,7 +136,9 @@ GEM
      thor (>= 1.2.0)
      yard-sorbet
    thor (1.3.2)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
    vernier (1.3.1)
    warning (1.4.0)
    yard (0.9.37)
--- a/Library/Homebrew/cask/upgrade.rb
+++ b/Library/Homebrew/cask/upgrade.rb
@ -38,7 +38,6 @@ module Cask
      quarantine: nil,
      require_sha: nil
    )
-
      quarantine = true if quarantine.nil?

      greedy = true if Homebrew::EnvConfig.upgrade_greedy?
--- a/Library/Homebrew/cask/url.rb
+++ b/Library/Homebrew/cask/url.rb
@ -74,7 +74,6 @@ module Cask
        data: nil,
        only_path: nil
      )
-
        @uri = URI(uri)

        header = Array(header) unless header.nil?
--- a/Library/Homebrew/descriptions.rb
+++ b/Library/Homebrew/descriptions.rb
@ -10,7 +10,6 @@ class Descriptions
  # Given a regex, find all formulae whose specified fields contain a match.
  def self.search(string_or_regex, field, cache_store,
                  eval_all = Homebrew::EnvConfig.eval_all?, cache_store_hash: false)
-
    cache_store.populate_if_empty!(eval_all:) unless cache_store_hash

    results = case field
--- a/Library/Homebrew/extend/kernel.rb
+++ b/Library/Homebrew/extend/kernel.rb
@ -285,8 +285,8 @@ module Kernel
    Homebrew._system(cmd, *args) do
      # Redirect output streams to `/dev/null` instead of closing as some programs
      # will fail to execute if they can't write to an open stream.
-      $stdout.reopen("/dev/null")
-      $stderr.reopen("/dev/null")
+      $stdout.reopen(File::NULL)
+      $stderr.reopen(File::NULL)
    end
  end

--- a/Library/Homebrew/livecheck.rb
+++ b/Library/Homebrew/livecheck.rb
@ -177,11 +177,7 @@ class Livecheck

  delegate version: :@package_or_resource
  delegate arch: :@package_or_resource
-  # FIXME: false positive: https://github.com/rubocop/rubocop/issues/13453
-  # rubocop:disable Style/AccessModifierDeclarations
  private :version, :arch
-  # rubocop:enable Style/AccessModifierDeclarations
-
  # Returns a `Hash` of all instance variable values.
  # @return [Hash]
  sig { returns(T::Hash[String, T.untyped]) }
--- a/Library/Homebrew/sorbet/rbi/gems/rubocop@1.69.0.rbi
+++ b/Library/Homebrew/sorbet/rbi/gems/rubocop@1.69.0.rbi
--- a/Library/Homebrew/sorbet/rbi/gems/unicode-emoji@4.0.4.rbi
+++ b/Library/Homebrew/sorbet/rbi/gems/unicode-emoji@4.0.4.rbi
@ -0,0 +1,251 @@
+# typed: true
+
+# DO NOT EDIT MANUALLY
+# This is an autogenerated file for types exported from the `unicode-emoji` gem.
+# Please instead update this file by running `bin/tapioca gem unicode-emoji`.
+
+
+# This file was generated by a script, please do not edit it by hand.
+# See `$ rake generate_constants` and data/generate_constants.rb for more info.
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#3
+module Unicode; end
+
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#4
+module Unicode::Emoji
+  class << self
+    # Returns ordered list of Emoji, categorized in a three-level deep Hash structure
+    #
+    # source://unicode-emoji//lib/unicode/emoji.rb#80
+    def list(key = T.unsafe(nil), sub_key = T.unsafe(nil)); end
+
+    # Return Emoji properties of character as an Array or nil
+    # See PROPERTY_NAMES constant for possible properties
+    #
+    # Source: see https://www.unicode.org/Public/16.0.0/ucd/emoji/emoji-data.txt
+    #
+    # source://unicode-emoji//lib/unicode/emoji.rb#68
+    def properties(char); end
+
+    private
+
+    # source://unicode-emoji//lib/unicode/emoji.rb#88
+    def get_codepoint_value(char); end
+  end
+end
+
+# Last codepoint of tag-based subdivision flags
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#31
+Unicode::Emoji::CANCEL_TAG = T.let(T.unsafe(nil), Integer)
+
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#7
+Unicode::Emoji::CLDR_VERSION = T.let(T.unsafe(nil), String)
+
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#8
+Unicode::Emoji::DATA_DIRECTORY = T.let(T.unsafe(nil), String)
+
+# The current list of codepoints with the "Emoji" property
+# Same characters as \p{Emoji}
+# (Emoji version of this gem might be more recent than Ruby's Emoji version)
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#8
+Unicode::Emoji::EMOJI_CHAR = T.let(T.unsafe(nil), Array)
+
+# The current list of codepoints with the "Emoji_Component" property
+# Same characters as \p{Emoji Component} or \p{EComp}
+# (Emoji version of this gem might be more recent than Ruby's Emoji version)
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#21
+Unicode::Emoji::EMOJI_COMPONENT = T.let(T.unsafe(nil), Array)
+
+# The list of characters that can be used as base for keycap sequences
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#42
+Unicode::Emoji::EMOJI_KEYCAPS = T.let(T.unsafe(nil), Array)
+
+# Combining Enclosing Keycap character
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#37
+Unicode::Emoji::EMOJI_KEYCAP_SUFFIX = T.let(T.unsafe(nil), Integer)
+
+# The current list of codepoints with the "Emoji_Modifier" property
+# Same characters as \p{Emoji Modifier} or \p{EMod}
+# (Emoji version of this gem might be more recent than Ruby's Emoji version)
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#31
+Unicode::Emoji::EMOJI_MODIFIERS = T.let(T.unsafe(nil), Array)
+
+# The current list of codepoints with the "Emoji_Modifier_Base" property
+# Same characters as \p{Emoji Modifier Base} or \p{EBase}
+# (Emoji version of this gem might be more recent than Ruby's Emoji version)
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#26
+Unicode::Emoji::EMOJI_MODIFIER_BASES = T.let(T.unsafe(nil), Array)
+
+# The current list of codepoints with the "Emoji_Presentation" property
+# Same characters as \p{Emoji Presentation} or \p{EPres}
+# (Emoji version of this gem might be more recent than Ruby's Emoji version)
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#13
+Unicode::Emoji::EMOJI_PRESENTATION = T.let(T.unsafe(nil), Array)
+
+# First codepoint of tag-based subdivision flags
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#28
+Unicode::Emoji::EMOJI_TAG_BASE_FLAG = T.let(T.unsafe(nil), Integer)
+
+# Variation Selector 16 (VS16), enables emoji presentation mode for preceding codepoint
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#22
+Unicode::Emoji::EMOJI_VARIATION_SELECTOR = T.let(T.unsafe(nil), Integer)
+
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#6
+Unicode::Emoji::EMOJI_VERSION = T.let(T.unsafe(nil), String)
+
+# The current list of codepoints with the "Extended_Pictographic" property
+# Same characters as \p{Extended Pictographic} or \p{ExtPict}
+# (Emoji version of this gem might be more recent than Ruby's Emoji version)
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#36
+Unicode::Emoji::EXTENDED_PICTOGRAPHIC = T.let(T.unsafe(nil), Array)
+
+# The current list of codepoints with the "Extended_Pictographic" property that don't have the "Emoji" property
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#39
+Unicode::Emoji::EXTENDED_PICTOGRAPHIC_NO_EMOJI = T.let(T.unsafe(nil), Array)
+
+# source://unicode-emoji//lib/unicode/emoji/index.rb#11
+Unicode::Emoji::INDEX = T.let(T.unsafe(nil), Hash)
+
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#9
+Unicode::Emoji::INDEX_FILENAME = T.let(T.unsafe(nil), String)
+
+# Contains an ordered and group list of all currently recommended Emoji (RGI/FQE)
+#
+# source://unicode-emoji//lib/unicode/emoji/list.rb#6
+Unicode::Emoji::LIST = T.let(T.unsafe(nil), Hash)
+
+# Sometimes, categories change, we issue a warning in these cases
+#
+# source://unicode-emoji//lib/unicode/emoji/list.rb#9
+Unicode::Emoji::LIST_REMOVED_KEYS = T.let(T.unsafe(nil), Array)
+
+# Unicode properties, see https://www.unicode.org/Public/16.0.0/ucd/emoji/emoji-data.txt
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#12
+Unicode::Emoji::PROPERTY_NAMES = T.let(T.unsafe(nil), Hash)
+
+# The list RGI tag sequence flags
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#51
+Unicode::Emoji::RECOMMENDED_SUBDIVISION_FLAGS = T.let(T.unsafe(nil), Array)
+
+# The list of fully-qualified RGI Emoji ZWJ sequences
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#54
+Unicode::Emoji::RECOMMENDED_ZWJ_SEQUENCES = T.let(T.unsafe(nil), Array)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex.rb#6
+Unicode::Emoji::REGEX = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_basic.rb#6
+Unicode::Emoji::REGEX_BASIC = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_emoji_keycap.rb#6
+Unicode::Emoji::REGEX_EMOJI_KEYCAP = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_include_mqe.rb#6
+Unicode::Emoji::REGEX_INCLUDE_MQE = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_include_mqe_uqe.rb#6
+Unicode::Emoji::REGEX_INCLUDE_MQE_UQE = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_include_text.rb#6
+Unicode::Emoji::REGEX_INCLUDE_TEXT = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_picto.rb#6
+Unicode::Emoji::REGEX_PICTO = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_picto_no_emoji.rb#6
+Unicode::Emoji::REGEX_PICTO_NO_EMOJI = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_possible.rb#6
+Unicode::Emoji::REGEX_POSSIBLE = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_prop_component.rb#6
+Unicode::Emoji::REGEX_PROP_COMPONENT = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_prop_emoji.rb#6
+Unicode::Emoji::REGEX_PROP_EMOJI = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_prop_modifier.rb#6
+Unicode::Emoji::REGEX_PROP_MODIFIER = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_prop_modifier_base.rb#6
+Unicode::Emoji::REGEX_PROP_MODIFIER_BASE = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_prop_presentation.rb#6
+Unicode::Emoji::REGEX_PROP_PRESENTATION = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_text.rb#6
+Unicode::Emoji::REGEX_TEXT = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_text_presentation.rb#6
+Unicode::Emoji::REGEX_TEXT_PRESENTATION = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_valid.rb#6
+Unicode::Emoji::REGEX_VALID = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_valid_include_text.rb#6
+Unicode::Emoji::REGEX_VALID_INCLUDE_TEXT = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_well_formed.rb#6
+Unicode::Emoji::REGEX_WELL_FORMED = T.let(T.unsafe(nil), Regexp)
+
+# source://unicode-emoji//lib/unicode/emoji/generated/regex_well_formed_include_text.rb#6
+Unicode::Emoji::REGEX_WELL_FORMED_INCLUDE_TEXT = T.let(T.unsafe(nil), Regexp)
+
+# Two regional indicators make up a region
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#43
+Unicode::Emoji::REGIONAL_INDICATORS = T.let(T.unsafe(nil), Array)
+
+# Tags characters allowed in tag-based subdivision flags
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#34
+Unicode::Emoji::SPEC_TAGS = T.let(T.unsafe(nil), Array)
+
+# The current list of codepoints with the "Emoji" property that lack the "Emoji Presentation" property
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#16
+Unicode::Emoji::TEXT_PRESENTATION = T.let(T.unsafe(nil), Array)
+
+# Variation Selector 15 (VS15), enables text presentation mode for preceding codepoint
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#25
+Unicode::Emoji::TEXT_VARIATION_SELECTOR = T.let(T.unsafe(nil), Integer)
+
+# The list of valid regions
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#45
+Unicode::Emoji::VALID_REGION_FLAGS = T.let(T.unsafe(nil), Array)
+
+# The list of valid subdivisions in regex character class syntax
+#
+# source://unicode-emoji//lib/unicode/emoji/lazy_constants.rb#48
+Unicode::Emoji::VALID_SUBDIVISIONS = T.let(T.unsafe(nil), Array)
+
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#5
+Unicode::Emoji::VERSION = T.let(T.unsafe(nil), String)
+
+# The current list of Emoji components that should have a visual representation
+# Currently skin tone modifiers + hair components
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#47
+Unicode::Emoji::VISUAL_COMPONENT = T.let(T.unsafe(nil), Array)
+
+# Zero-width-joiner to enable combination of multiple Emoji in a sequence
+#
+# source://unicode-emoji//lib/unicode/emoji/constants.rb#40
+Unicode::Emoji::ZWJ = T.let(T.unsafe(nil), Integer)
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@ -54,7 +54,7 @@ module Utils
        require "utils/curl"

        curl = Utils::Curl.curl_executable
-        args = Utils::Curl.curl_args(*args, "--silent", "--output", "/dev/null", show_error: false)
+        args = Utils::Curl.curl_args(*args, "--silent", "--output", File::NULL, show_error: false)
        if ENV["HOMEBREW_ANALYTICS_DEBUG"]
          puts "#{curl} #{args.join(" ")} \"#{url}\""
          puts Utils.popen_read(curl, *args, url)
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@ -101,7 +101,7 @@ module Utils
      end

      # echo any cookies received on a redirect
-      args << "--cookie" << "/dev/null"
+      args << "--cookie" << File::NULL

      args << "--globoff"

@ -256,7 +256,7 @@ module Utils
          if request_args.empty?
            # If we didn't get any wanted header yet, retry using `GET`.
            next if wanted_headers.any? &&
-                    parsed_output.fetch(:responses).none? { |r| (r.fetch(:headers).keys & wanted_headers).any? }
+                    parsed_output.fetch(:responses).none? { |r| r.fetch(:headers).keys.intersect?(wanted_headers) }

            # Some CDNs respond with 400 codes for `HEAD` but resolve with `GET`.
            next if (400..499).cover?(parsed_output.fetch(:responses).last&.fetch(:status_code).to_i)
--- a/Library/Homebrew/utils/popen.rb
+++ b/Library/Homebrew/utils/popen.rb
@ -50,7 +50,7 @@ module Utils

        yield pipe
      else
-        options[:err] ||= "/dev/null" unless ENV["HOMEBREW_STDERR"]
+        options[:err] ||= File::NULL unless ENV["HOMEBREW_STDERR"]
        begin
          exec(*args, options)
        rescue Errno::ENOENT
--- a/Library/Homebrew/utils/pypi.rb
+++ b/Library/Homebrew/utils/pypi.rb
@ -219,7 +219,6 @@ module PyPI
                                    exclude_packages: nil, dependencies: nil, install_dependencies: false,
                                    print_only: false, silent: false, verbose: false,
                                    ignore_non_pypi_packages: false)
-
    auto_update_list = formula.tap&.pypi_formula_mappings
    if auto_update_list.present? && auto_update_list.key?(formula.full_name) &&
       package_name.blank? && extra_packages.blank? && exclude_packages.blank?
--- a/Library/Homebrew/vendor/bundle/bundler/setup.rb
+++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@ -87,8 +87,9 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec_junit_formatter-0.6.0/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-ast-1.36.1/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ruby-progressbar-1.13.0/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unicode-display_width-2.6.0/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-1.68.0/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unicode-emoji-4.0.4/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unicode-display_width-3.1.2/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-1.69.0/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-md-1.2.4/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-performance-1.23.0/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-rspec-3.2.0/lib")