Revert "Merge pull request #2597 from MikeMcQuaid/vendor-gems"

This reverts commit 3e4547f52e7ebec633f8bfefc8a396d944edf908, reversing
changes made to 6edf9382bcc1240ad6f97c8b752cfe56cef9965d.

1 files changed, 2 insertions, 17 deletions

diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index 6dab50f29..e07599ac6 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -8,14 +8,9 @@ std_trap = trap("INT") { exit! 130 } # no backtrace thanks
 RUBY_TWO = RUBY_VERSION.split(".").first.to_i >= 2
 raise "Homebrew must be run under Ruby 2!" unless RUBY_TWO
 
-homebrew_library_path = File.dirname(File.realpath(__FILE__))
-$:.unshift(homebrew_library_path)
-
-require_relative "#{homebrew_library_path}/vendor/bundler/setup"
-
 require "pathname"
-HOMEBREW_LIBRARY_PATH = Pathname.new(homebrew_library_path)
-
+HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent
+$:.unshift(HOMEBREW_LIBRARY_PATH.to_s)
 require "global"
 require "tap"
 
@@ -25,8 +20,6 @@ if ARGV == %w[--version] || ARGV == %w[-v]
   exit 0
 end
 
-HOMEBREW_GEM_HOME = HOMEBREW_LIBRARY_PATH/"vendor/#{RUBY_ENGINE}/#{RUBY_VERSION}"
-
 def require?(path)
   require path
 rescue LoadError => e
@@ -59,14 +52,6 @@ begin
   # Add contributed commands to PATH before checking.
   path.append(Pathname.glob(Tap::TAP_DIRECTORY/"*/*/cmd"))
 
-  # Add RubyGems.
-  ENV["GEM_HOME"] = ENV["GEM_PATH"] = HOMEBREW_GEM_HOME
-  path.append(HOMEBREW_GEM_HOME/"bin")
-
-  # Make RubyGems notice environment changes.
-  Gem.clear_paths
-  Gem::Specification.reset
-
   # Add SCM wrappers.
   path.append(HOMEBREW_SHIMS_PATH/"scm")