admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #13671 from Homebrew/dependabot/bundler/Library/Homebrew/rubocop-1.34.1

Browse Source 
build(deps): bump rubocop from 1.33.0 to 1.34.1 in /Library/Homebrew
This commit is contained in:
Mike McQuaid 2022-08-11 14:03:59 +01:00 committed by GitHub
commit 40c4e5f228
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/Gemfile.lock
View File

@ -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)

4
Library/Homebrew/dev-cmd/bump-cask-pr.rb
View File

@ -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

6
Library/Homebrew/rubocops/lines.rb
View File

@ -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

6
Library/Homebrew/service.rb
View File

@ -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

2
Library/Homebrew/software_spec.rb
View File

@ -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.

4
Library/Homebrew/style.rb
View File

@ -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

2
Library/Homebrew/tap.rb
View File

@ -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

2
Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb
View File

@ -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

2
Library/Homebrew/vendor/bundle/bundler/setup.rb vendored
View File

@ -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"