Merge pull request #5780 from MikeMcQuaid/tests-vendor-join-gemfile

Unify test/vendor Gemfiles and bundler configuration.

.gitignore

@@ -22,107 +22,132 @@
 # Ignore Bundler files
 **/.bundle/bin
 **/.bundle/cache
-**/vendor/bundle
-**/vendor/ruby
-**/vendor/bundle-standalone/ruby/*/bin
-**/vendor/bundle-standalone/ruby/*/build_info/
-**/vendor/bundle-standalone/ruby/*/cache
-**/vendor/bundle-standalone/ruby/*/extensions
-**/vendor/bundle-standalone/ruby/*/gems/*/*
-**/vendor/bundle-standalone/ruby/*/specifications
+**/vendor/bundle/ruby/*/bin
+**/vendor/bundle/ruby/*/build_info/
+**/vendor/bundle/ruby/*/cache
+**/vendor/bundle/ruby/*/extensions
+**/vendor/bundle/ruby/*/gems/*/*
+**/vendor/bundle/ruby/*/specifications
 
 # Unignore vendored gems
-!**/vendor/bundle-standalone/ruby/*/gems/*/lib
-!**/vendor/bundle-standalone/ruby/*/gems/rubocop-rspec-*/config
+!**/vendor/bundle/ruby/*/gems/*/lib
+!**/vendor/bundle/ruby/*/gems/rubocop-rspec-*/config
 
 # Ignore partially included gems where we don't need all files
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support.rb
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/all.rb
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/cache.rb
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/cache/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/concurrency/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/dependencies.rb
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/dependencies/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/duration/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/json.rb
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/json/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/log_subscriber.rb
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/log_subscriber/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/messages/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/multibyte/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/number_helper.rb
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/number_helper/
-**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/testing/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/latest.rb
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/rails.rb
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/version.rb
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/1.*
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.0*
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.1*
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.2*
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.3*
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.6*
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.*.rb
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/force/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/rails/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/random/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/array/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/comparable/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/dir/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/enumerable/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/false_class/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/fixnum/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/float/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/hash/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/integer/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/kernel/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/module/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/nil_class/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/regexp/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/struct/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/struct/
-**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/true_class/
-**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/atomic/
-**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/atomic_reference/
-**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/collection/
-**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/concern/
-**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/executor/
-**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/synchronization/
-**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/thread_safe/
-**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/utility/
-**/vendor/bundle-standalone/ruby/*/gems/i18n-*/lib/i18n/tests*
-**/vendor/bundle-standalone/ruby/*/gems/thread_safe-*/lib/thread_safe/util
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support.rb
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/all.rb
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/cache.rb
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/cache/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/concurrency/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/dependencies.rb
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/dependencies/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/duration/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/json.rb
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/json/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/log_subscriber.rb
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/log_subscriber/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/messages/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/multibyte/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/number_helper.rb
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/number_helper/
+**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/testing/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/latest.rb
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/rails.rb
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/version.rb
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/1.*
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.0*
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.1*
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.2*
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.3*
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.6*
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.*.rb
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/force/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/rails/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/random/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/array/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/comparable/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/dir/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/enumerable/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/false_class/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/fixnum/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/float/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/hash/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/integer/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/kernel/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/module/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/nil_class/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/regexp/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/struct/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/struct/
+**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/true_class/
+**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/atomic/
+**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/atomic_reference/
+**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/collection/
+**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/concern/
+**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/executor/
+**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/synchronization/
+**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/thread_safe/
+**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/utility/
+**/vendor/bundle/ruby/*/gems/i18n-*/lib/i18n/tests*
+**/vendor/bundle/ruby/*/gems/thread_safe-*/lib/thread_safe/util
 
-# Ignore rubocop's (and other) dependencies we don't wish to vendor
-**/vendor/bundle-standalone/ruby/*/gems/ast-*/
-**/vendor/bundle-standalone/ruby/*/gems/connection_pool-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/domain_name-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/http-cookie-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/jaro_winkler-*/
-**/vendor/bundle-standalone/ruby/*/gems/mime-types-data-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/mime-types-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/mini_portile2-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/minitest-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/net-http-digest_auth-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/net-http-persistent-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/nokogiri-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/ntlm-http-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/parallel-*/
-**/vendor/bundle-standalone/ruby/*/gems/parser-*/
-**/vendor/bundle-standalone/ruby/*/gems/powerpack-*/
-**/vendor/bundle-standalone/ruby/*/gems/psych-*/
-**/vendor/bundle-standalone/ruby/*/gems/rainbow-*/
-**/vendor/bundle-standalone/ruby/*/gems/rubocop-0*/
-**/vendor/bundle-standalone/ruby/*/gems/ruby-progressbar-*/
-**/vendor/bundle-standalone/ruby/*/gems/unf_ext-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/unf-*/lib
-**/vendor/bundle-standalone/ruby/*/gems/unicode-display_width-*/
-**/vendor/bundle-standalone/ruby/*/gems/webrobots-*/lib
+# Ignore dependencies we don't wish to vendor
+**/vendor/bundle/ruby/*/gems/ast-*/
+**/vendor/bundle/ruby/*/gems/bundler-*/
+**/vendor/bundle/ruby/*/gems/coderay-*/
+**/vendor/bundle/ruby/*/gems/connection_pool-*/
+**/vendor/bundle/ruby/*/gems/coveralls-*/
+**/vendor/bundle/ruby/*/gems/diff-lcs-*/
+**/vendor/bundle/ruby/*/gems/docile-*/
+**/vendor/bundle/ruby/*/gems/domain_name-*/
+**/vendor/bundle/ruby/*/gems/http-cookie-*/
+**/vendor/bundle/ruby/*/gems/hpricot-*/
+**/vendor/bundle/ruby/*/gems/jaro_winkler-*/
+**/vendor/bundle/ruby/*/gems/json-*/
+**/vendor/bundle/ruby/*/gems/method_source-*/
+**/vendor/bundle/ruby/*/gems/mime-types-data-*/
+**/vendor/bundle/ruby/*/gems/mime-types-*/
+**/vendor/bundle/ruby/*/gems/mini_portile2-*/
+**/vendor/bundle/ruby/*/gems/minitest-*/
+**/vendor/bundle/ruby/*/gems/mustache-*/
+**/vendor/bundle/ruby/*/gems/net-http-digest_auth-*/
+**/vendor/bundle/ruby/*/gems/net-http-persistent-*/
+**/vendor/bundle/ruby/*/gems/nokogiri-*/
+**/vendor/bundle/ruby/*/gems/ntlm-http-*/
+**/vendor/bundle/ruby/*/gems/parallel-*/
+**/vendor/bundle/ruby/*/gems/parallel_tests-*/
+**/vendor/bundle/ruby/*/gems/parser-*/
+**/vendor/bundle/ruby/*/gems/powerpack-*/
+**/vendor/bundle/ruby/*/gems/psych-*/
+**/vendor/bundle/ruby/*/gems/pry-*/
+**/vendor/bundle/ruby/*/gems/rainbow-*/
+**/vendor/bundle/ruby/*/gems/rdiscount-*/
+**/vendor/bundle/ruby/*/gems/ronn-*/
+**/vendor/bundle/ruby/*/gems/rspec-*/
+**/vendor/bundle/ruby/*/gems/rspec-core-*/
+**/vendor/bundle/ruby/*/gems/rspec-expectations-*/
+**/vendor/bundle/ruby/*/gems/rspec-its-*/
+**/vendor/bundle/ruby/*/gems/rspec-mocks-*/
+**/vendor/bundle/ruby/*/gems/rspec-retry-*/
+**/vendor/bundle/ruby/*/gems/rspec-support-*/
+**/vendor/bundle/ruby/*/gems/rspec-wait-*/
+**/vendor/bundle/ruby/*/gems/rubocop-0*/
+**/vendor/bundle/ruby/*/gems/ruby-progressbar-*/
+**/vendor/bundle/ruby/*/gems/simplecov-*/
+**/vendor/bundle/ruby/*/gems/simplecov-cobertura-*/
+**/vendor/bundle/ruby/*/gems/simplecov-html-*/
+**/vendor/bundle/ruby/*/gems/term-ansicolor-*/
+**/vendor/bundle/ruby/*/gems/thor-*/
+**/vendor/bundle/ruby/*/gems/tins-*/
+**/vendor/bundle/ruby/*/gems/unf_ext-*/
+**/vendor/bundle/ruby/*/gems/unf-*/
+**/vendor/bundle/ruby/*/gems/unicode-display_width-*/
+**/vendor/bundle/ruby/*/gems/webrobots-*/
 
 # Only include the `Mechanize::HTTP::ContentDispositionParser`.
-**/vendor/bundle-standalone/ruby/*/gems/mechanize-*/lib
-!**/vendor/bundle-standalone/ruby/*/gems/mechanize-*/lib/mechanize/http/content_disposition_parser.rb
-!**/vendor/bundle-standalone/ruby/*/gems/mechanize-*/lib/mechanize/version.rb
+**/vendor/bundle/ruby/*/gems/mechanize-*/lib
+!**/vendor/bundle/ruby/*/gems/mechanize-*/lib/mechanize/http/content_disposition_parser.rb
+!**/vendor/bundle/ruby/*/gems/mechanize-*/lib/mechanize/version.rb
 
 # Ignore `bin` contents (again).
 /bin

Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update \
 		fonts-dejavu-core \
 		g++ \
 		git \
+		libz-dev \
 		locales \
 		make \
 		openssh-client \

Library/Homebrew/.bundle/config

@@ -1,6 +1,6 @@
 ---
-BUNDLE_BIN: "../bin"
-BUNDLE_PATH: "../vendor/bundle"
+BUNDLE_BIN: "false"
 BUNDLE_DISABLE_SHARED_GEMS: "true"
 BUNDLE_JOBS: "4"
+BUNDLE_PATH: "vendor/bundle"
 BUNDLE_RETRY: "3"

Library/Homebrew/Gemfile

@@ -0,0 +1,22 @@
+source "https://rubygems.org"
+
+# installed gems
+gem "coveralls", require: false
+gem "parallel_tests"
+gem "ronn", require: false
+gem "rspec"
+gem "rspec-its", require: false
+gem "rspec-retry", require: false
+gem "rspec-wait", require: false
+gem "rubocop"
+gem "simplecov", require: false
+gem "simplecov-cobertura", require: false
+
+# vendored gems
+gem "activesupport"
+gem "backports"
+gem "concurrent-ruby"
+gem "mechanize"
+gem "plist"
+gem "rubocop-rspec"
+gem "ruby-macho"

Library/Homebrew/Gemfile.lock

@@ -1,7 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     ast (2.4.0)
+    backports (3.12.0)
+    concurrent-ruby (1.1.4)
+    connection_pool (2.2.2)
     coveralls (0.8.22)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -10,15 +18,42 @@ GEM
       tins (~> 1.6)
     diff-lcs (1.3)
     docile (1.3.1)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
     hpricot (0.8.6)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    i18n (1.5.3)
+      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     json (2.1.0)
+    mechanize (2.7.6)
+      domain_name (~> 0.5, >= 0.5.1)
+      http-cookie (~> 1.0)
+      mime-types (>= 1.17.2)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (>= 2.5.2)
+      nokogiri (~> 1.6)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (>= 0.0.9, < 0.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
     mustache (1.1.0)
+    net-http-digest_auth (1.4.1)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    ntlm-http (0.1.1)
     parallel (1.13.0)
     parallel_tests (2.28.0)
       parallel
     parser (2.6.0.0)
       ast (~> 2.4.0)
+    plist (3.5.0)
     powerpack (0.1.2)
     psych (3.1.0)
     rainbow (3.0.0)
@@ -56,6 +91,9 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
+    rubocop-rspec (1.32.0)
+      rubocop (>= 0.60.0)
+    ruby-macho (2.2.0)
     ruby-progressbar (1.10.0)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -67,23 +105,37 @@ GEM
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.19.4)
+    thread_safe (0.3.6)
     tins (1.20.2)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
     unicode-display_width (1.4.1)
+    webrobots (0.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
+  backports
+  concurrent-ruby
   coveralls
+  mechanize
   parallel_tests
+  plist
   ronn
   rspec
   rspec-its
   rspec-retry
   rspec-wait
   rubocop
+  rubocop-rspec
+  ruby-macho
   simplecov
   simplecov-cobertura
 
 BUNDLED WITH
-   1.16.6
+   2.0.1

Library/Homebrew/cleanup.rb

@@ -1,4 +1,5 @@
 require "utils/bottles"
+require "utils/gems"
 require "formula"
 require "cask/cask_loader"
 require "set"
@@ -198,6 +199,8 @@ module Homebrew
           FileUtils.touch PERIODIC_CLEAN_FILE
         end
 
+        cleanup_bundler
+
         # Cleaning up Ruby needs to be done last to avoid requiring additional
         # files afterwards. Additionally, don't allow it on periodic cleans to
         # avoid having to try to do a `brew install` when we've just deleted
@@ -348,6 +351,21 @@ module Homebrew
       end
     end
 
+    def cleanup_bundler
+      HOMEBREW_LIBRARY_PATH.cd do
+        Homebrew.setup_gem_environment!
+        bundle = "#{Gem.bindir}/bundle"
+        return unless File.executable?(bundle)
+        return if Gem::Specification.find_all_by_name("bundler").empty?
+
+        if dry_run?
+          system bundle, "clean", "--dry-run"
+        else
+          system bundle, "clean"
+        end
+      end
+    end
+
     def cleanup_portable_ruby
       system_ruby_version =
         Utils.popen_read("/usr/bin/ruby", "-e", "puts RUBY_VERSION")

Library/Homebrew/dev-cmd/tests.rb

@@ -82,7 +82,7 @@ module Homebrew
           ["test/#{test_name}_spec.rb:#{line}"]
         end
       else
-        Dir.glob("test/**/*_spec.rb").reject { |p| p =~ %r{^test/vendor/bundle/} }
+        Dir.glob("test/**/*_spec.rb")
       end
 
       opts = if ENV["CI"]

Library/Homebrew/dev-cmd/vendor-gems.rb

@@ -21,12 +21,12 @@ module Homebrew
     Homebrew.install_bundler!
 
     ohai "cd #{HOMEBREW_LIBRARY_PATH}/vendor"
-    (HOMEBREW_LIBRARY_PATH/"vendor").cd do
+    HOMEBREW_LIBRARY_PATH.cd do
       ohai "bundle install --standalone"
       safe_system "bundle", "install", "--standalone"
 
-      ohai "git add bundle-standalone"
-      system "git", "add", "bundle-standalone"
+      ohai "git add vendor/bundle"
+      system "git", "add", "vendor/bundle"
 
       if Formula["gpg"].installed?
         ENV["PATH"] = PATH.new(ENV["PATH"])

Library/Homebrew/load_path.rb

@@ -4,4 +4,4 @@ HOMEBREW_LIBRARY_PATH = Pathname(__dir__).realpath
 
 $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s) unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s)
 
-require "vendor/bundle-standalone/bundler/setup"
+require "vendor/bundle/bundler/setup"

Library/Homebrew/test/Gemfile

@@ -1,18 +0,0 @@
-source "https://rubygems.org"
-
-gem "parallel_tests"
-gem "rspec"
-gem "rspec-its", require: false
-gem "rspec-retry", require: false
-gem "rspec-wait", require: false
-gem "rubocop"
-
-group :development do
-  gem "ronn", require: false
-end
-
-group :coverage do
-  gem "coveralls", require: false
-  gem "simplecov", require: false
-  gem "simplecov-cobertura", require: false
-end

Library/Homebrew/utils/gems.rb

@@ -61,9 +61,9 @@ module Homebrew
   def install_bundler_gems!
     install_bundler!
 
-    ENV["BUNDLE_GEMFILE"] = "#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/test/Gemfile"
+    ENV["BUNDLE_GEMFILE"] = "#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/Gemfile"
     @bundle_installed ||= begin
-      bundle_check_output = `#{Gem.bindir}/bundle check`
+      bundle_check_output = `#{Gem.bindir}/bundle check 2>&1`
       bundle_check_failed = !$CHILD_STATUS.exitstatus.zero?
 
       # for some reason sometimes the exit code lies so check the output too.

Library/Homebrew/utils/ruby.sh

@@ -47,7 +47,6 @@ setup-ruby-path() {
         then
           odie "Failed to install vendor Ruby."
         fi
-        rm -rf "$vendor_dir/bundle/ruby"
         HOMEBREW_RUBY_PATH="$vendor_ruby_path"
       fi
     fi

Library/Homebrew/vendor/.bundle/config

@@ -1,5 +0,0 @@
----
-BUNDLE_PATH: "bundle-standalone"
-BUNDLE_DISABLE_SHARED_GEMS: "true"
-BUNDLE_BIN: "false"
-BUNDLE_CLEAN: "true"

Library/Homebrew/vendor/Gemfile

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-gem "activesupport"
-gem "concurrent-ruby"
-gem "backports"
-gem "mechanize"
-gem "plist"
-gem "ruby-macho"
-gem "rubocop-rspec"
-gem "rubocop"

Library/Homebrew/vendor/Gemfile.lock

@@ -1,83 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ast (2.4.0)
-    backports (3.12.0)
-    concurrent-ruby (1.1.4)
-    connection_pool (2.2.2)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    i18n (1.5.3)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    mechanize (2.7.6)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (>= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (>= 2.5.2)
-      nokogiri (~> 1.6)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    net-http-digest_auth (1.4.1)
-    net-http-persistent (3.0.0)
-      connection_pool (~> 2.2)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    ntlm-http (0.1.1)
-    parallel (1.13.0)
-    parser (2.6.0.0)
-      ast (~> 2.4.0)
-    plist (3.5.0)
-    powerpack (0.1.2)
-    psych (3.1.0)
-    rainbow (3.0.0)
-    rubocop (0.65.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      psych (>= 3.1.0)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-rspec (1.32.0)
-      rubocop (>= 0.60.0)
-    ruby-macho (2.2.0)
-    ruby-progressbar (1.10.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.1)
-    webrobots (0.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  backports
-  concurrent-ruby
-  mechanize
-  plist
-  rubocop
-  rubocop-rspec
-  ruby-macho
-
-BUNDLED WITH
-   1.17.1

Library/Homebrew/vendor/bundle/bundler/setup.rb

@@ -13,10 +13,22 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/backports-3.12.0/lib"
 $:.unshift "#{path}/"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.2/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/json-2.1.0"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json-2.1.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.10.2/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.16.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tins-1.20.2/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/term-ansicolor-1.7.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thor-0.19.4/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coveralls-0.8.22/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/diff-lcs-1.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/unf_ext-0.0.7.5"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf_ext-0.0.7.5/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf-0.1.4/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/domain_name-0.5.20180417/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/hpricot-0.8.6"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/hpricot-0.8.6/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/http-cookie-1.0.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/jaro_winkler-1.5.2"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/jaro_winkler-1.5.2/lib"
@@ -30,15 +42,29 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/nokogiri-1.10.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ntlm-http-0.1.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/webrobots-0.1.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mechanize-2.7.6/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mustache-1.1.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.13.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-2.28.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-2.6.0.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.5.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/powerpack-0.1.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/psych-3.1.0"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/psych-3.1.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/rdiscount-2.2.0.1"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ronn-0.7.3/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-support-3.8.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-core-3.8.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-expectations-3.8.2/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-mocks-3.8.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.8.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-its-1.2.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-retry-0.6.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.4.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.65.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.32.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-cobertura-1.3.0/lib"