From ca0ab6eceb61993f32c1598a000ec7edc426e96f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 18:05:25 +0000 Subject: [PATCH 1/3] build(deps): bump rubocop from 1.33.0 to 1.34.1 in /Library/Homebrew Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.33.0 to 1.34.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.33.0...v1.34.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Library/Homebrew/Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index 9fc0ad2ea6..61febf66ff 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -74,7 +74,7 @@ GEM parser rainbow (~> 3.0) sorbet-runtime (>= 0.5) - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) patchelf (1.3.0) elftools (>= 1.1.3) @@ -124,14 +124,14 @@ GEM rspec (>= 3, < 4) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.33.0) + rubocop (1.34.1) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.19.1, < 2.0) + rubocop-ast (>= 1.20.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.21.0) From d39ba743f98603adc9e922e671d607ed06b74798 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 9 Aug 2022 18:08:02 +0000 Subject: [PATCH 2/3] brew vendor-gems: commit updates. --- Library/Homebrew/vendor/bundle/bundler/setup.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index f902e1aa4d..69885e22a4 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -58,7 +58,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/method_source-1.0.0/l $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mustache-1.1.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.22.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-3.11.1/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-3.1.2.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-3.1.2.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.1.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-runtime-0.5.10175/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parlour-8.0.0/lib" @@ -86,7 +86,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec_junit_formatter $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-ast-1.21.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.2.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-1.33.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-1.34.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.14.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rails-2.15.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-2.12.1/lib" From 6b697470fd7f844e3be709cd2b3da5d0c1294147 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 10 Aug 2022 14:19:33 +0100 Subject: [PATCH 3/3] brew style --fix For https://github.com/Homebrew/brew/pull/13671 --- Library/Homebrew/dev-cmd/bump-cask-pr.rb | 4 ++-- Library/Homebrew/rubocops/lines.rb | 6 +++--- Library/Homebrew/service.rb | 6 +++--- Library/Homebrew/software_spec.rb | 2 +- Library/Homebrew/style.rb | 4 ++-- Library/Homebrew/tap.rb | 2 +- .../fixtures/cask/Casks/with-depends-on-macos-failure.rb | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb index d6b1586e0b..cc33184b1a 100644 --- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb @@ -156,11 +156,11 @@ module Homebrew end if new_hash.present? && cask.language.blank? # avoid repeated replacement for multilanguage cask - hash_regex = old_hash == :no_check ? ":no_check" : "[\"']#{Regexp.escape(old_hash.to_s)}[\"']" + hash_regex = (old_hash == :no_check) ? ":no_check" : "[\"']#{Regexp.escape(old_hash.to_s)}[\"']" replacement_pairs << [ /sha256\s+#{hash_regex}/m, - "sha256 #{new_hash == :no_check ? ":no_check" : "\"#{new_hash}\""}", + "sha256 #{(new_hash == :no_check) ? ":no_check" : "\"#{new_hash}\""}", ] end diff --git a/Library/Homebrew/rubocops/lines.rb b/Library/Homebrew/rubocops/lines.rb index e8c7a631a3..d8fd97bead 100644 --- a/Library/Homebrew/rubocops/lines.rb +++ b/Library/Homebrew/rubocops/lines.rb @@ -401,7 +401,7 @@ module RuboCop info[:if_module], info[:if_method] = if ON_ARCH_OPTIONS.include?(on_system_option) ["Hardware::CPU", :"#{on_system_option}?"] elsif ON_BASE_OS_OPTIONS.include?(on_system_option) - ["OS", on_system_option == :macos ? :mac? : :linux?] + ["OS", (on_system_option == :macos) ? :mac? : :linux?] else ["MacOS", :version] end @@ -493,7 +493,7 @@ module RuboCop else_info = if else_node.present? { can_autocorrect: true, - on_system_method: on_system_option == :intel ? "on_arm" : "on_intel", + on_system_method: (on_system_option == :intel) ? "on_arm" : "on_intel", node: else_node, } end @@ -505,7 +505,7 @@ module RuboCop else_info = if else_node.present? { can_autocorrect: true, - on_system_method: on_system_option == :macos ? "on_linux" : "on_macos", + on_system_method: (on_system_option == :macos) ? "on_linux" : "on_macos", node: else_node, } end diff --git a/Library/Homebrew/service.rb b/Library/Homebrew/service.rb index f40cff066f..3ef98c0792 100644 --- a/Library/Homebrew/service.rb +++ b/Library/Homebrew/service.rb @@ -405,7 +405,7 @@ module Homebrew cmd = command.join(" ") options = [] - options << "Type=#{@launch_only_once == true ? "oneshot" : "simple"}" + options << "Type=#{(@launch_only_once == true) ? "oneshot" : "simple"}" options << "ExecStart=#{cmd}" options << "Restart=always" if @keep_alive.present? && @keep_alive[:always].present? @@ -441,8 +441,8 @@ module Homebrew options << "OnUnitActiveSec=#{@interval}" if @run_type == RUN_TYPE_INTERVAL if @run_type == RUN_TYPE_CRON - minutes = @cron[:Minute] == "*" ? "*" : format("%02d", @cron[:Minute]) - hours = @cron[:Hour] == "*" ? "*" : format("%02d", @cron[:Hour]) + minutes = (@cron[:Minute] == "*") ? "*" : format("%02d", @cron[:Minute]) + hours = (@cron[:Hour] == "*") ? "*" : format("%02d", @cron[:Hour]) options << "OnCalendar=#{@cron[:Weekday]}-*-#{@cron[:Month]}-#{@cron[:Day]} #{hours}:#{minutes}:00" end diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 0a246d3469..6b4c15981e 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -582,7 +582,7 @@ class BottleSpecification tags = collector.tags.sort_by do |tag| version = tag.to_macos_version # Give arm64 bottles a higher priority so they are first - priority = tag.arch == :arm64 ? "2" : "1" + priority = (tag.arch == :arm64) ? "2" : "1" "#{priority}.#{version}_#{tag}" rescue MacOSVersionError # Sort non-MacOS tags below MacOS tags. diff --git a/Library/Homebrew/style.rb b/Library/Homebrew/style.rb index 8b253c0f5f..ce38f1a1af 100644 --- a/Library/Homebrew/style.rb +++ b/Library/Homebrew/style.rb @@ -49,7 +49,7 @@ module Homebrew .partition { |f| f.realpath == HOMEBREW_BREW_FILE.realpath || f.extname == ".sh" } rubocop_result = if shell_files.any? && ruby_files.none? - output_type == :json ? [] : true + (output_type == :json) ? [] : true else run_rubocop(ruby_files, output_type, fix: fix, @@ -60,7 +60,7 @@ module Homebrew end shellcheck_result = if ruby_files.any? && shell_files.none? - output_type == :json ? [] : true + (output_type == :json) ? [] : true else run_shellcheck(shell_files, output_type, fix: fix) end diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb index 7a2fba9256..c41753c6e7 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -252,7 +252,7 @@ class Tap if official? && DEPRECATED_OFFICIAL_TAPS.include?(repo) odie "#{name} was deprecated. This tap is now empty and all its contents were either deleted or migrated." elsif user == "caskroom" || name == "phinze/cask" - new_repo = repo == "cask" ? "cask" : "cask-#{repo}" + new_repo = (repo == "cask") ? "cask" : "cask-#{repo}" odie "#{name} was moved. Tap homebrew/#{new_repo} instead." end diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb index 652ac08b8e..9dbddb789e 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb @@ -6,7 +6,7 @@ cask "with-depends-on-macos-failure" do homepage "https://brew.sh/with-depends-on-macos-failure" # guarantee a mismatched release - depends_on macos: MacOS.version == :catalina ? :mojave : :catalina + depends_on macos: (MacOS.version == :catalina) ? :mojave : :catalina app "Caffeine.app" end