From 1f64c50167aa2df4ec7e33b0668b91bceb5cd782 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 17 Apr 2018 09:03:57 +0100 Subject: [PATCH 1/3] RuboCop 0.55.0. --- Library/Homebrew/constants.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/constants.rb b/Library/Homebrew/constants.rb index a98c14a387..3e20ed7c2b 100644 --- a/Library/Homebrew/constants.rb +++ b/Library/Homebrew/constants.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true # RuboCop version used for `brew style` and `brew cask style` -HOMEBREW_RUBOCOP_VERSION = "0.54.0" +HOMEBREW_RUBOCOP_VERSION = "0.55.0" HOMEBREW_RUBOCOP_CASK_VERSION = "~> 0.18.1" # has to be updated when RuboCop version changes From 5cf8fa57279da551ca7ab8a31c1834357a2bfba1 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Tue, 17 Apr 2018 10:59:25 +0200 Subject: [PATCH 2/3] Update `rubocop-cask` to 0.19. --- Library/Homebrew/constants.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/constants.rb b/Library/Homebrew/constants.rb index 3e20ed7c2b..25326075e5 100644 --- a/Library/Homebrew/constants.rb +++ b/Library/Homebrew/constants.rb @@ -2,4 +2,4 @@ # RuboCop version used for `brew style` and `brew cask style` HOMEBREW_RUBOCOP_VERSION = "0.55.0" -HOMEBREW_RUBOCOP_CASK_VERSION = "~> 0.18.1" # has to be updated when RuboCop version changes +HOMEBREW_RUBOCOP_CASK_VERSION = "~> 0.19.0" # has to be updated when RuboCop version changes From 0a00312b71bd654393634820f8577d25495e54c7 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 17 Apr 2018 10:42:41 +0100 Subject: [PATCH 3/3] Autocorrect new RuboCop 0.55.0 style violations. --- Library/Homebrew/cask/lib/hbc/metadata.rb | 2 +- Library/Homebrew/cli_parser.rb | 2 +- Library/Homebrew/formula.rb | 2 +- Library/Homebrew/keg.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cask/lib/hbc/metadata.rb b/Library/Homebrew/cask/lib/hbc/metadata.rb index 344c38ceea..030b18dd9f 100644 --- a/Library/Homebrew/cask/lib/hbc/metadata.rb +++ b/Library/Homebrew/cask/lib/hbc/metadata.rb @@ -22,7 +22,7 @@ module Hbc end path = if timestamp == :latest - Pathname.glob(metadata_versioned_path(version: version).join("*")).sort.last + Pathname.glob(metadata_versioned_path(version: version).join("*")).max else timestamp = new_timestamp if timestamp == :now metadata_versioned_path(version: version).join(timestamp) diff --git a/Library/Homebrew/cli_parser.rb b/Library/Homebrew/cli_parser.rb index 5ce769343b..dd467f3fc6 100644 --- a/Library/Homebrew/cli_parser.rb +++ b/Library/Homebrew/cli_parser.rb @@ -52,7 +52,7 @@ module Homebrew end def option_to_description(*names) - names.map { |name| name.to_s.sub(/\A--?/, "").tr("-", " ") }.sort.last + names.map { |name| name.to_s.sub(/\A--?/, "").tr("-", " ") }.max end def parse(cmdline_args = ARGV) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index d4c248e190..452e9e9453 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1131,7 +1131,7 @@ class Formula return false unless old_rack.directory? return false if old_rack.subdirs.empty? - tap == Tab.for_keg(old_rack.subdirs.sort.first).tap + tap == Tab.for_keg(old_rack.subdirs.min).tap end # @private diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 7e930cc375..02e318624b 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -129,7 +129,7 @@ class Keg f_kegs = kegs_by_source[[f.name, f.tap]] next unless f_kegs - f_kegs.sort_by(&:version).last + f_kegs.max_by(&:version) end.compact next if required_kegs.empty?