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

Merge pull request #18682 from Homebrew/dependabot/bundler/Library/Homebrew/rubocop-1.68.0

Browse Source 
build(deps-dev): bump rubocop from 1.67.0 to 1.68.0 in /Library/Homebrew
This commit is contained in:
Mike McQuaid 2024-11-05 16:54:16 +00:00 committed by GitHub
commit 591057ebd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 916 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/.rubocop.yml
View File

@ -420,6 +420,11 @@ Style/OptionalBooleanParameter:
- respond_to?
- respond_to_missing?
# Broken in RuboCop 1.68.0 so tries to fix line continuations in inline patch blocks:
# https://github.com/Homebrew/brew/actions/runs/11653110391/job/32460881827?pr=18682
Style/RedundantLineContinuation:
Enabled: false
# Rescuing `StandardError` is an understood default.
Style/RescueStandardError:
EnforcedStyle: implicit

2
Library/Homebrew/Gemfile.lock
View File

@ -72,7 +72,7 @@ GEM
rspec-support (3.13.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.67.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)

4
Library/Homebrew/cask/cask.rb
View File

@ -173,8 +173,8 @@ module Cask
sig { returns(T.nilable(Time)) }
def install_time
# <caskroom_path>/.metadata/<version>/<timestamp>/Casks/<token>.{rb,json} -> <timestamp>
time = installed_caskfile&.dirname&.dirname&.basename&.to_s
Time.strptime(time, Metadata::TIMESTAMP_FORMAT) if time
caskfile = installed_caskfile
Time.strptime(caskfile.dirname.dirname.basename.to_s, Metadata::TIMESTAMP_FORMAT) if caskfile
end
sig { returns(T.nilable(Pathname)) }

6
Library/Homebrew/cask/quarantine.rb
View File

@ -216,11 +216,11 @@ module Cask
# including both file ownership and whether system permissions are granted.
# Here we just want to check whether sudo would be needed.
looks_writable_without_sudo = if app.owned?
(app.lstat.mode & 0200) != 0
app.lstat.mode.anybits?(0200)
elsif app.grpowned?
(app.lstat.mode & 0020) != 0
app.lstat.mode.anybits?(0020)
else
(app.lstat.mode & 0002) != 0
app.lstat.mode.anybits?(0002)
end
if looks_writable_without_sudo

5
Library/Homebrew/cleanup.rb
View File

@ -152,10 +152,11 @@ module Homebrew
resource_name = basename_str[/\A.*?--(.*?)--?(?:#{Regexp.escape(version.to_s)})/, 1]
stable = formula.stable
if resource_name == "patch"
patch_hashes = formula.stable&.patches&.select(&:external?)&.map(&:resource)&.map(&:version)
patch_hashes = stable&.patches&.filter_map { _1.resource.version if _1.external? }
return true unless patch_hashes&.include?(Checksum.new(version.to_s))
elsif resource_name && (resource_version = formula.stable&.resources&.dig(resource_name)&.version)
elsif resource_name && stable && (resource_version = stable.resources[resource_name]&.version)
return true if resource_version != version
elsif (formula.latest_version_installed? && formula.pkg_version.to_s != version) ||
formula.pkg_version.to_s > version

6
Library/Homebrew/formula.rb
View File

@ -593,7 +593,11 @@ class Formula
# @api internal
sig { returns(T::Array[String]) }
def aliases
@aliases ||= tap&.alias_reverse_table&.dig(full_name)&.map { _1.split("/").last } || []
@aliases ||= if (tap = self.tap)
tap.alias_reverse_table.fetch(full_name, []).map { _1.split("/").last }
else
[]
end
end
# The {Resource}s for the currently active {SoftwareSpec}.

10
Library/Homebrew/formulary.rb
View File

@ -418,10 +418,12 @@ module Formulary
@caveats_string = json_formula["caveats"]
def caveats
self.class.instance_variable_get(:@caveats_string)
&.gsub(HOMEBREW_PREFIX_PLACEHOLDER, HOMEBREW_PREFIX)
&.gsub(HOMEBREW_CELLAR_PLACEHOLDER, HOMEBREW_CELLAR)
&.gsub(HOMEBREW_HOME_PLACEHOLDER, Dir.home)
caveats_string = self.class.instance_variable_get(:@caveats_string)
return unless caveats_string
caveats_string.gsub(HOMEBREW_PREFIX_PLACEHOLDER, HOMEBREW_PREFIX)
.gsub(HOMEBREW_CELLAR_PLACEHOLDER, HOMEBREW_CELLAR)
.gsub(HOMEBREW_HOME_PLACEHOLDER, Dir.home)
end
@tap_git_head_string = if Homebrew::API.internal_json_v3?

11
Library/Homebrew/livecheck/livecheck.rb
View File

@ -195,8 +195,13 @@ module Homebrew
extract_plist = true if formulae_and_casks_total == 1
formulae_checked = formulae_and_casks_to_check.map.with_index do |formula_or_cask, i|
formula = formula_or_cask if formula_or_cask.is_a?(Formula)
cask = formula_or_cask if formula_or_cask.is_a?(Cask::Cask)
case formula_or_cask
when Formula
formula = formula_or_cask
formula.head&.downloader&.quiet!
when Cask::Cask
cask = formula_or_cask
end
use_full_name = full_name || ambiguous_names.include?(formula_or_cask)
name = package_or_resource_name(formula_or_cask, full_name: use_full_name)
@ -238,8 +243,6 @@ module Homebrew
next
end
formula&.head&.downloader&.quiet!
# Use the `stable` version for comparison except for installed
# head-only formulae. A formula with `stable` and `head` that's
# installed using `--head` will still use the `stable` version for

1304
Library/Homebrew/sorbet/rbi/gems/rubocop@1.67.0.rbi → Library/Homebrew/sorbet/rbi/gems/rubocop@1.68.0.rbi generated
View File

File diff suppressed because it is too large Load Diff

4
Library/Homebrew/tap.rb
View File

@ -524,7 +524,7 @@ class Tap
Commands.rebuild_commands_completion_list
link_completions_and_manpages
formatted_contents = contents.presence&.to_sentence&.dup&.prepend(" ")
formatted_contents = contents.presence&.to_sentence&.prepend(" ")
$stderr.puts "Tapped#{formatted_contents} (#{path.abv})." unless quiet
require "description_cache_store"
@ -622,7 +622,7 @@ class Tap
$stderr.puts "Untapping #{name}..."
abv = path.abv
formatted_contents = contents.presence&.to_sentence&.dup&.prepend(" ")
formatted_contents = contents.presence&.to_sentence&.prepend(" ")
require "description_cache_store"
CacheStoreDatabase.use(:descriptions) do |db|

2
Library/Homebrew/utils/pypi.rb
View File

@ -272,7 +272,7 @@ module PyPI
else
stable = T.must(formula.stable)
url = if stable.specs[:tag].present?
url = "git+#{stable.url}@#{stable.specs[:tag]}"
"git+#{stable.url}@#{stable.specs[:tag]}"
else
stable.url
end

4
Library/Homebrew/utils/spdx.rb
View File

@ -154,7 +154,9 @@ module SPDX
if with_parts.length > 1
{ with_parts.first => { with: with_parts.second } }
else
license_sym = result[/^#{LICENSEREF_PREFIX}(.+)/o, 1]&.downcase&.tr("-", "_")&.to_sym
return result unless result.start_with?(LICENSEREF_PREFIX)
license_sym = result.delete_prefix(LICENSEREF_PREFIX).downcase.tr("-", "_").to_sym
ALLOWED_LICENSE_SYMBOLS.include?(license_sym) ? license_sym : result
end
end

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

@ -88,7 +88,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-ast-1.33.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ruby-progressbar-1.13.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unicode-display_width-2.6.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-1.67.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-1.68.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-md-1.2.4/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-performance-1.22.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-rspec-3.2.0/lib")