From ca1a6492bc7921c3ad269f434be5b927802ada64 Mon Sep 17 00:00:00 2001
From: Max Howell <max@methylblue.com>
Date: Thu, 15 Oct 2009 09:07:12 +0100
Subject: [PATCH] s/require 'brewkit'/require 'formula'/g

brewkit.rb changes ENV destructively, so lets not do that everytime a formula
is required. Now it's possible for other tools to require a formula
description without worrying about side-effects.
---
 Library/Homebrew/brew.h.rb   | 2 +-
 Library/Homebrew/brewkit.rb  | 4 ----
 Library/Homebrew/formula.rb  | 2 ++
 Library/Homebrew/install.rb  | 8 ++++++--
 Library/Homebrew/unittest.rb | 2 +-
 bin/brew                     | 2 --
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index 83cb79c509..24f9046a94 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -30,7 +30,7 @@ def __make url, name
   raise "#{path} already exists" if path.exist?
 
   template=<<-EOS
-            require 'brewkit'
+            require 'formula'
 
             class #{Formula.class_s name} <Formula
               url '#{url}'
diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb
index 0a966a317e..843ac023dd 100644
--- a/Library/Homebrew/brewkit.rb
+++ b/Library/Homebrew/brewkit.rb
@@ -21,10 +21,6 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 #  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-require 'fileutils'
-require 'formula'
-require 'download_strategy'
-require 'hardware'
 
 # TODO
 # 1. Indeed, there should be an option to build 32 or 64 bit binaries
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 8e4771cd13..4330b812f7 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -21,6 +21,8 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 #  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+require 'download_strategy'
+
 class ExecutionError <RuntimeError
   def initialize cmd, args=[]
     super "Failure while executing: #{cmd} #{args*' '}"
diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb
index 75a63ac32f..9509a56b8e 100755
--- a/Library/Homebrew/install.rb
+++ b/Library/Homebrew/install.rb
@@ -1,8 +1,12 @@
 #!/usr/bin/ruby
 require 'global'
-require 'formula'
-require 'keg'
+
 require 'brew.h'
+require 'brewkit'
+require 'fileutils'
+require 'formula'
+require 'hardware'
+require 'keg'
 
 show_summary_heading = false
 
diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb
index 8faeb4f43c..dfbf0e1011 100755
--- a/Library/Homebrew/unittest.rb
+++ b/Library/Homebrew/unittest.rb
@@ -365,7 +365,7 @@ class BeerTasting <Test::Unit::TestCase
     path.dirname.mkpath
     File.open(path, 'w') do |f|
       f << %{
-        require 'brewkit'
+        require 'formula'
         class #{classname} < Formula
           @url=''
           def initialize(*args)
diff --git a/bin/brew b/bin/brew
index 721e9cc2e1..f2a3d5ff09 100755
--- a/bin/brew
+++ b/bin/brew
@@ -92,8 +92,6 @@ begin
       
       raise "Cannot write to #{HOMEBREW_PREFIX}" unless HOMEBREW_PREFIX.writable?
 
-      require 'brewkit'
-
       if ARGV.interactive? and ARGV.formulae.length > 1
         # the reason for this is interactive mode is a little tricky to do 
         # with more than one formula, AND I can't think of a time where you'd