From b67884acf61afc9d4a38ab23940fe20fafdbeb72 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2019 05:24:11 +0000 Subject: [PATCH 1/3] build: bump rubocop from 0.76.0 to 0.77.0 in /Library/Homebrew Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.76.0 to 0.77.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.76.0...v0.77.0) Signed-off-by: dependabot-preview[bot] --- Library/Homebrew/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index edcc1e4a9e..1e45a4b643 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -80,7 +80,7 @@ GEM rspec-support (3.9.0) rspec-wait (0.0.9) rspec (>= 3, < 4) - rubocop (0.76.0) + rubocop (0.77.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) From 35bad17e1ebf3cf72e3c0580668949571a41cb75 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 28 Nov 2019 14:46:04 +0000 Subject: [PATCH 2/3] brew vendor-gems: commit updates. --- Library/Homebrew/vendor/bundle/bundler/setup.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index a80198c1de..cfc471262f 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -61,7 +61,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-retry-0.6.2/lib $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.6.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.76.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.77.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.5.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.37.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib" From 766fc4b30165b8b764b63702609808e4d0addc24 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 28 Nov 2019 15:10:50 +0000 Subject: [PATCH 3/3] Fix RuboCop 0.77.0 failures. --- Library/.rubocop.yml | 4 ++-- Library/.rubocop_cask.yml | 2 +- Library/.rubocop_shared.yml | 4 ++-- Library/Homebrew/.rubocop.yml | 6 +++--- Library/Homebrew/cmd/tap.rb | 2 +- Library/Homebrew/dev-cmd/pull.rb | 2 +- Library/Homebrew/extend/os/mac/caveats.rb | 2 +- Library/Homebrew/formula.rb | 6 +++--- Library/Homebrew/tab.rb | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml index a045d4cdcd..0aad776bab 100644 --- a/Library/.rubocop.yml +++ b/Library/.rubocop.yml @@ -13,12 +13,12 @@ NewFormulaAudit: Enabled: false # make our hashes consistent -Layout/AlignHash: +Layout/HashAlignment: EnforcedHashRocketStyle: table EnforcedColonStyle: table # `system` is a special case and aligns on second argument -Layout/AlignArguments: +Layout/ArgumentAlignment: Enabled: false # favour parens-less DSL-style arguments diff --git a/Library/.rubocop_cask.yml b/Library/.rubocop_cask.yml index 996a5ec088..938acb0afe 100644 --- a/Library/.rubocop_cask.yml +++ b/Library/.rubocop_cask.yml @@ -22,7 +22,7 @@ Cask/StanzaOrder: Description: 'Ensure that cask stanzas are sorted correctly. More info at https://github.com/Homebrew/homebrew-cask/blob/master/CONTRIBUTING.md#stanza-order' Enabled: true -Layout/AlignHash: +Layout/HashAlignment: EnforcedHashRocketStyle: table EnforcedColonStyle: table diff --git a/Library/.rubocop_shared.yml b/Library/.rubocop_shared.yml index d3e4f49bde..fbdc59353f 100644 --- a/Library/.rubocop_shared.yml +++ b/Library/.rubocop_shared.yml @@ -7,7 +7,7 @@ AllCops: DisplayCopNames: false # Use `<<~` for heredocs. -Layout/IndentHeredoc: +Layout/HeredocIndentation: EnforcedStyle: squiggly # Not useful in casks and formulae. @@ -21,7 +21,7 @@ Metrics/ParameterLists: # Implicitly allow EOS as we use it everywhere. Naming/HeredocDelimiterNaming: - Blacklist: + ForbiddenDelimiters: - END, EOD, EOF # Allow dashes in filenames. diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml index 72afe7d459..5a09e7ca9e 100644 --- a/Library/Homebrew/.rubocop.yml +++ b/Library/Homebrew/.rubocop.yml @@ -10,7 +10,7 @@ AllCops: - '**/vendor/**/*' # messes up system formatting for formulae but good for Homebrew/brew -Layout/AlignArguments: +Layout/ArgumentAlignment: Enabled: true # make rspec formatting more flexible @@ -72,11 +72,11 @@ Naming/PredicateName: Exclude: - 'compat/**/*' # can't rename these - NameWhitelist: is_32_bit?, is_64_bit? + AllowedMethods: is_32_bit?, is_64_bit? # whitelist those that are standard # TODO: try to remove some of these -Naming/UncommunicativeMethodParamName: +Naming/MethodParameterName: AllowedNames: - '_' - 'a' diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb index 9a938f10a9..09deddb5cf 100644 --- a/Library/Homebrew/cmd/tap.rb +++ b/Library/Homebrew/cmd/tap.rb @@ -59,7 +59,7 @@ module Homebrew quiet: args.quieter? rescue TapRemoteMismatchError => e odie e - rescue TapAlreadyTappedError, TapAlreadyUnshallowError # rubocop:disable Lint/HandleExceptions + rescue TapAlreadyTappedError, TapAlreadyUnshallowError # rubocop:disable Lint/SuppressedException end end end diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb index 02ef7e92f1..2233659189 100644 --- a/Library/Homebrew/dev-cmd/pull.rb +++ b/Library/Homebrew/dev-cmd/pull.rb @@ -80,7 +80,7 @@ module Homebrew if Utils.popen_read("git config --get --bool commit.gpgsign").chomp == "true" begin gnupg = Formula["gnupg"] - rescue FormulaUnavailableError # rubocop:disable Lint/HandleExceptions + rescue FormulaUnavailableError # rubocop:disable Lint/SuppressedException else if gnupg.installed? path = PATH.new(ENV.fetch("PATH")) diff --git a/Library/Homebrew/extend/os/mac/caveats.rb b/Library/Homebrew/extend/os/mac/caveats.rb index 05df496cb0..da0b32b627 100644 --- a/Library/Homebrew/extend/os/mac/caveats.rb +++ b/Library/Homebrew/extend/os/mac/caveats.rb @@ -5,7 +5,7 @@ class Caveats def plist_caveats s = [] - if f.plist || (keg&.plist_installed?) + if f.plist || keg&.plist_installed? plist_domain = f.plist_path.basename(".plist") # we readlink because this path probably doesn't exist since caveats diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index fb61ab1a98..c1e84e282c 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -325,7 +325,7 @@ class Formula active_spec == head end - delegate [ # rubocop:disable Layout/AlignHash + delegate [ # rubocop:disable Layout/HashAlignment :bottle_unneeded?, :bottle_disabled?, :bottle_disable_reason, @@ -1078,7 +1078,7 @@ class Formula # keg's formula is deleted. begin keg = Keg.for(path) - rescue NotAKegError, Errno::ENOENT # rubocop:disable Lint/HandleExceptions + rescue NotAKegError, Errno::ENOENT # rubocop:disable Lint/SuppressedException # file doesn't belong to any keg. else tab_tap = Tab.for_keg(keg).tap @@ -1087,7 +1087,7 @@ class Formula begin Formulary.factory(keg.name) - rescue FormulaUnavailableError # rubocop:disable Lint/HandleExceptions + rescue FormulaUnavailableError # rubocop:disable Lint/SuppressedException # formula for this keg is deleted, so defer to whitelist rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError return false # this keg belongs to another formula diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index 51e4292bb4..3b973938ce 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -339,8 +339,8 @@ class Tab < OpenStruct "time" => time, "source_modified_time" => source_modified_time.to_i, "HEAD" => self.HEAD, - "stdlib" => (stdlib&.to_s), - "compiler" => (compiler&.to_s), + "stdlib" => stdlib&.to_s, + "compiler" => compiler&.to_s, "aliases" => aliases, "runtime_dependencies" => runtime_dependencies, "source" => source,