Merge pull request #2597 from MikeMcQuaid/vendor-gems

Vendor all Homebrew's gems.

Author: MikeMcQuaid

.bundle/config

@@ -0,0 +1,5 @@
+---
+BUNDLE_CLEAN: "true"
+BUNDLE_DISABLE_SHARED_GEMS: "true"
+BUNDLE_PATH: "Library/Homebrew/vendor"
+BUNDLE_JOBS: "3"

.gitignore

@@ -8,24 +8,35 @@
 !/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 vendored files within `Library`.
+# Ignore some 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
@@ -50,13 +61,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

.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
-cache:
-  directories:
-    - $HOME/.gem/ruby
-    - Library/Homebrew/vendor/bundle
+bundler_args: --path Library/Homebrew/vendor --standalone --jobs 3
+cache: bundler
 
 matrix:
   include:
@@ -13,6 +11,9 @@ 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)";

Gemfile

@@ -0,0 +1,36 @@
+source "https://rubygems.org"
+
+# brew *
+gem "ruby-macho"
+
+# brew cask
+gem "plist"
+
+# brew cask style
+group :cask_style do
+  gem "rubocop-cask", "~> 0.12.0"
+end
+
+# brew man
+group :man do
+  gem "ronn"
+end
+
+# brew style
+group :style do
+  gem "rubocop", "~> 0.47.1"
+end
+
+# brew tests
+group :tests do
+  gem "parallel_tests"
+  gem "rspec"
+  gem "rspec-its", require: false
+  gem "rspec-wait", require: false
+end
+
+# brew tests --coverage
+group :coverage do
+  gem "codecov", require: false
+  gem "simplecov", require: false
+end

Gemfile.lock

@@ -0,0 +1,84 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    codecov (0.1.10)
+      json
+      simplecov
+      url
+    diff-lcs (1.3)
+    docile (1.1.5)
+    hpricot (0.8.6)
+    json (2.1.0)
+    mustache (1.0.5)
+    parallel (1.11.1)
+    parallel_tests (2.14.1)
+      parallel
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    plist (3.3.0)
+    powerpack (0.1.1)
+    public_suffix (2.0.5)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
+    rdiscount (2.2.0.1)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rspec-wait (0.0.9)
+      rspec (>= 3, < 4)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-cask (0.12.0)
+      public_suffix (~> 2.0)
+      rubocop (~> 0.47.1)
+    ruby-macho (1.1.0)
+    ruby-progressbar (1.8.1)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    unicode-display_width (1.2.1)
+    url (0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  codecov
+  parallel_tests
+  plist
+  ronn
+  rspec
+  rspec-its
+  rspec-wait
+  rubocop (~> 0.47.1)
+  rubocop-cask (~> 0.12.0)
+  ruby-macho
+  simplecov
+
+BUNDLED WITH
+   1.14.6

Library/Homebrew/brew.rb

@@ -8,9 +8,14 @@
 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(__FILE__).realpath.parent
-$:.unshift(HOMEBREW_LIBRARY_PATH.to_s)
+HOMEBREW_LIBRARY_PATH = Pathname.new(homebrew_library_path)
+
 require "global"
 require "tap"
 
@@ -20,6 +25,8 @@
   exit 0
 end
 
+HOMEBREW_GEM_HOME = HOMEBREW_LIBRARY_PATH/"vendor/#{RUBY_ENGINE}/#{RUBY_VERSION}"
+
 def require?(path)
   require path
 rescue LoadError => e
@@ -52,6 +59,14 @@ 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")
 

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

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

Library/Homebrew/cask/lib/hbc/cli/style.rb

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

Library/Homebrew/cask/lib/hbc/container/executable.rb

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

Library/Homebrew/cask/lib/hbc/system_command.rb

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