From 03ca3e24d0ccd4633a29aab6b1dc1c43ead5c4e2 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Mon, 26 Oct 2009 18:20:18 +0000 Subject: [PATCH] Don't throw if named.empty? Generally this isn't desired or useful. --- Library/Homebrew/extend/ARGV.rb | 16 +++++----------- bin/brew | 10 ++++++---- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 62ac933f77..e7585edbcf 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -23,11 +23,7 @@ # module HomebrewArgvExtension def named - raise UsageError if private_named.empty? - private_named - end - def named_empty? - private_named.empty? + @named ||= reject{|arg| arg[0..0] == '-'} end def options select {|arg| arg[0..0] == '-'} @@ -108,15 +104,13 @@ Commands useful when contributing: To visit the Homebrew homepage type: brew home - EOS + EOS end -private - def private_named - @named ||= reject{|arg| arg[0..0] == '-'} - end + private + def downcased_unique_named - @downcased_unique_named ||= private_named.collect{|arg| arg.downcase}.uniq + @downcased_unique_named ||= named.collect{|arg| arg.downcase}.uniq end end diff --git a/bin/brew b/bin/brew index b7e255d840..437be8c73d 100755 --- a/bin/brew +++ b/bin/brew @@ -80,7 +80,7 @@ begin dump_config when 'home', 'homepage' - if ARGV.named_empty? + if ARGV.named.empty? exec "open", HOMEBREW_WWW else exec "open", *ARGV.formulae.collect {|f| f.homepage} @@ -92,7 +92,7 @@ begin dirs -= ['Library', 'Cellar', '.git'] Dir.chdir HOMEBREW_PREFIX exec 'find', *dirs + %w[-type f ( ! -iname .ds_store ! -iname brew )] - elsif ARGV.named_empty? + elsif ARGV.named.empty? ENV['CLICOLOR']=nil exec 'ls', *ARGV.options<