aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd/upgrade.rb
diff options
context:
space:
mode:
authorCharlie Sharpsteen2011-09-11 13:06:05 -0700
committerCharlie Sharpsteen2011-09-16 08:55:38 -0700
commit00cd16f866fb341dcbcef6d8333d6bb030f03fee (patch)
tree0b5700fc984305dcb947f916fd61667b3e7208e9 /Library/Homebrew/cmd/upgrade.rb
parent06fbecbeaefbcd82db8e0215b964e30ef3378ff0 (diff)
downloadhomebrew-00cd16f866fb341dcbcef6d8333d6bb030f03fee.tar.bz2
Return Formula objects from `outdated_brews`
Previously, `outdated_brews` returned a list of lists---each containing three components of a Formula object: - f.rack - f.name - f.version Frequently more information is required which necessitates back-casting from `name` to a Formula object---simpy returning formula objects removes this step.
Diffstat (limited to 'Library/Homebrew/cmd/upgrade.rb')
-rw-r--r--Library/Homebrew/cmd/upgrade.rb13
1 files changed, 6 insertions, 7 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 99fcf6fa0..97d32bbf6 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -14,24 +14,23 @@ module Homebrew extend self
outdated = if ARGV.named.empty?
Homebrew.outdated_brews
else
- ARGV.formulae.map do |f|
+ ARGV.formulae.each do |f|
raise "#{f} already upgraded" if f.installed?
raise "#{f} not installed" unless f.rack.exist? and not f.rack.children.empty?
- [f.rack, f.name, f.version]
end
end
if outdated.length > 1
oh1 "Upgrading #{outdated.length} outdated package#{outdated.length.plural_s}, with result:"
- puts outdated.map{ |_, name, version| "#{name} #{version}" } * ", "
+ puts outdated.map{ |f| "#{f.name} #{f.version}" } * ", "
end
- outdated.each do |rack, name, version|
- installer = FormulaInstaller.new(Formula.factory(name))
+ outdated.each do |f|
+ installer = FormulaInstaller.new f
installer.show_header = false
- oh1 "Upgrading #{name}"
+ oh1 "Upgrading #{f.name}"
installer.install
- Keg.new("#{rack}/#{version}").unlink
+ Keg.new("#{f.rack}/#{f.version}").unlink
installer.caveats
installer.finish # includes link step
end