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

Revert using hash accessors for args

Browse Source
This commit is contained in:
Douglas Eichelberger 2024-03-15 12:51:03 -07:00
parent 7c7444c2a5
commit aad08cd5a4
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/abstract_command.rb
View File

@ -8,6 +8,7 @@ module Homebrew
# - Each Command implements a defined interface. # - Each Command implements a defined interface.
# #
# To subclass, implement a `run` method and provide a `cmd_args` block to document the command and its allowed args. # To subclass, implement a `run` method and provide a `cmd_args` block to document the command and its allowed args.
# To generate method signatures for command args, run `brew typecheck --update`.
class AbstractCommand class AbstractCommand
extend T::Helpers extend T::Helpers

28
Library/Homebrew/cmd/list.rb
View File

@ -71,7 +71,7 @@ module Homebrew
unless args.cask? unless args.cask?
formula_names = args.no_named? ? Formula.installed : args.named.to_resolved_formulae formula_names = args.no_named? ? Formula.installed : args.named.to_resolved_formulae
full_formula_names = formula_names.map(&:full_name).sort(&tap_and_name_comparison) full_formula_names = formula_names.map(&:full_name).sort(&tap_and_name_comparison)
full_formula_names = Formatter.columns(full_formula_names) unless args[:"1?"] full_formula_names = Formatter.columns(full_formula_names) unless args.public_send(:"1?")
puts full_formula_names if full_formula_names.present? puts full_formula_names if full_formula_names.present?
end end
if args.cask? || (!args.formula? && args.no_named?) if args.cask? || (!args.formula? && args.no_named?)
@ -83,22 +83,22 @@ module Homebrew
# The cast is because `Keg`` does not define `full_name` # The cast is because `Keg`` does not define `full_name`
full_cask_names = T.cast(cask_names, T::Array[T.any(Formula, Cask::Cask)]) full_cask_names = T.cast(cask_names, T::Array[T.any(Formula, Cask::Cask)])
.map(&:full_name).sort(&tap_and_name_comparison) .map(&:full_name).sort(&tap_and_name_comparison)
full_cask_names = Formatter.columns(full_cask_names) unless args[:"1?"] full_cask_names = Formatter.columns(full_cask_names) unless args.public_send(:"1?")
puts full_cask_names if full_cask_names.present? puts full_cask_names if full_cask_names.present?
end end
elsif args[:pinned?] elsif args.pinned?
filtered_list filtered_list
elsif args[:versions?] elsif args.versions?
filtered_list unless args.cask? filtered_list unless args.cask?
list_casks if args.cask? || (!args.formula? && !args[:multiple?] && args.no_named?) list_casks if args.cask? || (!args.formula? && !args.multiple? && args.no_named?)
elsif args.no_named? elsif args.no_named?
ENV["CLICOLOR"] = nil ENV["CLICOLOR"] = nil
ls_args = [] ls_args = []
ls_args << "-1" if args[:"1?"] ls_args << "-1" if args.public_send(:"1?")
ls_args << "-l" if args[:l?] ls_args << "-l" if args.l?
ls_args << "-r" if args[:r?] ls_args << "-r" if args.r?
ls_args << "-t" if args[:t?] ls_args << "-t" if args.t?
if !args.cask? && HOMEBREW_CELLAR.exist? && HOMEBREW_CELLAR.children.any? if !args.cask? && HOMEBREW_CELLAR.exist? && HOMEBREW_CELLAR.children.any?
ohai "Formulae" if $stdout.tty? && !args.formula? ohai "Formulae" if $stdout.tty? && !args.formula?
@ -135,19 +135,19 @@ module Homebrew
rack.exist? rack.exist?
end end
end end
if args[:pinned?] if args.pinned?
pinned_versions = {} pinned_versions = {}
names.sort.each do |d| names.sort.each do |d|
keg_pin = (HOMEBREW_PINNED_KEGS/d.basename.to_s) keg_pin = (HOMEBREW_PINNED_KEGS/d.basename.to_s)
pinned_versions[d] = keg_pin.readlink.basename.to_s if keg_pin.exist? || keg_pin.symlink? pinned_versions[d] = keg_pin.readlink.basename.to_s if keg_pin.exist? || keg_pin.symlink?
end end
pinned_versions.each do |d, version| pinned_versions.each do |d, version|
puts d.basename.to_s.concat(args[:versions?] ? " #{version}" : "") puts d.basename.to_s.concat(args.versions? ? " #{version}" : "")
end end
else # --versions without --pinned else # --versions without --pinned
names.sort.each do |d| names.sort.each do |d|
versions = d.subdirs.map { |pn| pn.basename.to_s } versions = d.subdirs.map { |pn| pn.basename.to_s }
next if args[:multiple?] && versions.length < 2 next if args.multiple? && versions.length < 2
puts "#{d.basename} #{versions * " "}" puts "#{d.basename} #{versions * " "}"
end end
@ -169,9 +169,9 @@ module Homebrew
Cask::List.list_casks( Cask::List.list_casks(
*casks, *casks,
one: args[:"1?"], one: args.public_send(:"1?"),
full_name: args.full_name?, full_name: args.full_name?,
versions: args[:versions?], versions: args.versions?,
) )
end end
end end

2
Library/Homebrew/dev-cmd/prof.rb
View File

@ -39,7 +39,7 @@ module Homebrew
Homebrew.setup_gem_environment! Homebrew.setup_gem_environment!
if args[:stackprof?] if args.stackprof?
with_env HOMEBREW_STACKPROF: "1" do with_env HOMEBREW_STACKPROF: "1" do
system(*HOMEBREW_RUBY_EXEC_ARGS, brew_rb, *args.named) system(*HOMEBREW_RUBY_EXEC_ARGS, brew_rb, *args.named)
end end