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

moving to lambda expressions to respect brew style

Browse Source
This commit is contained in:
thibhero 2025-02-11 11:06:16 -05:00
parent db10b644ad
commit a111139682
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/reinstall.rb
View File

@ -152,7 +152,7 @@ module Homebrew
# 1. The original formulae to install. # 1. The original formulae to install.
# 2. Their outdated dependents (subject to pruning criteria). # 2. Their outdated dependents (subject to pruning criteria).
# 3. Optionally, any installed formula that depends on one of these and is outdated. # 3. Optionally, any installed formula that depends on one of these and is outdated.
def compute_sized_formulae(formulae_to_install, check_dep: true) compute_sized_formulae = lambda { |formulae_to_install, check_dep: true|
sized_formulae = formulae_to_install.flat_map do |formula| sized_formulae = formulae_to_install.flat_map do |formula|
# Always include the formula itself. # Always include the formula itself.
formula_list = [formula] formula_list = [formula]
@ -184,10 +184,10 @@ module Homebrew
# Uniquify based on a string representation (or any unique identifier) # Uniquify based on a string representation (or any unique identifier)
sized_formulae.uniq { |f| f.to_s } sized_formulae.uniq { |f| f.to_s }
end }
# Compute the total sizes (download, installed, and net) for the given formulae. # Compute the total sizes (download, installed, and net) for the given formulae.
def compute_total_sizes(sized_formulae, debug: false) compute_total_sizes = lambda { |sized_formulae, debug: false|
total_download_size = 0 total_download_size = 0
total_installed_size = 0 total_installed_size = 0
total_net_size = 0 total_net_size = 0
@ -213,15 +213,15 @@ module Homebrew
{ download: total_download_size, { download: total_download_size,
installed: total_installed_size, installed: total_installed_size,
net: total_net_size } net: total_net_size }
end }
# Main block: if asking the user is enabled, show dependency and size information. # Main block: if asking the user is enabled, show dependency and size information.
# This part should be # This part should be
if args.ask? if args.ask?
ohai "Looking for bottles..." ohai "Looking for bottles..."
sized_formulae = compute_sized_formulae(formulae, check_dep: false) sized_formulae = compute_sized_formulae.call(formulae, check_dep: false)
sizes = compute_total_sizes(sized_formulae, debug: args.debug?) sizes = compute_total_sizes.call(sized_formulae, debug: args.debug?)
puts "Formulae: #{sized_formulae.join(", ")}\n\n" puts "Formulae: #{sized_formulae.join(", ")}\n\n"
puts "Download Size: #{disk_usage_readable(sizes[:download])}" puts "Download Size: #{disk_usage_readable(sizes[:download])}"

8
Library/Homebrew/cmd/upgrade.rb
View File

@ -242,7 +242,7 @@ module Homebrew
# 1. The original formulae to install. # 1. The original formulae to install.
# 2. Their outdated dependents (subject to pruning criteria). # 2. Their outdated dependents (subject to pruning criteria).
# 3. Optionally, any installed formula that depends on one of these and is outdated. # 3. Optionally, any installed formula that depends on one of these and is outdated.
def compute_sized_formulae(formulae_to_install, check_dep: true) compute_sized_formulae = lambda { |formulae_to_install, check_dep: true|
sized_formulae = formulae_to_install.flat_map do |formula| sized_formulae = formulae_to_install.flat_map do |formula|
# Always include the formula itself. # Always include the formula itself.
formula_list = [formula] formula_list = [formula]
@ -274,10 +274,10 @@ module Homebrew
# Uniquify based on a string representation (or any unique identifier) # Uniquify based on a string representation (or any unique identifier)
sized_formulae.uniq { |f| f.to_s } sized_formulae.uniq { |f| f.to_s }
end }
# Compute the total sizes (download, installed, and net) for the given formulae. # Compute the total sizes (download, installed, and net) for the given formulae.
def compute_total_sizes(sized_formulae, debug: false) compute_total_sizes = lambda { |sized_formulae, debug: false|
total_download_size = 0 total_download_size = 0
total_installed_size = 0 total_installed_size = 0
total_net_size = 0 total_net_size = 0
@ -303,7 +303,7 @@ module Homebrew
{ download: total_download_size, { download: total_download_size,
installed: total_installed_size, installed: total_installed_size,
net: total_net_size } net: total_net_size }
end }
# Main block: if asking the user is enabled, show dependency and size information. # Main block: if asking the user is enabled, show dependency and size information.
# This part should be # This part should be