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

fix style issues

Browse Source
This commit is contained in:
Tie 2020-11-04 18:53:03 -05:00
parent 10ae9bcde7
commit b5427e5095
6 changed files with 35 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cmd/autoremove.rb
View File

@ -1,3 +1,4 @@
# typed: false
# frozen_string_literal: true
require "formula"
@ -23,14 +24,12 @@ module Homebrew
end
def get_removable_formulae(formulae)
removable_formulae = Formula.installed_non_deps(formulae).reject {
|f| Tab.for_keg(f.any_installed_keg).installed_on_request
}
if removable_formulae.any?
removable_formulae += get_removable_formulae(formulae - removable_formulae)
removable_formulae = Formula.installed_non_deps(formulae).reject do |f|
Tab.for_keg(f.any_installed_keg).installed_on_request
end
removable_formulae += get_removable_formulae(formulae - removable_formulae) if removable_formulae.any?
removable_formulae
end
@ -45,7 +44,7 @@ module Homebrew
oh1 "Formulae that could be removed"
puts formulae_names
return if args.dry_run?
kegs_by_rack = removable_formulae.map(&:any_installed_keg).group_by(&:rack)

4
Library/Homebrew/formula.rb
View File

@ -1517,13 +1517,13 @@ class Formula
# An array of installed {Formula} that are dependencies of other installed {Formula}
# @private
def self.installed_deps(formulae=installed)
def self.installed_deps(formulae = installed)
formulae.flat_map(&:runtime_formula_dependencies).uniq(&:name)
end
# An array of all installed {Formula} that are not dependencies of other installed {Formula}
# @private
def self.installed_non_deps(formulae=installed)
def self.installed_non_deps(formulae = installed)
formulae - installed_deps(formulae)
end

1
Library/Homebrew/test/cmd/autoremove_spec.rb
View File

@ -1,3 +1,4 @@
# typed: false
# frozen_string_literal: true
require "cmd/shared_examples/args_parse"

6
Library/Homebrew/test/cmd/leaves_spec.rb
View File

@ -12,7 +12,7 @@ describe "brew leaves", :integration_test do
it "prints nothing" do
setup_test_formula "foo"
setup_test_formula "bar"
expect { brew "leaves" }
.to not_to_output.to_stdout
.and not_to_output.to_stderr
@ -25,7 +25,7 @@ describe "brew leaves", :integration_test do
setup_test_formula "foo"
setup_test_formula "bar"
(HOMEBREW_CELLAR/"foo/0.1/somedir").mkpath
expect { brew "leaves" }
.to output("foo\n").to_stdout
.and not_to_output.to_stderr
@ -39,7 +39,7 @@ describe "brew leaves", :integration_test do
setup_test_formula "bar"
(HOMEBREW_CELLAR/"foo/0.1/somedir").mkpath
(HOMEBREW_CELLAR/"bar/0.1/somedir").mkpath
expect { brew "leaves" }
.to output("bar\n").to_stdout
.and not_to_output.to_stderr

10
Library/Homebrew/test/formula_spec.rb
View File

@ -456,12 +456,12 @@ describe Formula do
let(:formulae) do
[
formula_with_deps,
formula_is_dep
formula_is_dep,
]
end
end
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
specify "without formulae parameter" do
@ -493,12 +493,12 @@ describe Formula do
let(:formulae) do
[
formula_with_deps,
formula_is_dep
formula_is_dep,
]
end
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
specify "without formulae parameter" do

91
Library/Homebrew/uninstall.rb
View File

@ -13,8 +13,8 @@ module Homebrew
def uninstall_kegs(kegs_by_rack, force: false, ignore_dependencies: false, named_args: [])
handle_unsatisfied_dependents(kegs_by_rack,
ignore_dependencies: ignore_dependencies,
named_args: named_args)
ignore_dependencies: ignore_dependencies,
named_args: named_args)
return if Homebrew.failed?
kegs_by_rack.each do |rack, kegs|
@ -50,9 +50,9 @@ module Homebrew
rm_pin rack
if rack.directory?
versions = rack.subdirs.map(&:basename)
puts "#{keg.name} #{versions.to_sentence} #{"is".pluralize(versions.count)} still installed."
puts "Run `brew uninstall --force #{keg.name}` to remove all versions."
versions = rack.subdirs.map(&:basename)
puts "#{keg.name} #{versions.to_sentence} #{"is".pluralize(versions.count)} still installed."
puts "Run `brew uninstall --force #{keg.name}` to remove all versions."
end
next unless f
@ -86,7 +86,7 @@ module Homebrew
def handle_unsatisfied_dependents(kegs_by_rack, ignore_dependencies: false, named_args: [])
return if ignore_dependencies
all_kegs = kegs_by_rack.values.flatten(1)
check_for_dependents(all_kegs, named_args: named_args)
rescue MethodDeprecatedError
@ -96,37 +96,39 @@ module Homebrew
def check_for_dependents(kegs, named_args: [])
return false unless result = Keg.find_some_installed_dependents(kegs)
if Homebrew::EnvConfig.developer?
DeveloperDependentsMessage.new(*result, named_args: named_args).output
else
NondeveloperDependentsMessage.new(*result, named_args: named_args).output
end
true
end
# @api private
class DependentsMessage
attr_reader :reqs, :deps, :named_args
def initialize(requireds, dependents, named_args: [])
@reqs = requireds
@deps = dependents
@named_args = named_args
end
protected
def sample_command
"brew uninstall --ignore-dependencies #{named_args.join(" ")}"
end
def are_required_by_deps
"#{"is".pluralize(reqs.count)} required by #{deps.to_sentence}, " \
"which #{"is".pluralize(deps.count)} currently installed"
end
end
# @api private
class DeveloperDependentsMessage < DependentsMessage
def output
opoo <<~EOS
@ -136,7 +138,8 @@ module Homebrew
EOS
end
end
# @api private
class NondeveloperDependentsMessage < DependentsMessage
def output
ofail <<~EOS
@ -147,69 +150,11 @@ module Homebrew
EOS
end
end
def rm_pin(rack)
Formulary.from_rack(rack).unpin
rescue
nil
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