Simplify build options API

Simplify access to the different forms of a formula's build options by
making options into real objects rather than strings, and expose both
the 'name' and 'flag' form.

1 files changed, 4 insertions, 4 deletions

diff --git a/Library/Homebrew/cmd/options.rb b/Library/Homebrew/cmd/options.rb
index 482f982cc..2f64f5b39 100644
--- a/Library/Homebrew/cmd/options.rb
+++ b/Library/Homebrew/cmd/options.rb
@@ -21,7 +21,7 @@ module Homebrew extend self
     ff.each do |f|
       next if f.build.empty?
       if ARGV.include? '--compact'
-        puts f.build.collect {|k,v| "--"+k} * " "
+        puts f.build.as_flags * " "
       else
         puts f.name if ff.length > 1
         dump_options_for_formula f
@@ -31,9 +31,9 @@ module Homebrew extend self
   end
 
   def dump_options_for_formula f
-    f.build.each do |k,v|
-      puts "--"+k
-      puts "\t"+v
+    f.build.each do |opt|
+      puts opt.flag
+      puts "\t"+opt.description
     end
   end
 end