From 7be216fcbec3021df87fb37b17bbbd91202af6f5 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:46:47 +0900 Subject: [PATCH] change function name --- Library/Homebrew/cli/args.rb | 2 +- Library/Homebrew/cmd/fetch.rb | 2 +- Library/Homebrew/cmd/home.rb | 2 +- Library/Homebrew/cmd/info.rb | 14 +++++++------- Library/Homebrew/cmd/install.rb | 2 +- Library/Homebrew/cmd/uninstall.rb | 2 +- Library/Homebrew/cmd/upgrade.rb | 2 +- Library/Homebrew/dev-cmd/audit.rb | 2 +- Library/Homebrew/dev-cmd/cat.rb | 2 +- Library/Homebrew/dev-cmd/edit.rb | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb index 153faca11d..15df02dbc6 100644 --- a/Library/Homebrew/cli/args.rb +++ b/Library/Homebrew/cli/args.rb @@ -133,7 +133,7 @@ module Homebrew Context::ContextStruct.new(debug: debug?, quiet: quiet?, verbose: verbose?) end - def only_path_formula_or_cask + def only_formula_or_cask return :formula if formula? && !cask? return :cask if cask? && !formula? end diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index 894ecf92b6..428cf32734 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -81,7 +81,7 @@ module Homebrew end end else - args.named.to_formulae_and_casks(only: args.only_path_formula_or_cask) + args.named.to_formulae_and_casks(only: args.only_formula_or_cask) end.uniq puts "Fetching: #{bucket * ", "}" if bucket.size > 1 diff --git a/Library/Homebrew/cmd/home.rb b/Library/Homebrew/cmd/home.rb index b07c40929c..d4d86c4f74 100644 --- a/Library/Homebrew/cmd/home.rb +++ b/Library/Homebrew/cmd/home.rb @@ -35,7 +35,7 @@ module Homebrew return end - homepages = args.named.to_formulae_and_casks(only: args.only_path_formula_or_cask).map do |formula_or_cask| + homepages = args.named.to_formulae_and_casks(only: args.only_formula_or_cask).map do |formula_or_cask| puts "Opening homepage for #{name_of(formula_or_cask)}" formula_or_cask.homepage end diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index 44d215844c..85a335defe 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -90,17 +90,17 @@ module Homebrew end end - print_analytics(args: args, only: args.only_path_formula_or_cask) + print_analytics(args: args, only: args.only_formula_or_cask) elsif args.json - print_json(args: args, only: args.only_path_formula_or_cask) + print_json(args: args, only: args.only_formula_or_cask) elsif args.github? raise FormulaOrCaskUnspecifiedError if args.no_named? - exec_browser(*args.named.to_formulae_and_casks(only: args.only_path_formula_or_cask).map { |f| github_info(f) }) + exec_browser(*args.named.to_formulae_and_casks(only: args.only_formula_or_cask).map { |f| github_info(f) }) elsif args.no_named? print_statistics else - print_info(args: args, only: args.only_path_formula_or_cask) + print_info(args: args, only: args.only_formula_or_cask) end end @@ -119,7 +119,7 @@ module Homebrew return end - args.named.to_formulae_and_casks_and_unavailable(only: args.only_path_formula_or_cask).each_with_index do |obj, i| + args.named.to_formulae_and_casks_and_unavailable(only: args.only_formula_or_cask).each_with_index do |obj, i| puts unless i.zero? case obj @@ -137,7 +137,7 @@ module Homebrew sig { params(args: CLI::Args, only: T.nilable(Symbol)).void } def print_info(args:, only: nil) - args.named.to_formulae_and_casks_and_unavailable(only: args.only_path_formula_or_cask).each_with_index do |obj, i| + args.named.to_formulae_and_casks_and_unavailable(only: args.only_formula_or_cask).each_with_index do |obj, i| puts unless i.zero? case obj @@ -192,7 +192,7 @@ module Homebrew elsif args.installed? [Formula.installed.sort, Cask::Caskroom.casks.sort_by(&:full_name)] else - args.named.to_formulae_to_casks(only: args.only_path_formula_or_cask) + args.named.to_formulae_to_casks(only: args.only_formula_or_cask) end { diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index ca845dc895..43815f0e7b 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -148,7 +148,7 @@ module Homebrew EOS end - formulae, casks = args.named.to_formulae_and_casks(only: args.only_path_formula_or_cask) + formulae, casks = args.named.to_formulae_and_casks(only: args.only_formula_or_cask) .partition { |formula_or_cask| formula_or_cask.is_a?(Formula) } if casks.any? diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb index 7b0d36f63e..350f7a12f1 100644 --- a/Library/Homebrew/cmd/uninstall.rb +++ b/Library/Homebrew/cmd/uninstall.rb @@ -48,7 +48,7 @@ module Homebrew args = uninstall_args.parse all_kegs, casks = args.named.to_kegs_to_casks( - only: args.only_path_formula_or_cask, + only: args.only_formula_or_cask, ignore_unavailable: args.force?, all_kegs: args.force?, ) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index ed4c952028..626b0be111 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -95,7 +95,7 @@ module Homebrew def upgrade args = upgrade_args.parse - formulae, casks = args.named.to_resolved_formulae_to_casks(only: args.only_path_formula_or_cask) + formulae, casks = args.named.to_resolved_formulae_to_casks(only: args.only_formula_or_cask) # If one or more formulae are specified, but no casks were # specified, we want to make note of that so we don't # try to upgrade all outdated casks. diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index abbd4514bf..5589a939fd 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -123,7 +123,7 @@ module Homebrew elsif args.no_named? [Formula, Cask::Cask.to_a] else - args.named.to_formulae_and_casks(only: args.only_path_formula_or_cask) + args.named.to_formulae_and_casks(only: args.only_formula_or_cask) .partition { |formula_or_cask| formula_or_cask.is_a?(Formula) } end style_files = args.named.to_paths unless skip_style diff --git a/Library/Homebrew/dev-cmd/cat.rb b/Library/Homebrew/dev-cmd/cat.rb index d816df4fa5..cc465fd46e 100644 --- a/Library/Homebrew/dev-cmd/cat.rb +++ b/Library/Homebrew/dev-cmd/cat.rb @@ -38,6 +38,6 @@ module Homebrew "cat" end - safe_system pager, args.named.to_paths(only: args.only_path_formula_or_cask).first + safe_system pager, args.named.to_paths(only: args.only_formula_or_cask).first end end diff --git a/Library/Homebrew/dev-cmd/edit.rb b/Library/Homebrew/dev-cmd/edit.rb index aa868559a3..5bbc17b2e6 100644 --- a/Library/Homebrew/dev-cmd/edit.rb +++ b/Library/Homebrew/dev-cmd/edit.rb @@ -39,7 +39,7 @@ module Homebrew EOS end - paths = args.named.to_paths(only: args.only_path_formula_or_cask).select do |path| + paths = args.named.to_paths(only: args.only_formula_or_cask).select do |path| next path if path.exist? raise UsageError, "#{path} doesn't exist on disk. " \