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

This reverts commit 3e4547f, reversing
changes made to 6edf938.

Author: MikeMcQuaid

.bundle/config

@@ -8,35 +8,24 @@
 !/Library/
 
 # Ignore generated files within `Library` (again).
+/Library/Homebrew/**/.bundle
+/Library/Homebrew/**/vendor/bundle
 /Library/Homebrew/doc
 /Library/Homebrew/cask/bin
 /Library/Homebrew/cask/coverage
 /Library/Homebrew/cask/tmp
+/Library/Homebrew/test/bin
+/Library/Homebrew/test/coverage
+/Library/Homebrew/test/fs_leak_log
 /Library/Homebrew/tmp
 /Library/LinkedKegs
 /Library/Locks
 /Library/PinnedKegs
 /Library/PinnedTaps
 /Library/Taps
 
-# Ignore some vendored files within `Library`.
+# Ignore vendored files within `Library`.
 /Library/Homebrew/vendor/portable-ruby
-/Library/Homebrew/vendor/ruby/2.0.0/bin
-/Library/Homebrew/vendor/ruby/2.0.0/cache
-/Library/Homebrew/vendor/ruby/2.0.0/extensions
-/Library/Homebrew/vendor/ruby/2.0.0/gems/*
-/Library/Homebrew/vendor/ruby/2.0.0/gems/ruby-macho-*/*
-/Library/Homebrew/vendor/ruby/2.0.0/gems/plist-*/*
-/Library/Homebrew/vendor/ruby/2.0.0/specifications
-/Library/Homebrew/vendor/ruby/2.0.0/tmp
-
-# Unignore our vendored gems
-!/Library/Homebrew/vendor/ruby/2.0.0/gems/ruby-macho-*
-!/Library/Homebrew/vendor/ruby/2.0.0/gems/ruby-macho-*/LICENSE*
-!/Library/Homebrew/vendor/ruby/2.0.0/gems/ruby-macho-*/lib
-!/Library/Homebrew/vendor/ruby/2.0.0/gems/plist-*
-!/Library/Homebrew/vendor/ruby/2.0.0/gems/plist-*/LICENSE*
-!/Library/Homebrew/vendor/ruby/2.0.0/gems/plist-*/lib
 
 # Ignore `bin` contents (again).
 /bin
@@ -61,13 +50,13 @@
 !/completions
 
 # Unignore our root-level metadata files.
-!/.bundle
 !/.gitignore
 !/.travis.yml
 !/.yardopts
 !/CODEOFCONDUCT.md
 !/CONTRIBUTING.md
-!/Gemfile
-!/Gemfile.lock
 !/LICENSE.txt
 !/README.md
+
+# Unignore tests' bundle config
+!/Library/Homebrew/test/.bundle

.gitignore

@@ -1,6 +1,8 @@
 language: ruby
-bundler_args: --path Library/Homebrew/vendor --standalone --jobs 3
-cache: bundler
+cache:
+  directories:
+    - $HOME/.gem/ruby
+    - Library/Homebrew/vendor/bundle
 
 matrix:
   include:
@@ -11,9 +13,6 @@ matrix:
       rvm: 2.0.0
 
 before_install:
-  - export GEM_HOME="$PWD/Library/Homebrew/vendor/ruby/2.0.0"
-  - gem list --installed bundler || gem install bundler
-  - export PATH="$GEM_HOME/bin:$PATH"
   - export HOMEBREW_DEVELOPER=1
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       HOMEBREW_REPOSITORY="$(brew --repo)";

.travis.yml

@@ -8,14 +8,9 @@
 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 @@
   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 @@ def require?(path)
   # 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")
 

Gemfile

@@ -2,7 +2,7 @@
 
 require "hbc/utils/hash_validator"
 
-require "plist"
+require "vendor/plist/plist"
 
 module Hbc
   module Artifact

Gemfile.lock

@@ -26,7 +26,7 @@ def run
       def install_rubocop
         capture_stderr do
           begin
-            Homebrew.run_bundler_if_needed!
+            Homebrew.install_gem_setup_path! "rubocop-cask", HOMEBREW_RUBOCOP_CASK_VERSION, "rubocop"
           rescue SystemExit
             raise CaskError, Tty.strip_ansi($stderr.string).chomp.sub(/\AError: /, "")
           end

Library/Homebrew/brew.rb

@@ -1,5 +1,5 @@
 require "hbc/container/naked"
-require "macho"
+require "vendor/macho/macho"
 
 module Hbc
   class Container

Library/Homebrew/cask/lib/hbc/artifact/pkg.rb

@@ -1,6 +1,6 @@
 require "open3"
 require "shellwords"
-require "plist"
+require "vendor/plist/plist"
 
 require "extend/io"