fix style issues
This commit is contained in:
parent
10ae9bcde7
commit
b5427e5095
@ -1,3 +1,4 @@
|
|||||||
|
# typed: false
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require "formula"
|
require "formula"
|
||||||
@ -23,14 +24,12 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
|
|
||||||
def get_removable_formulae(formulae)
|
def get_removable_formulae(formulae)
|
||||||
removable_formulae = Formula.installed_non_deps(formulae).reject {
|
removable_formulae = Formula.installed_non_deps(formulae).reject do |f|
|
||||||
|f| Tab.for_keg(f.any_installed_keg).installed_on_request
|
Tab.for_keg(f.any_installed_keg).installed_on_request
|
||||||
}
|
|
||||||
|
|
||||||
if removable_formulae.any?
|
|
||||||
removable_formulae += get_removable_formulae(formulae - removable_formulae)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
removable_formulae += get_removable_formulae(formulae - removable_formulae) if removable_formulae.any?
|
||||||
|
|
||||||
removable_formulae
|
removable_formulae
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -45,7 +44,7 @@ module Homebrew
|
|||||||
|
|
||||||
oh1 "Formulae that could be removed"
|
oh1 "Formulae that could be removed"
|
||||||
puts formulae_names
|
puts formulae_names
|
||||||
|
|
||||||
return if args.dry_run?
|
return if args.dry_run?
|
||||||
|
|
||||||
kegs_by_rack = removable_formulae.map(&:any_installed_keg).group_by(&:rack)
|
kegs_by_rack = removable_formulae.map(&:any_installed_keg).group_by(&:rack)
|
||||||
|
@ -1517,13 +1517,13 @@ class Formula
|
|||||||
|
|
||||||
# An array of installed {Formula} that are dependencies of other installed {Formula}
|
# An array of installed {Formula} that are dependencies of other installed {Formula}
|
||||||
# @private
|
# @private
|
||||||
def self.installed_deps(formulae=installed)
|
def self.installed_deps(formulae = installed)
|
||||||
formulae.flat_map(&:runtime_formula_dependencies).uniq(&:name)
|
formulae.flat_map(&:runtime_formula_dependencies).uniq(&:name)
|
||||||
end
|
end
|
||||||
|
|
||||||
# An array of all installed {Formula} that are not dependencies of other installed {Formula}
|
# An array of all installed {Formula} that are not dependencies of other installed {Formula}
|
||||||
# @private
|
# @private
|
||||||
def self.installed_non_deps(formulae=installed)
|
def self.installed_non_deps(formulae = installed)
|
||||||
formulae - installed_deps(formulae)
|
formulae - installed_deps(formulae)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
# typed: false
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require "cmd/shared_examples/args_parse"
|
require "cmd/shared_examples/args_parse"
|
||||||
|
@ -12,7 +12,7 @@ describe "brew leaves", :integration_test do
|
|||||||
it "prints nothing" do
|
it "prints nothing" do
|
||||||
setup_test_formula "foo"
|
setup_test_formula "foo"
|
||||||
setup_test_formula "bar"
|
setup_test_formula "bar"
|
||||||
|
|
||||||
expect { brew "leaves" }
|
expect { brew "leaves" }
|
||||||
.to not_to_output.to_stdout
|
.to not_to_output.to_stdout
|
||||||
.and not_to_output.to_stderr
|
.and not_to_output.to_stderr
|
||||||
@ -25,7 +25,7 @@ describe "brew leaves", :integration_test do
|
|||||||
setup_test_formula "foo"
|
setup_test_formula "foo"
|
||||||
setup_test_formula "bar"
|
setup_test_formula "bar"
|
||||||
(HOMEBREW_CELLAR/"foo/0.1/somedir").mkpath
|
(HOMEBREW_CELLAR/"foo/0.1/somedir").mkpath
|
||||||
|
|
||||||
expect { brew "leaves" }
|
expect { brew "leaves" }
|
||||||
.to output("foo\n").to_stdout
|
.to output("foo\n").to_stdout
|
||||||
.and not_to_output.to_stderr
|
.and not_to_output.to_stderr
|
||||||
@ -39,7 +39,7 @@ describe "brew leaves", :integration_test do
|
|||||||
setup_test_formula "bar"
|
setup_test_formula "bar"
|
||||||
(HOMEBREW_CELLAR/"foo/0.1/somedir").mkpath
|
(HOMEBREW_CELLAR/"foo/0.1/somedir").mkpath
|
||||||
(HOMEBREW_CELLAR/"bar/0.1/somedir").mkpath
|
(HOMEBREW_CELLAR/"bar/0.1/somedir").mkpath
|
||||||
|
|
||||||
expect { brew "leaves" }
|
expect { brew "leaves" }
|
||||||
.to output("bar\n").to_stdout
|
.to output("bar\n").to_stdout
|
||||||
.and not_to_output.to_stderr
|
.and not_to_output.to_stderr
|
||||||
|
@ -456,12 +456,12 @@ describe Formula do
|
|||||||
let(:formulae) do
|
let(:formulae) do
|
||||||
[
|
[
|
||||||
formula_with_deps,
|
formula_with_deps,
|
||||||
formula_is_dep
|
formula_is_dep,
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
before do
|
before do
|
||||||
allow(formula_with_deps).to receive(:runtime_formula_dependencies).and_return([ formula_is_dep ])
|
allow(formula_with_deps).to receive(:runtime_formula_dependencies).and_return([formula_is_dep])
|
||||||
end
|
end
|
||||||
|
|
||||||
specify "without formulae parameter" do
|
specify "without formulae parameter" do
|
||||||
@ -493,12 +493,12 @@ describe Formula do
|
|||||||
let(:formulae) do
|
let(:formulae) do
|
||||||
[
|
[
|
||||||
formula_with_deps,
|
formula_with_deps,
|
||||||
formula_is_dep
|
formula_is_dep,
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
before do
|
before do
|
||||||
allow(formula_with_deps).to receive(:runtime_formula_dependencies).and_return([ formula_is_dep ])
|
allow(formula_with_deps).to receive(:runtime_formula_dependencies).and_return([formula_is_dep])
|
||||||
end
|
end
|
||||||
|
|
||||||
specify "without formulae parameter" do
|
specify "without formulae parameter" do
|
||||||
|
@ -13,8 +13,8 @@ module Homebrew
|
|||||||
|
|
||||||
def uninstall_kegs(kegs_by_rack, force: false, ignore_dependencies: false, named_args: [])
|
def uninstall_kegs(kegs_by_rack, force: false, ignore_dependencies: false, named_args: [])
|
||||||
handle_unsatisfied_dependents(kegs_by_rack,
|
handle_unsatisfied_dependents(kegs_by_rack,
|
||||||
ignore_dependencies: ignore_dependencies,
|
ignore_dependencies: ignore_dependencies,
|
||||||
named_args: named_args)
|
named_args: named_args)
|
||||||
return if Homebrew.failed?
|
return if Homebrew.failed?
|
||||||
|
|
||||||
kegs_by_rack.each do |rack, kegs|
|
kegs_by_rack.each do |rack, kegs|
|
||||||
@ -50,9 +50,9 @@ module Homebrew
|
|||||||
rm_pin rack
|
rm_pin rack
|
||||||
|
|
||||||
if rack.directory?
|
if rack.directory?
|
||||||
versions = rack.subdirs.map(&:basename)
|
versions = rack.subdirs.map(&:basename)
|
||||||
puts "#{keg.name} #{versions.to_sentence} #{"is".pluralize(versions.count)} still installed."
|
puts "#{keg.name} #{versions.to_sentence} #{"is".pluralize(versions.count)} still installed."
|
||||||
puts "Run `brew uninstall --force #{keg.name}` to remove all versions."
|
puts "Run `brew uninstall --force #{keg.name}` to remove all versions."
|
||||||
end
|
end
|
||||||
|
|
||||||
next unless f
|
next unless f
|
||||||
@ -86,7 +86,7 @@ module Homebrew
|
|||||||
|
|
||||||
def handle_unsatisfied_dependents(kegs_by_rack, ignore_dependencies: false, named_args: [])
|
def handle_unsatisfied_dependents(kegs_by_rack, ignore_dependencies: false, named_args: [])
|
||||||
return if ignore_dependencies
|
return if ignore_dependencies
|
||||||
|
|
||||||
all_kegs = kegs_by_rack.values.flatten(1)
|
all_kegs = kegs_by_rack.values.flatten(1)
|
||||||
check_for_dependents(all_kegs, named_args: named_args)
|
check_for_dependents(all_kegs, named_args: named_args)
|
||||||
rescue MethodDeprecatedError
|
rescue MethodDeprecatedError
|
||||||
@ -96,37 +96,39 @@ module Homebrew
|
|||||||
|
|
||||||
def check_for_dependents(kegs, named_args: [])
|
def check_for_dependents(kegs, named_args: [])
|
||||||
return false unless result = Keg.find_some_installed_dependents(kegs)
|
return false unless result = Keg.find_some_installed_dependents(kegs)
|
||||||
|
|
||||||
if Homebrew::EnvConfig.developer?
|
if Homebrew::EnvConfig.developer?
|
||||||
DeveloperDependentsMessage.new(*result, named_args: named_args).output
|
DeveloperDependentsMessage.new(*result, named_args: named_args).output
|
||||||
else
|
else
|
||||||
NondeveloperDependentsMessage.new(*result, named_args: named_args).output
|
NondeveloperDependentsMessage.new(*result, named_args: named_args).output
|
||||||
end
|
end
|
||||||
|
|
||||||
true
|
true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# @api private
|
||||||
class DependentsMessage
|
class DependentsMessage
|
||||||
attr_reader :reqs, :deps, :named_args
|
attr_reader :reqs, :deps, :named_args
|
||||||
|
|
||||||
def initialize(requireds, dependents, named_args: [])
|
def initialize(requireds, dependents, named_args: [])
|
||||||
@reqs = requireds
|
@reqs = requireds
|
||||||
@deps = dependents
|
@deps = dependents
|
||||||
@named_args = named_args
|
@named_args = named_args
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def sample_command
|
def sample_command
|
||||||
"brew uninstall --ignore-dependencies #{named_args.join(" ")}"
|
"brew uninstall --ignore-dependencies #{named_args.join(" ")}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def are_required_by_deps
|
def are_required_by_deps
|
||||||
"#{"is".pluralize(reqs.count)} required by #{deps.to_sentence}, " \
|
"#{"is".pluralize(reqs.count)} required by #{deps.to_sentence}, " \
|
||||||
"which #{"is".pluralize(deps.count)} currently installed"
|
"which #{"is".pluralize(deps.count)} currently installed"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# @api private
|
||||||
class DeveloperDependentsMessage < DependentsMessage
|
class DeveloperDependentsMessage < DependentsMessage
|
||||||
def output
|
def output
|
||||||
opoo <<~EOS
|
opoo <<~EOS
|
||||||
@ -136,7 +138,8 @@ module Homebrew
|
|||||||
EOS
|
EOS
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# @api private
|
||||||
class NondeveloperDependentsMessage < DependentsMessage
|
class NondeveloperDependentsMessage < DependentsMessage
|
||||||
def output
|
def output
|
||||||
ofail <<~EOS
|
ofail <<~EOS
|
||||||
@ -147,69 +150,11 @@ module Homebrew
|
|||||||
EOS
|
EOS
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def rm_pin(rack)
|
def rm_pin(rack)
|
||||||
Formulary.from_rack(rack).unpin
|
Formulary.from_rack(rack).unpin
|
||||||
rescue
|
rescue
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
# def perform_preinstall_checks(all_fatal: false, cc: nil)
|
|
||||||
# check_cpu
|
|
||||||
# attempt_directory_creation
|
|
||||||
# check_cc_argv(cc)
|
|
||||||
# Diagnostic.checks(:supported_configuration_checks, fatal: all_fatal)
|
|
||||||
# Diagnostic.checks(:fatal_preinstall_checks)
|
|
||||||
# end
|
|
||||||
# alias generic_perform_preinstall_checks perform_preinstall_checks
|
|
||||||
# module_function :generic_perform_preinstall_checks
|
|
||||||
|
|
||||||
# def perform_build_from_source_checks(all_fatal: false)
|
|
||||||
# Diagnostic.checks(:fatal_build_from_source_checks)
|
|
||||||
# Diagnostic.checks(:build_from_source_checks, fatal: all_fatal)
|
|
||||||
# end
|
|
||||||
|
|
||||||
# def check_cpu
|
|
||||||
# return if Hardware::CPU.intel? && Hardware::CPU.is_64_bit?
|
|
||||||
|
|
||||||
# message = "Sorry, Homebrew does not support your computer's CPU architecture!"
|
|
||||||
# if Hardware::CPU.arm?
|
|
||||||
# opoo message
|
|
||||||
# return
|
|
||||||
# elsif Hardware::CPU.ppc?
|
|
||||||
# message += <<~EOS
|
|
||||||
# For PowerPC Mac (PPC32/PPC64BE) support, see:
|
|
||||||
# #{Formatter.url("https://github.com/mistydemeo/tigerbrew")}
|
|
||||||
# EOS
|
|
||||||
# end
|
|
||||||
# abort message
|
|
||||||
# end
|
|
||||||
# private_class_method :check_cpu
|
|
||||||
|
|
||||||
# def attempt_directory_creation
|
|
||||||
# Keg::MUST_EXIST_DIRECTORIES.each do |dir|
|
|
||||||
# FileUtils.mkdir_p(dir) unless dir.exist?
|
|
||||||
|
|
||||||
# # Create these files to ensure that these directories aren't removed
|
|
||||||
# # by the Catalina installer.
|
|
||||||
# # (https://github.com/Homebrew/brew/issues/6263)
|
|
||||||
# keep_file = dir/".keepme"
|
|
||||||
# FileUtils.touch(keep_file) unless keep_file.exist?
|
|
||||||
# rescue
|
|
||||||
# nil
|
|
||||||
# end
|
|
||||||
# end
|
|
||||||
# private_class_method :attempt_directory_creation
|
|
||||||
|
|
||||||
# def check_cc_argv(cc)
|
|
||||||
# return unless cc
|
|
||||||
|
|
||||||
# @checks ||= Diagnostic::Checks.new
|
|
||||||
# opoo <<~EOS
|
|
||||||
# You passed `--cc=#{cc}`.
|
|
||||||
# #{@checks.please_create_pull_requests}
|
|
||||||
# EOS
|
|
||||||
# end
|
|
||||||
# private_class_method :check_cc_argv
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user