Merge pull request #11664 from Homebrew/dependabot/bundler/Library/Homebrew/rubocop-1.18.3

build(deps): bump rubocop from 1.17.0 to 1.18.3 in /Library/Homebrew

Library/.rubocop.yml

@@ -84,6 +84,25 @@ Naming/HeredocDelimiterNaming:
   ForbiddenDelimiters:
     - END, EOD, EOF
 
+Naming/InclusiveLanguage:
+  CheckStrings: true
+  FlaggedTerms:
+    # TODO: If possible, make this stricter.
+    slave:
+      AllowedRegex:
+        - "gitslave"   # Used in formula `gitslave`
+        - "log_slave"  # Used in formula `ssdb`
+        - "ssdb_slave" # Used in formula `ssdb`
+        - "var_slave"  # Used in formula `ssdb`
+        - "patches/13_fix_scope_for_show_slave_status_data.patch" # Used in formula `mytop`
+    blacklist:
+      AllowedRegex:
+        - "--listBlacklist" # Used in formula `xmlsectool`
+    whitelist:
+      AllowedRegex:
+        - "--error-white-list" # For an option passed to `srb` in dev-cmd/typecheck.rb
+        - "--repo-whitelist"   # Used in formula `atlantis`
+
 Naming/MethodName:
   IgnoredPatterns:
     - '\A(fetch_)?HEAD\?\Z'

Library/Homebrew/Gemfile.lock

@@ -112,7 +112,7 @@ GEM
       rspec (>= 3, < 4)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.17.0)
+    rubocop (1.18.3)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)

Library/Homebrew/cask/cask.rb

@@ -102,11 +102,11 @@ module Cask
 
     def installed_caskfile
       installed_version = timestamped_versions.last
-      metadata_master_container_path.join(*installed_version, "Casks", "#{token}.rb")
+      metadata_main_container_path.join(*installed_version, "Casks", "#{token}.rb")
     end
 
     def config_path
-      metadata_master_container_path/"config.json"
+      metadata_main_container_path/"config.json"
     end
 
     def caskroom_path

Library/Homebrew/cask/installer.rb

@@ -538,7 +538,7 @@ module Cask
 
         @cask.metadata_versioned_path.rmdir_if_possible
       end
-      @cask.metadata_master_container_path.rmdir_if_possible unless upgrade?
+      @cask.metadata_main_container_path.rmdir_if_possible unless upgrade?
 
       # toplevel staged distribution
       @cask.caskroom_path.rmdir_if_possible unless upgrade?

Library/Homebrew/cask/metadata.rb

@@ -9,8 +9,8 @@ module Cask
     METADATA_SUBDIR = ".metadata"
     TIMESTAMP_FORMAT = "%Y%m%d%H%M%S.%L"
 
-    def metadata_master_container_path
+    def metadata_main_container_path
-      @metadata_master_container_path ||= caskroom_path.join(METADATA_SUBDIR)
+      @metadata_main_container_path ||= caskroom_path.join(METADATA_SUBDIR)
     end
 
     def metadata_versioned_path(version: self.version)
@@ -18,7 +18,7 @@ module Cask
 
       raise CaskError, "Cannot create metadata path with empty version." if cask_version.empty?
 
-      metadata_master_container_path.join(cask_version)
+      metadata_main_container_path.join(cask_version)
     end
 
     def metadata_timestamped_path(version: self.version, timestamp: :latest, create: false)

Library/Homebrew/cmd/install.rb

@@ -74,7 +74,7 @@ module Homebrew
           description: "Install testing dependencies required to run `brew test` <formula>.",
         }],
         [:switch, "--HEAD", {
-          description: "If <formula> defines it, install the HEAD version, aka. master, trunk, unstable.",
+          description: "If <formula> defines it, install the HEAD version, aka. main, trunk, unstable, master.",
         }],
         [:switch, "--fetch-HEAD", {
           description: "Fetch the upstream repository to detect if the HEAD installation of the " \

Library/Homebrew/sorbet/rbi/gems/rubocop@1.18.3.rbi

@@ -1075,6 +1075,7 @@ class RuboCop::Cop::Bundler::GemVersion < ::RuboCop::Cop::Base
   include ::RuboCop::Cop::ConfigurableEnforcedStyle
   include ::RuboCop::Cop::GemDeclaration
 
+  def includes_commit_reference?(param0 = T.unsafe(nil)); end
   def includes_version_specification?(param0 = T.unsafe(nil)); end
   def on_send(node); end
 
@@ -1082,9 +1083,11 @@ class RuboCop::Cop::Bundler::GemVersion < ::RuboCop::Cop::Base
 
   def allowed_gem?(node); end
   def allowed_gems; end
+  def forbidden_offense?(node); end
   def forbidden_style?; end
   def message(range); end
   def offense?(node); end
+  def required_offense?(node); end
   def required_style?; end
   def version_specification?(expression); end
 end
@@ -1153,6 +1156,7 @@ module RuboCop::Cop::CheckLineBreakable
   def contained_by_multiline_collection_that_could_be_broken_up?(node); end
   def extract_breakable_node_from_elements(node, elements, max); end
   def extract_first_element_over_column_limit(node, elements, max); end
+  def first_argument_is_heredoc?(node); end
   def process_args(args); end
   def safe_to_ignore?(node); end
   def shift_elements_for_heredoc_arg(node, elements, index); end
@@ -3177,6 +3181,28 @@ end
 
 RuboCop::Cop::Layout::LeadingEmptyLines::MSG = T.let(T.unsafe(nil), String)
 
+class RuboCop::Cop::Layout::LineEndStringConcatenationIndentation < ::RuboCop::Cop::Base
+  include ::RuboCop::Cop::ConfigurableEnforcedStyle
+  include ::RuboCop::Cop::Alignment
+  extend ::RuboCop::Cop::AutoCorrector
+
+  def autocorrect(corrector, node); end
+  def on_dstr(node); end
+
+  private
+
+  def add_offense_and_correction(node, message); end
+  def always_aligned?(dstr_node); end
+  def always_indented?(dstr_node); end
+  def check_aligned(children, start_index); end
+  def check_indented(children); end
+  def strings_concatenated_with_backslash?(dstr_node); end
+end
+
+RuboCop::Cop::Layout::LineEndStringConcatenationIndentation::MSG_ALIGN = T.let(T.unsafe(nil), String)
+RuboCop::Cop::Layout::LineEndStringConcatenationIndentation::MSG_INDENT = T.let(T.unsafe(nil), String)
+RuboCop::Cop::Layout::LineEndStringConcatenationIndentation::PARENT_TYPES_FOR_INDENTED = T.let(T.unsafe(nil), Array)
+
 class RuboCop::Cop::Layout::LineLength < ::RuboCop::Cop::Base
   include ::RuboCop::Cop::CheckLineBreakable
   include ::RuboCop::Cop::IgnoredPattern
@@ -3697,6 +3723,7 @@ class RuboCop::Cop::Layout::SpaceAroundOperators < ::RuboCop::Cop::Base
   def on_or_asgn(node); end
   def on_pair(node); end
   def on_resbody(node); end
+  def on_sclass(node); end
   def on_send(node); end
   def on_special_asgn(node); end
 
@@ -6571,6 +6598,53 @@ end
 
 RuboCop::Cop::Naming::HeredocDelimiterNaming::MSG = T.let(T.unsafe(nil), String)
 
+class RuboCop::Cop::Naming::InclusiveLanguage < ::RuboCop::Cop::Base
+  include ::RuboCop::Cop::RangeHelp
+
+  def initialize(config = T.unsafe(nil), options = T.unsafe(nil)); end
+
+  def on_new_investigation; end
+
+  private
+
+  def add_offenses_for_token(token, word_locations); end
+  def add_to_flagged_term_hash(regex_string, term, term_definition); end
+  def array_to_ignorecase_regex(strings); end
+  def check_token?(type); end
+  def create_message(word); end
+  def create_message_for_file(word); end
+  def create_multiple_word_message_for_file(words); end
+  def create_single_word_message_for_file(word); end
+  def ensure_regex_string(regex); end
+  def find_flagged_term(word); end
+  def format_suggestions(suggestions); end
+  def investigate_filepath; end
+  def investigate_tokens; end
+  def mask_input(str); end
+  def preprocess_check_config; end
+  def preprocess_flagged_terms; end
+  def preprocess_suggestions(suggestions); end
+  def process_allowed_regex(allowed); end
+  def scan_for_words(input); end
+  def set_regexes(flagged_term_strings, allowed_strings); end
+end
+
+RuboCop::Cop::Naming::InclusiveLanguage::EMPTY_ARRAY = T.let(T.unsafe(nil), Array)
+
+class RuboCop::Cop::Naming::InclusiveLanguage::WordLocation < ::Struct
+  def position; end
+  def position=(_); end
+  def word; end
+  def word=(_); end
+
+  class << self
+    def [](*_arg0); end
+    def inspect; end
+    def members; end
+    def new(*_arg0); end
+  end
+end
+
 class RuboCop::Cop::Naming::MemoizedInstanceVariableName < ::RuboCop::Cop::Base
   include ::RuboCop::Cop::ConfigurableEnforcedStyle
 
@@ -7488,6 +7562,7 @@ RuboCop::Cop::Style::BlockComments::MSG = T.let(T.unsafe(nil), String)
 class RuboCop::Cop::Style::BlockDelimiters < ::RuboCop::Cop::Base
   include ::RuboCop::Cop::ConfigurableEnforcedStyle
   include ::RuboCop::Cop::IgnoredMethods
+  include ::RuboCop::Cop::RangeHelp
   extend ::RuboCop::Cop::IgnoredMethods::Config
   extend ::RuboCop::Cop::AutoCorrector
 
@@ -7512,6 +7587,7 @@ class RuboCop::Cop::Style::BlockDelimiters < ::RuboCop::Cop::Base
   def line_count_based_block_style?(node); end
   def line_count_based_message(node); end
   def message(node); end
+  def move_comment_before_block(corrector, comment, block_node, closing_brace); end
   def procedural_method?(method_name); end
   def procedural_oneliners_may_have_braces?; end
   def proper_block_style?(node); end
@@ -7625,6 +7701,7 @@ class RuboCop::Cop::Style::ClassAndModuleChildren < ::RuboCop::Cop::Base
   def compact_node(corrector, node); end
   def compact_node_name?(node); end
   def compact_replacement(node); end
+  def configured_indentation_width; end
   def indent_width; end
   def leading_spaces(node); end
   def needs_compacting?(body); end
@@ -7633,6 +7710,7 @@ class RuboCop::Cop::Style::ClassAndModuleChildren < ::RuboCop::Cop::Base
   def remove_end(corrector, body); end
   def replace_namespace_keyword(corrector, node); end
   def split_on_double_colon(corrector, node, padding); end
+  def unindent(corrector, node); end
 end
 
 RuboCop::Cop::Style::ClassAndModuleChildren::COMPACT_MSG = T.let(T.unsafe(nil), String)
@@ -7818,13 +7896,18 @@ class RuboCop::Cop::Style::CommentAnnotation < ::RuboCop::Cop::Base
   def annotation_range(comment, margin, first_word, colon, space); end
   def concat_length(*args); end
   def correct_annotation?(first_word, colon, space, note); end
+  def correct_colon_annotation?(first_word, colon, space, note); end
+  def correct_offense(corrector, range, first_word); end
+  def correct_space_annotation?(first_word, colon, space, note); end
   def first_comment_line?(comments, index); end
   def inline_comment?(comment); end
   def register_offense(range, note, first_word); end
+  def requires_colon?; end
 end
 
 RuboCop::Cop::Style::CommentAnnotation::MISSING_NOTE = T.let(T.unsafe(nil), String)
-RuboCop::Cop::Style::CommentAnnotation::MSG = T.let(T.unsafe(nil), String)
+RuboCop::Cop::Style::CommentAnnotation::MSG_COLON_STYLE = T.let(T.unsafe(nil), String)
+RuboCop::Cop::Style::CommentAnnotation::MSG_SPACE_STYLE = T.let(T.unsafe(nil), String)
 
 class RuboCop::Cop::Style::CommentedKeyword < ::RuboCop::Cop::Base
   include ::RuboCop::Cop::RangeHelp
@@ -10577,6 +10660,7 @@ class RuboCop::Cop::Style::RegexpLiteral < ::RuboCop::Cop::Base
   def allow_inner_slashes?; end
   def allowed_mixed_percent_r?(node); end
   def allowed_mixed_slash?(node); end
+  def allowed_omit_parentheses_with_percent_r_literal?(node); end
   def allowed_percent_r_literal?(node); end
   def allowed_slash_literal?(node); end
   def calculate_replacement(node); end
@@ -10589,7 +10673,6 @@ class RuboCop::Cop::Style::RegexpLiteral < ::RuboCop::Cop::Base
   def inner_slash_for(opening_delimiter); end
   def inner_slash_indices(node); end
   def node_body(node, include_begin_nodes: T.unsafe(nil)); end
-  def omit_parentheses_style?(node); end
   def preferred_delimiters; end
   def slash_literal?(node); end
 end
@@ -10838,6 +10921,7 @@ class RuboCop::Cop::Style::SingleLineMethods < ::RuboCop::Cop::Base
   def correct_to_endless(corrector, node); end
   def correct_to_endless?(body_node); end
   def correct_to_multiline(corrector, node); end
+  def disallow_endless_method_style?; end
   def each_part(body); end
   def method_body_source(method_body); end
   def move_comment(node, corrector); end
@@ -10845,6 +10929,7 @@ class RuboCop::Cop::Style::SingleLineMethods < ::RuboCop::Cop::Base
 end
 
 RuboCop::Cop::Style::SingleLineMethods::MSG = T.let(T.unsafe(nil), String)
+RuboCop::Cop::Style::SingleLineMethods::NOT_SUPPORTED_ENDLESS_METHOD_BODY_TYPES = T.let(T.unsafe(nil), Array)
 
 class RuboCop::Cop::Style::SlicingWithRange < ::RuboCop::Cop::Base
   extend ::RuboCop::Cop::AutoCorrector
@@ -10981,12 +11066,14 @@ class RuboCop::Cop::Style::StringConcatenation < ::RuboCop::Cop::Base
 
   private
 
-  def collect_parts(node, parts); end
+  def collect_parts(node, parts = T.unsafe(nil)); end
   def corrected_ancestor?(node); end
   def find_topmost_plus_node(node); end
   def handle_quotes(parts); end
   def line_end_concatenation?(node); end
+  def offensive_for_mode?(receiver_node); end
   def plus_node?(node); end
+  def register_offense(topmost_plus_node, parts); end
   def replacement(parts); end
   def single_quoted?(str_node); end
   def uncorrectable?(part); end

Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi

@@ -26891,6 +26891,7 @@ end
 
 module RuboCop::AST::NodePattern::Sets
   SET_BEGINNING_OF_DAY_BEGINNING_OF_WEEK_BEGINNING_OF_MONTH_ETC = ::T.let(nil, ::T.untyped)
+  SET_BRANCH_REF_TAG = ::T.let(nil, ::T.untyped)
   SET_BUILD_RECOMMENDED_TEST_OPTIONAL = ::T.let(nil, ::T.untyped)
   SET_DEPENDS_ON_USES_FROM_MACOS = ::T.let(nil, ::T.untyped)
   SET_END_OF_DAY_END_OF_WEEK_END_OF_MONTH_ETC = ::T.let(nil, ::T.untyped)

Library/Homebrew/vendor/bundle/bundler/setup.rb

@@ -81,7 +81,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec_junit_formatter
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-ast-1.7.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.11.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-2.0.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-1.17.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-1.18.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.11.4/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rails-2.11.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-2.4.0/lib"