Merge pull request #15136 from Homebrew/dependabot/bundler/Library/Ho…

…mebrew/rubocop-1.49.0 build(deps): bump rubocop from 1.48.1 to 1.49.0 in /Library/Homebrew
Homebrew · Apr 7, 2023 · 291a7e0 · 291a7e0
2 parents dcc44f1 + abbb0fb
commit 291a7e0
Show file tree

Hide file tree

Showing 77 changed files with 536 additions and 465 deletions.
diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
@@ -13,7 +13,6 @@ inherit_mode:
 
 AllCops:
   TargetRubyVersion: 2.6
-  DisplayCopNames: false
   ActiveSupportExtensionsEnabled: true
   NewCops: enable
   Include:

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
@@ -130,14 +130,14 @@ GEM
     rspec-support (3.12.0)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.48.1)
+    rubocop (1.49.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.28.0)

diff --git a/Library/Homebrew/cask/artifact/symlinked.rb b/Library/Homebrew/cask/artifact/symlinked.rb
@@ -56,7 +56,7 @@ def link(force: false, **options)
           message = "It seems there is already #{self.class.english_article} " \
                     "#{self.class.english_name} at '#{target}'"
 
-          if force && target.symlink? && \
+          if force && target.symlink? &&
              (target.realpath == source.realpath || target.realpath.to_s.start_with?("#{cask.caskroom_path}/"))
             opoo "#{message}; overwriting."
             target.delete

diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb
@@ -72,7 +72,7 @@ def bump
 
       ambiguous_casks = []
       if !args.formula? && !args.cask?
-        ambiguous_casks = formulae_and_casks \
+        ambiguous_casks = formulae_and_casks
                           .group_by { |item| Livecheck.package_or_resource_name(item, full_name: true) }
                           .values
                           .select { |items| items.length > 1 }

diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb
@@ -182,7 +182,7 @@ def run_checks(
 
       ambiguous_casks = []
       if handle_name_conflict
-        ambiguous_casks = formulae_and_casks_to_check \
+        ambiguous_casks = formulae_and_casks_to_check
                           .group_by { |item| package_or_resource_name(item, full_name: true) }
                           .values
                           .select { |items| items.length > 1 }

diff --git a/Library/Homebrew/migrator.rb b/Library/Homebrew/migrator.rb
@@ -360,14 +360,14 @@ def update_tabs
 
   # Remove `opt/oldname` link if it belongs to newname.
   def unlink_oldname_opt
-    return unless old_opt_record
-
-    if old_opt_record.symlink? && old_opt_record.exist? \
-        && new_linked_keg_record.exist? \
-        && new_linked_keg_record.realpath == old_opt_record.realpath
-      old_opt_record.unlink
-      old_opt_record.parent.rmdir_if_possible
-    end
+    return if old_opt_record.to_s.blank?
+    return unless old_opt_record.symlink?
+    return unless old_opt_record.exist?
+    return unless new_linked_keg_record.exist?
+    return if new_linked_keg_record.realpath != old_opt_record.realpath
+
+    old_opt_record.unlink
+    old_opt_record.parent.rmdir_if_possible
   end
 
   # Remove `Cellar/oldname` if it exists.

diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
@@ -120,7 +120,7 @@ def bottle_tag?(tag = nil)
   end
 
   def bottled?(tag = nil)
-    bottle_tag?(tag) && \
+    bottle_tag?(tag) &&
       (tag.present? || bottle_specification.compatible_locations? || owner.force_bottle)
   end
 

diff --git a/...mebrew/sorbet/rbi/gems/rubocop@1.48.1.rbi → ...mebrew/sorbet/rbi/gems/rubocop@1.49.0.rbi b/...mebrew/sorbet/rbi/gems/rubocop@1.48.1.rbi → ...mebrew/sorbet/rbi/gems/rubocop@1.49.0.rbi
diff --git a/Library/Homebrew/test/rubocops/bottle/bottle_digest_indentation_spec.rb b/Library/Homebrew/test/rubocops/bottle/bottle_digest_indentation_spec.rb
@@ -75,9 +75,9 @@ class Foo < Formula
           rebuild 4
           sha256 arm64_big_sur: "aaaaaaaa"
           sha256 big_sur: "faceb00c"
-                          ^^^^^^^^^^ Align bottle digests
+                          ^^^^^^^^^^ FormulaAudit/BottleDigestIndentation: Align bottle digests
           sha256 catalina: "deadbeef"
-                           ^^^^^^^^^^ Align bottle digests
+                           ^^^^^^^^^^ FormulaAudit/BottleDigestIndentation: Align bottle digests
         end
       end
     RUBY
@@ -105,9 +105,9 @@ class Foo < Formula
           rebuild 4
           sha256 cellar: :any,                arm64_big_sur: "aaaaaaaa"
           sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c"
-                                                       ^^^^^^^^^^ Align bottle digests
+                                                       ^^^^^^^^^^ FormulaAudit/BottleDigestIndentation: Align bottle digests
           sha256                              catalina: "deadbeef"
-                                                        ^^^^^^^^^^ Align bottle digests
+                                                        ^^^^^^^^^^ FormulaAudit/BottleDigestIndentation: Align bottle digests
         end
       end
     RUBY