Use Pathname#subdirs

This commit is contained in:
Jack Nagel 2014-06-17 22:12:41 -05:00
parent c73baa39cb
commit 53afdae10e

View File

@ -60,11 +60,11 @@ module Homebrew extend self
def list_versions def list_versions
if ARGV.named.empty? if ARGV.named.empty?
HOMEBREW_CELLAR.children.select{ |pn| pn.directory? } HOMEBREW_CELLAR.subdirs
else else
ARGV.named.map{ |n| HOMEBREW_CELLAR+n }.select{ |pn| pn.exist? } ARGV.named.map{ |n| HOMEBREW_CELLAR+n }.select{ |pn| pn.exist? }
end.each do |d| end.each do |d|
versions = d.children.select{ |pn| pn.directory? }.map{ |pn| pn.basename.to_s } versions = d.subdirs.map { |pn| pn.basename.to_s }
next if ARGV.include?('--multiple') && versions.count < 2 next if ARGV.include?('--multiple') && versions.count < 2
puts "#{d.basename} #{versions*' '}" puts "#{d.basename} #{versions*' '}"
end end
@ -72,7 +72,7 @@ module Homebrew extend self
def list_pinned def list_pinned
if ARGV.named.empty? if ARGV.named.empty?
HOMEBREW_CELLAR.children.select{ |pn| pn.directory? } HOMEBREW_CELLAR.subdirs
else else
ARGV.named.map{ |n| HOMEBREW_CELLAR+n }.select{ |pn| pn.exist? } ARGV.named.map{ |n| HOMEBREW_CELLAR+n }.select{ |pn| pn.exist? }
end.select do |d| end.select do |d|