Move BuildOptions to a separate file

Library/Homebrew/build_options.rb

@@ -0,0 +1,74 @@
+require 'options'
+
+# This class holds the build-time options defined for a Formula,
+# and provides named access to those options during install.
+class BuildOptions
+  attr_writer :args
+  include Enumerable
+
+  def initialize args
+    @args = Array.new(args).extend(HomebrewArgvExtension)
+    @options = Options.new
+  end
+
+  def add name, description=nil
+    description ||= case name.to_s
+      when "universal" then "Build a universal binary"
+      when "32-bit" then "Build 32-bit only"
+      end.to_s
+
+    @options << Option.new(name, description)
+  end
+
+  def has_option? name
+    any? { |opt| opt.name == name }
+  end
+
+  def empty?
+    @options.empty?
+  end
+
+  def each(*args, &block)
+    @options.each(*args, &block)
+  end
+
+  def as_flags
+    @options.as_flags
+  end
+
+  def include? name
+    @args.include? '--' + name
+  end
+
+  def head?
+    @args.flag? '--HEAD'
+  end
+
+  def devel?
+    @args.include? '--devel'
+  end
+
+  def stable?
+    not (head? or devel?)
+  end
+
+  # True if the user requested a universal build.
+  def universal?
+    @args.include?('--universal') && has_option?('universal')
+  end
+
+  # Request a 32-bit only build.
+  # This is needed for some use-cases though we prefer to build Universal
+  # when a 32-bit version is needed.
+  def build_32_bit?
+    @args.include?('--32-bit') && has_option?('32-bit')
+  end
+
+  def used_options
+    Options.new((as_flags & @args.options_only).map { |o| Option.new(o) })
+  end
+
+  def unused_options
+    Options.new((as_flags - @args.options_only).map { |o| Option.new(o) })
+  end
+end

Library/Homebrew/formula.rb

@@ -6,6 +6,7 @@ require 'bottles'
 require 'patches'
 require 'compilers'
 require 'build_environment'
+require 'build_options'
 require 'extend/set'
 
 

Library/Homebrew/formula_support.rb

@@ -1,7 +1,6 @@
 require 'download_strategy'
 require 'checksums'
 require 'version'
-require 'options'
 
 class SoftwareSpec
   attr_reader :checksum, :mirrors, :specs
@@ -161,76 +160,3 @@ class KegOnlyReason
     end.strip
   end
 end
-
-# This class holds the build-time options defined for a Formula,
-# and provides named access to those options during install.
-class BuildOptions
-  attr_writer :args
-  include Enumerable
-
-  def initialize args
-    @args = Array.new(args).extend(HomebrewArgvExtension)
-    @options = Options.new
-  end
-
-  def add name, description=nil
-    description ||= case name.to_s
-      when "universal" then "Build a universal binary"
-      when "32-bit" then "Build 32-bit only"
-      end.to_s
-
-    @options << Option.new(name, description)
-  end
-
-  def has_option? name
-    any? { |opt| opt.name == name }
-  end
-
-  def empty?
-    @options.empty?
-  end
-
-  def each(*args, &block)
-    @options.each(*args, &block)
-  end
-
-  def as_flags
-    @options.as_flags
-  end
-
-  def include? name
-    @args.include? '--' + name
-  end
-
-  def head?
-    @args.flag? '--HEAD'
-  end
-
-  def devel?
-    @args.include? '--devel'
-  end
-
-  def stable?
-    not (head? or devel?)
-  end
-
-  # True if the user requested a universal build.
-  def universal?
-    @args.include?('--universal') && has_option?('universal')
-  end
-
-  # Request a 32-bit only build.
-  # This is needed for some use-cases though we prefer to build Universal
-  # when a 32-bit version is needed.
-  def build_32_bit?
-    @args.include?('--32-bit') && has_option?('32-bit')
-  end
-
-  def used_options
-    Options.new((as_flags & @args.options_only).map { |o| Option.new(o) })
-  end
-
-  def unused_options
-    Options.new((as_flags - @args.options_only).map { |o| Option.new(o) })
-  end
-end