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

cmd: use more and cleanup new args APIs.

Browse Source
This commit is contained in:
Mike McQuaid 2020-03-04 17:28:15 +00:00
parent ad32d387e9
commit a7fe0ed847
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
41 changed files with 126 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cmd/--cache.rb
View File

@ -26,10 +26,10 @@ module Homebrew
def __cache
__cache_args.parse
if ARGV.named.empty?
if args.no_named?
puts HOMEBREW_CACHE
else
Homebrew.args.formulae.each do |f|
args.formulae.each do |f|
if Fetch.fetch_bottle?(f)
puts f.bottle.cached_download
else

4
Library/Homebrew/cmd/--cellar.rb
View File

@ -22,10 +22,10 @@ module Homebrew
def __cellar
__cellar_args.parse
if Homebrew.args.named.blank?
if args.no_named?
puts HOMEBREW_CELLAR
else
puts Homebrew.args.resolved_formulae.map(&:rack)
puts args.resolved_formulae.map(&:rack)
end
end
end

3
Library/Homebrew/cmd/--env.rb
View File

@ -30,9 +30,8 @@ module Homebrew
__env_args.parse
ENV.activate_extensions!
ENV.deps = Homebrew.args.formulae if superenv?
ENV.deps = args.formulae if superenv?
ENV.setup_build_environment
ENV.universal_binary if ARGV.build_universal?
shell = if args.plain?
nil

4
Library/Homebrew/cmd/--prefix.rb
View File

@ -22,10 +22,10 @@ module Homebrew
def __prefix
__prefix_args.parse
if Homebrew.args.named.blank?
if args.no_named?
puts HOMEBREW_PREFIX
else
puts Homebrew.args.resolved_formulae.map { |f|
puts args.resolved_formulae.map { |f|
f.opt_prefix.exist? ? f.opt_prefix : f.installed_prefix
}
end

4
Library/Homebrew/cmd/--repository.rb
View File

@ -20,10 +20,10 @@ module Homebrew
def __repository
__repository_args.parse
if ARGV.named.empty?
if args.no_named?
puts HOMEBREW_REPOSITORY
else
puts ARGV.named.map { |tap| Tap.fetch(tap).path }
puts args.named.map { |tap| Tap.fetch(tap).path }
end
end
end

4
Library/Homebrew/cmd/analytics.rb
View File

@ -26,7 +26,7 @@ module Homebrew
def analytics
analytics_args.parse
case args.remaining.first
case args.named.first
when nil, "state"
if Utils::Analytics.disabled?
puts "Analytics are disabled."
@ -41,7 +41,7 @@ module Homebrew
when "regenerate-uuid"
Utils::Analytics.regenerate_uuid!
else
raise UsageError, "Unknown subcommand."
raise UsageError, "unknown subcommand"
end
end
end

9
Library/Homebrew/cmd/cat.rb
View File

@ -12,17 +12,12 @@ module Homebrew
Display the source of <formula>.
EOS
max_named 1
named :formula
end
end
def cat
cat_args.parse
# do not "fix" this to support multiple arguments, the output would be
# unparsable; if the user wants to cat multiple formula they can call
# `brew cat` multiple times.
formulae = Homebrew.args.formulae
raise FormulaUnspecifiedError if formulae.empty?
cd HOMEBREW_REPOSITORY
pager = if ENV["HOMEBREW_BAT"].nil?
@ -30,6 +25,6 @@ module Homebrew
else
"#{HOMEBREW_PREFIX}/bin/bat"
end
safe_system pager, formulae.first.path, *Homebrew.args.passthrough
safe_system pager, args.formulae.first.path, *args.passthrough
end
end

2
Library/Homebrew/cmd/cleanup.rb
View File

@ -33,7 +33,7 @@ module Homebrew
def cleanup
cleanup_args.parse
cleanup = Cleanup.new(*args.remaining, dry_run: args.dry_run?, scrub: args.s?, days: args.prune&.to_i)
cleanup = Cleanup.new(*args.named, dry_run: args.dry_run?, scrub: args.s?, days: args.prune&.to_i)
if args.prune_prefix?
cleanup.prune_prefix_symlinks_and_directories
return

5
Library/Homebrew/cmd/command.rb
View File

@ -15,15 +15,14 @@ module Homebrew
EOS
switch :verbose
switch :debug
min_named 1
end
end
def command
command_args.parse
raise UsageError, "This command requires a command argument" if args.remaining.empty?
args.remaining.each do |cmd|
args.named.each do |cmd|
path = Commands.path(cmd)
odie "Unknown command: #{cmd}" unless path
puts path

14
Library/Homebrew/cmd/deps.rb
View File

@ -62,7 +62,7 @@ module Homebrew
Formulary.enable_factory_cache!
recursive = !args.send("1?")
installed = args.installed? || ARGV.formulae.all?(&:opt_or_installed_prefix_keg)
installed = args.installed? || args.formulae.all?(&:opt_or_installed_prefix_keg)
@use_runtime_dependencies = installed && recursive &&
!args.include_build? &&
@ -74,27 +74,27 @@ module Homebrew
if args.installed?
puts_deps_tree Formula.installed.sort, recursive
else
raise FormulaUnspecifiedError if Homebrew.args.remaining.empty?
raise FormulaUnspecifiedError if args.no_named?
puts_deps_tree Homebrew.args.formulae, recursive
puts_deps_tree args.formulae, recursive
end
return
elsif args.all?
puts_deps Formula.sort, recursive
return
elsif !Homebrew.args.remaining.empty? && args.for_each?
puts_deps Homebrew.args.formulae, recursive
elsif !args.no_named? && args.for_each?
puts_deps args.formulae, recursive
return
end
if Homebrew.args.remaining.empty?
if args.no_named?
raise FormulaUnspecifiedError unless args.installed?
puts_deps Formula.installed.sort, recursive
return
end
all_deps = deps_for_formulae(Homebrew.args.formulae, recursive, &(args.union? ? :| : :&))
all_deps = deps_for_formulae(args.formulae, recursive, &(args.union? ? :| : :&))
all_deps = condense_requirements(all_deps)
all_deps.select!(&:installed?) if args.installed?
all_deps.map!(&method(:dep_display_name))

8
Library/Homebrew/cmd/desc.rb
View File

@ -40,16 +40,16 @@ module Homebrew
search_type << :either if args.search
search_type << :name if args.name
search_type << :desc if args.description
odie "You must provide a search term." if search_type.present? && ARGV.named.empty?
odie "You must provide a search term." if search_type.present? && args.no_named?
results = if search_type.empty?
raise FormulaUnspecifiedError if ARGV.named.empty?
raise FormulaUnspecifiedError if args.no_named?
desc = {}
Homebrew.args.formulae.each { |f| desc[f.full_name] = f.desc }
args.formulae.each { |f| desc[f.full_name] = f.desc }
Descriptions.new(desc)
else
arg = ARGV.named.join(" ")
arg = args.named.join(" ")
string_or_regex = query_regexp(arg)
CacheStoreDatabase.use(:descriptions) do |db|
cache_store = DescriptionCacheStore.new(db)

4
Library/Homebrew/cmd/doctor.rb
View File

@ -39,14 +39,14 @@ module Homebrew
exit
end
if ARGV.named.empty?
if args.no_named?
slow_checks = %w[
check_for_broken_symlinks
check_missing_deps
]
methods = (checks.all.sort - slow_checks) + slow_checks
else
methods = ARGV.named
methods = args.named
end
first_warning = true

7
Library/Homebrew/cmd/fetch.rb
View File

@ -39,23 +39,22 @@ module Homebrew
switch :debug
conflicts "--devel", "--HEAD"
conflicts "--build-from-source", "--build-bottle", "--force-bottle"
min_named :formula
end
end
def fetch
fetch_args.parse
raise FormulaUnspecifiedError if ARGV.named.empty?
if args.deps?
bucket = []
Homebrew.args.formulae.each do |f|
args.formulae.each do |f|
bucket << f
bucket.concat f.recursive_dependencies.map(&:to_formula)
end
bucket.uniq!
else
bucket = Homebrew.args.formulae
bucket = args.formulae
end
puts "Fetching: #{bucket * ", "}" if bucket.size > 1

4
Library/Homebrew/cmd/gist-logs.rb
View File

@ -142,10 +142,10 @@ module Homebrew
def gist_logs
gist_logs_args.parse
raise FormulaUnspecifiedError if Homebrew.args.resolved_formulae.length != 1
raise FormulaUnspecifiedError if args.resolved_formulae.length != 1
Install.perform_preinstall_checks(all_fatal: true)
Install.perform_build_from_source_checks(all_fatal: true)
gistify_logs(Homebrew.args.resolved_formulae.first)
gistify_logs(args.resolved_formulae.first)
end
end

4
Library/Homebrew/cmd/home.rb
View File

@ -20,10 +20,10 @@ module Homebrew
def home
home_args.parse
if args.remaining.empty?
if args.no_named?
exec_browser HOMEBREW_WWW
else
exec_browser(*Homebrew.args.formulae.map(&:homepage))
exec_browser(*args.formulae.map(&:homepage))
end
end
end

19
Library/Homebrew/cmd/info.rb
View File

@ -67,7 +67,7 @@ module Homebrew
end
if args.category.present?
if Homebrew.args.named.present? && !VALID_FORMULA_CATEGORIES.include?(args.category)
if args.named.present? && !VALID_FORMULA_CATEGORIES.include?(args.category)
raise UsageError, "--category must be one of #{VALID_FORMULA_CATEGORIES.join(", ")} when querying formulae"
end
@ -77,23 +77,24 @@ module Homebrew
end
if args.json
raise UsageError, "Invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
if !(args.all? || args.installed?) && Homebrew.args.named.blank?
raise UsageError, "This command's option requires a formula argument"
raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
if !(args.all? || args.installed?) && args.no_named?
raise FormulaUnspecifiedError if args.no_named?
end
print_json
elsif args.github?
raise UsageError, "This command's option requires a formula argument" if Homebrew.args.named.blank?
raise FormulaUnspecifiedError if args.no_named?
exec_browser(*Homebrew.args.formulae.map { |f| github_info(f) })
exec_browser(*args.formulae.map { |f| github_info(f) })
else
print_info
end
end
def print_info
if Homebrew.args.named.blank?
if args.no_named?
if args.analytics?
Utils::Analytics.output
elsif HOMEBREW_CELLAR.exist?
@ -101,7 +102,7 @@ module Homebrew
puts "#{count} #{"keg".pluralize(count)}, #{HOMEBREW_CELLAR.dup.abv}"
end
else
Homebrew.args.named.each_with_index do |f, i|
args.named.each_with_index do |f, i|
puts unless i.zero?
begin
formula = if f.include?("/") || File.exist?(f)
@ -135,7 +136,7 @@ module Homebrew
elsif args.installed?
Formula.installed.sort
else
Homebrew.args.formulae
args.formulae
end
json = ff.map(&:to_hash)
puts JSON.generate(json)

9
Library/Homebrew/cmd/install.rb
View File

@ -88,13 +88,14 @@ module Homebrew
conflicts "--devel", "--HEAD"
conflicts "--build-from-source", "--build-bottle", "--force-bottle"
formula_options
min_named :formula
end
end
def install
install_args.parse
Homebrew.args.named.each do |name|
args.named.each do |name|
next if File.exist?(name)
next if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_CASK_REGEX
@ -102,8 +103,6 @@ module Homebrew
tap.install unless tap.installed?
end
raise FormulaUnspecifiedError if args.remaining.empty?
if args.ignore_dependencies?
opoo <<~EOS
#{Tty.bold}--ignore-dependencies is an unsupported Homebrew developer flag!#{Tty.reset}
@ -131,9 +130,9 @@ module Homebrew
# developer tools are available, we need to stop them early on
FormulaInstaller.prevent_build_flags unless DevelopmentTools.installed?
Homebrew.args.formulae.each do |f|
args.formulae.each do |f|
# head-only without --HEAD is an error
if !Homebrew.args.HEAD? && f.stable.nil? && f.devel.nil?
if !args.HEAD? && f.stable.nil? && f.devel.nil?
raise <<~EOS
#{f.full_name} is a head-only formula
Install with `brew install --HEAD #{f.full_name}`

5
Library/Homebrew/cmd/link.rb
View File

@ -25,20 +25,19 @@ module Homebrew
description: "Allow keg-only formulae to be linked."
switch :verbose
switch :debug
min_named :keg
end
end
def link
link_args.parse
raise KegUnspecifiedError if ARGV.named.empty?
mode = OpenStruct.new
mode.overwrite = true if args.overwrite?
mode.dry_run = true if args.dry_run?
Homebrew.args.kegs.each do |keg|
args.kegs.each do |keg|
keg_only = Formulary.keg_only?(keg.rack)
if keg.linked?

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

@ -55,14 +55,14 @@ module Homebrew
# Unbrewed uses the PREFIX, which will exist
# Things below use the CELLAR, which doesn't until the first formula is installed.
unless HOMEBREW_CELLAR.exist?
raise NoSuchKegError, Hombrew.args.named.first if Homebrew.args.named.present?
raise NoSuchKegError, Hombrew.args.named.first if args.named.present?
return
end
if args.pinned? || args.versions?
filtered_list
elsif Homebrew.args.named.blank?
elsif args.no_named?
if args.full_name?
full_names = Formula.installed.map(&:full_name).sort(&tap_and_name_comparison)
return if full_names.empty?
@ -70,12 +70,12 @@ module Homebrew
puts Formatter.columns(full_names)
else
ENV["CLICOLOR"] = nil
safe_system "ls", *Homebrew.args.passthrough << HOMEBREW_CELLAR
safe_system "ls", *args.passthrough << HOMEBREW_CELLAR
end
elsif args.verbose? || !$stdout.tty?
system_command! "find", args: Homebrew.args.kegs.map(&:to_s) + %w[-not -type d -print], print_stdout: true
system_command! "find", args: args.kegs.map(&:to_s) + %w[-not -type d -print], print_stdout: true
else
Homebrew.args.kegs.each { |keg| PrettyListing.new keg }
args.kegs.each { |keg| PrettyListing.new keg }
end
end
@ -123,10 +123,10 @@ module Homebrew
end
def filtered_list
names = if Homebrew.args.named.blank?
names = if args.no_named?
Formula.racks
else
racks = Homebrew.args.named.map { |n| Formulary.to_rack(n) }
racks = args.named.map { |n| Formulary.to_rack(n) }
racks.select do |rack|
Homebrew.failed = true unless rack.exist?
rack.exist?

10
Library/Homebrew/cmd/log.rb
View File

@ -33,10 +33,10 @@ module Homebrew
# user path, too.
ENV["PATH"] = ENV["HOMEBREW_PATH"]
if ARGV.named.empty?
if args.no_named?
git_log HOMEBREW_REPOSITORY
else
path = Formulary.path(ARGV.named.first)
path = Formulary.path(args.named.first)
tap = Tap.from_path(path)
git_log path.dirname, path, tap
end
@ -62,8 +62,8 @@ module Homebrew
git -C "#{git_cd}" fetch --unshallow
EOS
end
args = Homebrew.args.options_only
args += ["--follow", "--", path] unless path.nil?
system "git", "log", *args
system_args = args.options_only
system_args += ["--follow", "--", path] if path.present?
system "git", "log", *system_args
end
end

5
Library/Homebrew/cmd/migrate.rb
View File

@ -19,15 +19,14 @@ module Homebrew
"the same taps and migrate them anyway."
switch :verbose
switch :debug
min_named :formula
end
end
def migrate
migrate_args.parse
raise FormulaUnspecifiedError if Homebrew.args.named.blank?
Homebrew.args.resolved_formulae.each do |f|
args.resolved_formulae.each do |f|
if f.oldname
unless (rack = HOMEBREW_CELLAR/f.oldname).exist? && !rack.subdirs.empty?
raise NoSuchKegError, f.oldname

4
Library/Homebrew/cmd/missing.rb
View File

@ -30,10 +30,10 @@ module Homebrew
return unless HOMEBREW_CELLAR.exist?
ff = if Homebrew.args.named.blank?
ff = if args.no_named?
Formula.installed.sort
else
Homebrew.args.resolved_formulae.sort
args.resolved_formulae.sort
end
ff.each do |f|

6
Library/Homebrew/cmd/options.rb
View File

@ -32,10 +32,10 @@ module Homebrew
puts_options Formula.to_a.sort
elsif args.installed?
puts_options Formula.installed.sort
elsif args.no_named?
raise FormulaUnspecifiedError
else
raise FormulaUnspecifiedError if args.remaining.empty?
puts_options Homebrew.args.formulae
puts_options args.formulae
end
end

8
Library/Homebrew/cmd/outdated.rb
View File

@ -35,19 +35,19 @@ module Homebrew
def outdated
outdated_args.parse
formulae = if Homebrew.args.resolved_formulae.blank?
formulae = if args.resolved_formulae.blank?
Formula.installed
else
Homebrew.args.resolved_formulae
args.resolved_formulae
end
if args.json
raise UsageError, "Invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
outdated = print_outdated_json(formulae)
else
outdated = print_outdated(formulae)
end
Homebrew.failed = Homebrew.args.resolved_formulae.present? && !outdated.empty?
Homebrew.failed = args.resolved_formulae.present? && !outdated.empty?
end
def print_outdated(formulae)

5
Library/Homebrew/cmd/pin.rb
View File

@ -15,15 +15,14 @@ module Homebrew
issuing the `brew upgrade` <formula> command. See also `unpin`.
EOS
switch :debug
min_named :formula
end
end
def pin
pin_args.parse
raise FormulaUnspecifiedError if args.remaining.empty?
Homebrew.args.resolved_formulae.each do |f|
args.resolved_formulae.each do |f|
if f.pinned?
opoo "#{f.name} already pinned"
elsif !f.pinnable?

5
Library/Homebrew/cmd/postinstall.rb
View File

@ -17,15 +17,14 @@ module Homebrew
switch :force
switch :verbose
switch :debug
min_named :keg
end
end
def postinstall
postinstall_args.parse
raise KegUnspecifiedError if args.remaining.empty?
Homebrew.args.resolved_formulae.each do |f|
args.resolved_formulae.each do |f|
ohai "Postinstalling #{f}"
fi = FormulaInstaller.new(f)
fi.post_install

4
Library/Homebrew/cmd/readall.rb
View File

@ -36,10 +36,10 @@ module Homebrew
end
options = { aliases: args.aliases? }
taps = if ARGV.named.empty?
taps = if args.no_named?
Tap
else
ARGV.named.map { |t| Tap.fetch(t) }
args.named.map { |t| Tap.fetch(t) }
end
taps.each do |tap|
Homebrew.failed = true unless Readall.valid_tap?(tap, options)

5
Library/Homebrew/cmd/reinstall.rb
View File

@ -45,19 +45,18 @@ module Homebrew
description: "Print install times for each formula at the end of the run."
conflicts "--build-from-source", "--force-bottle"
formula_options
min_named :formula
end
end
def reinstall
reinstall_args.parse
raise FormulaUnspecifiedError if args.remaining.empty?
FormulaInstaller.prevent_build_flags unless DevelopmentTools.installed?
Install.perform_preinstall_checks
Homebrew.args.resolved_formulae.each do |f|
args.resolved_formulae.each do |f|
if f.pinned?
onoe "#{f.full_name} is pinned. You must unpin it to reinstall."
next

12
Library/Homebrew/cmd/search.rb
View File

@ -62,13 +62,13 @@ module Homebrew
if package_manager = PACKAGE_MANAGERS.find { |name,| args[:"#{name}?"] }
_, url = package_manager
exec_browser url.call(URI.encode_www_form_component(args.remaining.join(" ")))
exec_browser url.call(URI.encode_www_form_component(args.named.join(" ")))
return
end
if args.remaining.empty?
if args.no_named?
if args.casks?
raise UsageError, "specifying both --formulae and --casks requires an argument!" if args.formulae?
raise UsageError, "specifying both --formulae and --casks requires <text>" if args.formulae?
puts Formatter.columns(Cask::Cask.to_a.map(&:full_name).sort)
else
@ -78,7 +78,7 @@ module Homebrew
return
end
query = args.remaining.join(" ")
query = args.named.join(" ")
string_or_regex = query_regexp(query)
if args.desc?
@ -125,11 +125,11 @@ module Homebrew
end
return unless $stdout.tty?
return if args.remaining.empty?
return if args.no_named?
metacharacters = %w[\\ | ( ) [ ] { } ^ $ * + ?].freeze
return unless metacharacters.any? do |char|
args.remaining.any? do |arg|
args.named.any? do |arg|
arg.include?(char) && !arg.start_with?("/")
end
end

12
Library/Homebrew/cmd/style.rb
View File

@ -38,14 +38,14 @@ module Homebrew
def style
style_args.parse
target = if Homebrew.args.named.blank?
target = if args.no_named?
nil
elsif Homebrew.args.named.any? { |file| File.exist? file }
Homebrew.args.named
elsif Homebrew.args.named.any? { |tap| tap.count("/") == 1 }
Homebrew.args.named.map { |tap| Tap.fetch(tap).path }
elsif args.named.any? { |file| File.exist? file }
args.named
elsif args.named.any? { |tap| tap.count("/") == 1 }
args.named.map { |tap| Tap.fetch(tap).path }
else
Homebrew.args.formulae.map(&:path)
args.formulae.map(&:path)
end
only_cops = args.only_cops

9
Library/Homebrew/cmd/switch.rb
View File

@ -16,16 +16,14 @@ module Homebrew
EOS
switch :verbose
switch :debug
max_named 2
named 2
end
end
def switch
switch_args.parse
raise FormulaUnspecifiedError if args.remaining.empty?
name = args.remaining.first
name = args.named.first
rack = Formulary.to_rack(name)
odie "#{name} not found in the Cellar." unless rack.directory?
@ -34,8 +32,7 @@ module Homebrew
.map { |d| Keg.new(d).version }
.sort
.join(", ")
version = args.remaining.second
raise UsageError, "Specify one of #{name}'s installed versions: #{versions}" unless version
version = args.named.second
odie <<~EOS unless (rack/version).directory?
#{name} does not have a version \"#{version}\" in the Cellar.

4
Library/Homebrew/cmd/tap-info.rb
View File

@ -30,13 +30,13 @@ module Homebrew
if args.installed?
taps = Tap
else
taps = Homebrew.args.named.sort.map do |name|
taps = args.named.sort.map do |name|
Tap.fetch(name)
end
end
if args.json
raise UsageError, "Invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
print_tap_json(taps.sort_by(&:to_s))
else

8
Library/Homebrew/cmd/tap.rb
View File

@ -48,14 +48,14 @@ module Homebrew
Tap.each(&:link_completions_and_manpages)
elsif args.list_pinned?
puts Tap.select(&:pinned?).map(&:name)
elsif ARGV.named.empty?
elsif args.no_named?
puts Tap.names
else
tap = Tap.fetch(ARGV.named.first)
tap = Tap.fetch(args.named.first)
begin
tap.install clone_target: ARGV.named.second,
tap.install clone_target: args.named.second,
force_auto_update: force_auto_update?,
quiet: Homebrew.args.quiet?
quiet: args.quiet?
rescue TapRemoteMismatchError => e
odie e
rescue TapAlreadyTappedError

9
Library/Homebrew/cmd/uninstall.rb
View File

@ -22,23 +22,22 @@ module Homebrew
description: "Don't fail uninstall, even if <formula> is a dependency of any installed "\
"formulae."
switch :debug
min_named :formula
end
end
def uninstall
uninstall_args.parse
raise KegUnspecifiedError if args.remaining.empty?
kegs_by_rack = if args.force?
Hash[ARGV.named.map do |name|
Hash[args.named.map do |name|
rack = Formulary.to_rack(name)
next unless rack.directory?
[rack, rack.subdirs.map { |d| Keg.new(d) }]
end]
else
Homebrew.args.kegs.group_by(&:rack)
args.kegs.group_by(&:rack)
end
handle_unsatisfied_dependents(kegs_by_rack)
@ -131,7 +130,7 @@ module Homebrew
protected
def sample_command
"brew uninstall --ignore-dependencies #{ARGV.named.join(" ")}"
"brew uninstall --ignore-dependencies #{Homebrew.args.named.join(" ")}"
end
def are_required_by_deps

5
Library/Homebrew/cmd/unlink.rb
View File

@ -20,18 +20,17 @@ module Homebrew
"deleting any files."
switch :verbose
switch :debug
min_named :keg
end
end
def unlink
unlink_args.parse
raise KegUnspecifiedError if args.remaining.empty?
mode = OpenStruct.new
mode.dry_run = true if args.dry_run?
Homebrew.args.kegs.each do |keg|
args.kegs.each do |keg|
if mode.dry_run
puts "Would remove:"
keg.unlink(mode)

2
Library/Homebrew/cmd/unpack.rb
View File

@ -32,7 +32,7 @@ module Homebrew
def unpack
unpack_args.parse
formulae = Homebrew.args.formulae
formulae = args.formulae
raise FormulaUnspecifiedError if formulae.empty?
if dir = args.destdir

4
Library/Homebrew/cmd/unpin.rb
View File

@ -22,9 +22,9 @@ module Homebrew
def unpin
unpin_args.parse
raise FormulaUnspecifiedError if args.remaining.empty?
raise FormulaUnspecifiedError if args.no_named?
Homebrew.args.resolved_formulae.each do |f|
args.resolved_formulae.each do |f|
if f.pinned?
f.unpin
elsif !f.pinnable?

5
Library/Homebrew/cmd/untap.rb
View File

@ -13,15 +13,14 @@ module Homebrew
Remove a tapped formula repository.
EOS
switch :debug
min_named 1
end
end
def untap
untap_args.parse
raise UsageError, "This command requires a tap argument from `brew tap`'s list" if args.remaining.empty?
ARGV.named.each do |tapname|
args.named.each do |tapname|
tap = Tap.fetch(tapname)
odie "Untapping #{tap} is not allowed" if tap.core_tap?

6
Library/Homebrew/cmd/update-report.rb
View File

@ -13,7 +13,7 @@ module Homebrew
def update_preinstall_header
@update_preinstall_header ||= begin
ohai "Auto-updated Homebrew!" if ARGV.include?("--preinstall")
ohai "Auto-updated Homebrew!" if args.preinstall?
true
end
end
@ -109,7 +109,7 @@ module Homebrew
end
if !updated
puts "Already up-to-date." if !ARGV.include?("--preinstall") && !ENV["HOMEBREW_UPDATE_FAILED"]
puts "Already up-to-date." if !args.preinstall? && !ENV["HOMEBREW_UPDATE_FAILED"]
else
if hub.empty?
puts "No changes to formulae."
@ -122,7 +122,7 @@ module Homebrew
.update_from_report!(hub)
end
end
puts if ARGV.include?("--preinstall")
puts if args.preinstall?
end
link_completions_manpages_and_docs

10
Library/Homebrew/cmd/upgrade.rb
View File

@ -65,18 +65,18 @@ module Homebrew
Install.perform_preinstall_checks
if Homebrew.args.named.blank?
if args.no_named?
outdated = Formula.installed.select do |f|
f.outdated?(fetch_head: args.fetch_HEAD?)
end
exit 0 if outdated.empty?
else
outdated = Homebrew.args.resolved_formulae.select do |f|
outdated = args.resolved_formulae.select do |f|
f.outdated?(fetch_head: args.fetch_HEAD?)
end
(Homebrew.args.resolved_formulae - outdated).each do |f|
(args.resolved_formulae - outdated).each do |f|
versions = f.installed_kegs.map(&:version)
if versions.empty?
ofail "#{f.full_specified_name} not installed"
@ -168,7 +168,7 @@ module Homebrew
tab = Tab.for_keg(keg)
end
build_options = BuildOptions.new(Options.create(Homebrew.args.flags_only), f.options)
build_options = BuildOptions.new(Options.create(args.flags_only), f.options)
options = build_options.used_options
options |= f.build.used_options
options &= f.options
@ -176,7 +176,7 @@ module Homebrew
fi = FormulaInstaller.new(f)
fi.options = options
fi.build_bottle = args.build_bottle?
fi.installed_on_request = Homebrew.args.named.present?
fi.installed_on_request = args.named.present?
fi.link_keg ||= keg_was_linked if keg_had_linked_opt
if tab
fi.build_bottle ||= tab.built_bottle?

7
Library/Homebrew/cmd/uses.rb
View File

@ -38,24 +38,23 @@ module Homebrew
description: "Show usage of <formula> by HEAD builds."
switch :debug
conflicts "--devel", "--HEAD"
min_named :formula
end
end
def uses
uses_args.parse
raise FormulaUnspecifiedError if args.remaining.empty?
Formulary.enable_factory_cache!
used_formulae_missing = false
used_formulae = begin
Homebrew.args.formulae
args.formulae
rescue FormulaUnavailableError => e
opoo e
used_formulae_missing = true
# If the formula doesn't exist: fake the needed formula object name.
Homebrew.args.named.map { |name| OpenStruct.new name: name, full_name: name }
args.named.map { |name| OpenStruct.new name: name, full_name: name }
end
use_runtime_dependents = args.installed? &&