uninstall: consistent spelling of "dependent"
@ilovezfs pointed out that Homebrew generally uses "dependent", rather than "dependant".
This commit is contained in:
parent
e41c4e5029
commit
08f3aecf6b
@ -16,11 +16,11 @@ module Homebrew
|
|||||||
|
|
||||||
if !ARGV.force?
|
if !ARGV.force?
|
||||||
ARGV.kegs.each do |keg|
|
ARGV.kegs.each do |keg|
|
||||||
dependants = keg.installed_dependants
|
dependents = keg.installed_dependents
|
||||||
if dependants.any?
|
if dependents.any?
|
||||||
dependants_output = dependants.map { |k| "#{k.name} #{k.version}" }.join(", ")
|
dependents_output = dependents.map { |k| "#{k.name} #{k.version}" }.join(", ")
|
||||||
conjugation = dependants.count == 1 ? "is" : "are"
|
conjugation = dependents.count == 1 ? "is" : "are"
|
||||||
ofail "Refusing to uninstall #{keg} because it is required by #{dependants_output}, which #{conjugation} currently installed."
|
ofail "Refusing to uninstall #{keg} because it is required by #{dependents_output}, which #{conjugation} currently installed."
|
||||||
puts "You can override this and force removal with `brew uninstall --force #{keg.name}`."
|
puts "You can override this and force removal with `brew uninstall --force #{keg.name}`."
|
||||||
next
|
next
|
||||||
end
|
end
|
||||||
|
|||||||
@ -296,7 +296,7 @@ class Keg
|
|||||||
Formulary.from_keg(self)
|
Formulary.from_keg(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
def installed_dependants
|
def installed_dependents
|
||||||
Formula.installed.flat_map(&:installed_kegs).select do |keg|
|
Formula.installed.flat_map(&:installed_kegs).select do |keg|
|
||||||
Tab.for_keg(keg).runtime_dependencies.any? do |dep|
|
Tab.for_keg(keg).runtime_dependencies.any? do |dep|
|
||||||
# Resolve formula rather than directly comparing names
|
# Resolve formula rather than directly comparing names
|
||||||
|
|||||||
@ -329,34 +329,34 @@ class InstalledDependantsTests < LinkTests
|
|||||||
|
|
||||||
def setup
|
def setup
|
||||||
super
|
super
|
||||||
@dependant = setup_test_keg("bar", "1.0")
|
@dependent = setup_test_keg("bar", "1.0")
|
||||||
end
|
end
|
||||||
|
|
||||||
def dependencies(deps)
|
def dependencies(deps)
|
||||||
tab = Tab.for_keg(@dependant)
|
tab = Tab.for_keg(@dependent)
|
||||||
tab.tabfile = @dependant.join("INSTALL_RECEIPT.json")
|
tab.tabfile = @dependent.join("INSTALL_RECEIPT.json")
|
||||||
tab.runtime_dependencies = deps
|
tab.runtime_dependencies = deps
|
||||||
tab.write
|
tab.write
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_no_dependencies
|
def test_no_dependencies
|
||||||
dependencies []
|
dependencies []
|
||||||
assert_empty @keg.installed_dependants
|
assert_empty @keg.installed_dependents
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_same_name_different_version
|
def test_same_name_different_version
|
||||||
dependencies [{ "full_name" => "foo", "version" => "1.1" }]
|
dependencies [{ "full_name" => "foo", "version" => "1.1" }]
|
||||||
assert_empty @keg.installed_dependants
|
assert_empty @keg.installed_dependents
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_different_name_same_version
|
def test_different_name_same_version
|
||||||
stub_formula_name("baz")
|
stub_formula_name("baz")
|
||||||
dependencies [{ "full_name" => "baz", "version" => @keg.version.to_s }]
|
dependencies [{ "full_name" => "baz", "version" => @keg.version.to_s }]
|
||||||
assert_empty @keg.installed_dependants
|
assert_empty @keg.installed_dependents
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_same_name_and_version
|
def test_same_name_and_version
|
||||||
dependencies [{ "full_name" => "foo", "version" => "1.0" }]
|
dependencies [{ "full_name" => "foo", "version" => "1.0" }]
|
||||||
assert_equal [@dependant], @keg.installed_dependants
|
assert_equal [@dependent], @keg.installed_dependents
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user