diff options
| author | Alyssa Ross | 2016-09-27 21:56:56 +0100 |
|---|---|---|
| committer | Alyssa Ross | 2016-10-25 22:34:34 +0100 |
| commit | 08f3aecf6b1da82b54a8a103ba5ed440554b9f45 (patch) | |
| tree | 7fd4d248fb057eec3434c9adf606614511d5462b | |
| parent | e41c4e502987d49bda9d86ad8ecd1b4e213ba9c5 (diff) | |
| download | brew-08f3aecf6b1da82b54a8a103ba5ed440554b9f45.tar.bz2 | |
uninstall: consistent spelling of "dependent"
@ilovezfs pointed out that Homebrew generally uses "dependent", rather than
"dependant".
| -rw-r--r-- | Library/Homebrew/cmd/uninstall.rb | 10 | ||||
| -rw-r--r-- | Library/Homebrew/keg.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_keg.rb | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb index d9d3ef883..30806942b 100644 --- a/Library/Homebrew/cmd/uninstall.rb +++ b/Library/Homebrew/cmd/uninstall.rb @@ -16,11 +16,11 @@ module Homebrew if !ARGV.force? ARGV.kegs.each do |keg| - dependants = keg.installed_dependants - if dependants.any? - dependants_output = dependants.map { |k| "#{k.name} #{k.version}" }.join(", ") - conjugation = dependants.count == 1 ? "is" : "are" - ofail "Refusing to uninstall #{keg} because it is required by #{dependants_output}, which #{conjugation} currently installed." + dependents = keg.installed_dependents + if dependents.any? + dependents_output = dependents.map { |k| "#{k.name} #{k.version}" }.join(", ") + conjugation = dependents.count == 1 ? "is" : "are" + 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}`." next end diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 0f58d688c..23ebd9d98 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -296,7 +296,7 @@ class Keg Formulary.from_keg(self) end - def installed_dependants + def installed_dependents Formula.installed.flat_map(&:installed_kegs).select do |keg| Tab.for_keg(keg).runtime_dependencies.any? do |dep| # Resolve formula rather than directly comparing names diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb index 41ccb27ee..ac5831b09 100644 --- a/Library/Homebrew/test/test_keg.rb +++ b/Library/Homebrew/test/test_keg.rb @@ -329,34 +329,34 @@ class InstalledDependantsTests < LinkTests def setup super - @dependant = setup_test_keg("bar", "1.0") + @dependent = setup_test_keg("bar", "1.0") end def dependencies(deps) - tab = Tab.for_keg(@dependant) - tab.tabfile = @dependant.join("INSTALL_RECEIPT.json") + tab = Tab.for_keg(@dependent) + tab.tabfile = @dependent.join("INSTALL_RECEIPT.json") tab.runtime_dependencies = deps tab.write end def test_no_dependencies dependencies [] - assert_empty @keg.installed_dependants + assert_empty @keg.installed_dependents end def test_same_name_different_version dependencies [{ "full_name" => "foo", "version" => "1.1" }] - assert_empty @keg.installed_dependants + assert_empty @keg.installed_dependents end def test_different_name_same_version stub_formula_name("baz") dependencies [{ "full_name" => "baz", "version" => @keg.version.to_s }] - assert_empty @keg.installed_dependants + assert_empty @keg.installed_dependents end def test_same_name_and_version dependencies [{ "full_name" => "foo", "version" => "1.0" }] - assert_equal [@dependant], @keg.installed_dependants + assert_equal [@dependent], @keg.installed_dependents end end |
