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

Simplify pluralisation of common words

Browse Source 
Formulae, dependencies, tries are all used in multiple places so let's
simplify them
This commit is contained in:
Mike McQuaid 2025-09-12 09:02:36 +01:00
parent 1019f9ef21
commit 07091cfbea
No known key found for this signature in database
12 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cleanup.rb
View File

@ -733,7 +733,7 @@ module Homebrew
formulae_names = removable_formulae.map(&:full_name).sort
verb = dry_run ? "Would autoremove" : "Autoremoving"
oh1 "#{verb} #{formulae_names.count} unneeded #{Utils.pluralize("formula", formulae_names.count, plural: "e")}:"
oh1 "#{verb} #{formulae_names.count} unneeded #{Utils.pluralize("formula", formulae_names.count)}:"
puts formulae_names.join("\n")
return if dry_run

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

@ -233,8 +233,8 @@ module Homebrew
.map(&:name)
next if dep_names.blank?
ohai "Would install #{::Utils.pluralize("dependenc", dep_names.count, plural: "ies", singular: "y",
include_count: true)} for #{cask.full_name}:"
ohai "Would install #{::Utils.pluralize("dependency", dep_names.count, include_count: true)} " \
"for #{cask.full_name}:"
puts dep_names.join(" ")
end
return

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

@ -57,7 +57,7 @@ module Homebrew
end
info = Utils.pluralize("tap", tap_count, include_count: true)
info += ", #{private_count} private"
info += ", #{Utils.pluralize("formula", formula_count, plural: "e", include_count: true)}"
info += ", #{Utils.pluralize("formula", formula_count, include_count: true)}"
info += ", #{Utils.pluralize("command", command_count, include_count: true)}"
info += ", #{HOMEBREW_TAP_DIRECTORY.dup.abv}" if HOMEBREW_TAP_DIRECTORY.directory?
puts info

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

@ -842,7 +842,7 @@ class ReporterHub
msg = ""
if outdated_formulae.positive?
noun = Utils.pluralize("formula", outdated_formulae, plural: "e")
noun = Utils.pluralize("formula", outdated_formulae)
msg += "#{Tty.bold}#{outdated_formulae}#{Tty.reset} outdated #{noun}"
end

4
Library/Homebrew/dev-cmd/audit.rb
View File

@ -294,9 +294,7 @@ module Homebrew
errors_summary = Utils.pluralize("problem", total_problems_count, include_count: true)
error_sources = []
if formula_count.positive?
error_sources << Utils.pluralize("formula", formula_count, plural: "e", include_count: true)
end
error_sources << Utils.pluralize("formula", formula_count, include_count: true) if formula_count.positive?
error_sources << Utils.pluralize("cask", cask_count, include_count: true) if cask_count.positive?
error_sources << Utils.pluralize("tap", tap_count, include_count: true) if tap_count.positive?

2
Library/Homebrew/exceptions.rb
View File

@ -579,7 +579,7 @@ class UnbottledError < RuntimeError
require "utils"
msg = <<~EOS
The following #{Utils.pluralize("formula", formulae.count, plural: "e")} cannot be installed from #{Utils.pluralize("bottle", formulae.count)} and must be
The following #{Utils.pluralize("formula", formulae.count)} cannot be installed from #{Utils.pluralize("bottle", formulae.count)} and must be
built from source.
#{formulae.to_sentence}
EOS

9
Library/Homebrew/install.rb
View File

@ -405,8 +405,7 @@ module Homebrew
return if formulae_names_to_install.empty?
if dry_run
ohai "Would install #{Utils.pluralize("formula", formulae_names_to_install.count,
plural: "e", include_count: true)}:"
ohai "Would install #{Utils.pluralize("formula", formulae_names_to_install.count, include_count: true)}:"
puts formulae_names_to_install.join(" ")
formula_installers.each do |fi|
@ -429,8 +428,8 @@ module Homebrew
def print_dry_run_dependencies(formula, dependencies)
return if dependencies.empty?
ohai "Would install #{Utils.pluralize("dependenc", dependencies.count, plural: "ies", singular: "y",
include_count: true)} for #{formula.name}:"
ohai "Would install #{Utils.pluralize("dependency", dependencies.count, include_count: true)} " \
"for #{formula.name}:"
formula_names = dependencies.map { |(dep, _options)| yield dep.to_formula }
puts formula_names.join(" ")
end
@ -446,7 +445,7 @@ module Homebrew
sizes = compute_total_sizes(formulae, debug: args.debug?)
puts "#{::Utils.pluralize("Formula", formulae.count, plural: "e")} \
puts "#{::Utils.pluralize("Formula", formulae.count)} \
(#{formulae.count}): #{formulae.join(", ")}\n\n"
puts "Download Size: #{disk_usage_readable(sizes.fetch(:download))}"
puts "Install Size: #{disk_usage_readable(sizes.fetch(:installed))}"

2
Library/Homebrew/retryable_download.rb
View File

@ -93,7 +93,7 @@ module Homebrew
wait = 2 ** @try
unless quiet
what = Utils.pluralize("tr", tries_remaining, plural: "ies", singular: "y")
what = Utils.pluralize("try", tries_remaining)
ohai "Retrying download in #{wait}s... (#{tries_remaining} #{what} left)"
end
sleep wait

2
Library/Homebrew/search.rb
View File

@ -34,7 +34,7 @@ module Homebrew
unofficial = Tap.all.sum { |tap| tap.official? ? 0 : tap.formula_files.size }
if unofficial.positive?
opoo "Use `--eval-all` to search #{unofficial} additional " \
"#{Utils.pluralize("formula", unofficial, plural: "e")} in third party taps."
"#{Utils.pluralize("formula", unofficial)} in third party taps."
end
descriptions = Homebrew::API::Formula.all_formulae.transform_values { |data| data["desc"] }
Descriptions.search(string_or_regex, search_type, descriptions, eval_all, cache_store_hash: true).print

2
Library/Homebrew/tap.rb
View File

@ -738,7 +738,7 @@ class Tap
end
if (formula_count = formula_files.count).positive?
contents << Utils.pluralize("formula", formula_count, plural: "e", include_count: true)
contents << Utils.pluralize("formula", formula_count, include_count: true)
end
contents

2
Library/Homebrew/upgrade.rb
View File

@ -251,7 +251,7 @@ module Homebrew
ohai "No outdated dependents to upgrade!" unless dry_run
else
installed_formulae = (dry_run ? formulae : FormulaInstaller.installed.to_a).dup
formula_plural = Utils.pluralize("formula", installed_formulae.count, plural: "e")
formula_plural = Utils.pluralize("formula", installed_formulae.count)
upgrade_verb = dry_run ? "Would upgrade" : "Upgrading"
ohai "#{upgrade_verb} #{Utils.pluralize("dependent", upgradeable.count,
include_count: true)} of upgraded #{formula_plural}:"

9
Library/Homebrew/utils.rb
View File

@ -160,6 +160,15 @@ module Utils
params(stem: String, count: Integer, plural: String, singular: String, include_count: T::Boolean).returns(String)
}
def self.pluralize(stem, count, plural: "s", singular: "", include_count: false)
case stem
when "formula"
plural = "e"
when "dependency", "try"
stem = stem.delete_suffix("y")
plural = "ies"
singular = "y"
end
prefix = include_count ? "#{count} " : ""
suffix = (count == 1) ? singular : plural
"#{prefix}#{stem}#{suffix}"