From a76392dd5f7f603e83be7bc1b6df103d731d1bf4 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sun, 7 May 2017 17:28:34 +0100
Subject: Revert "Merge pull request #2602 from MikeMcQuaid/travis-ci-tweaks"

This reverts commit 8d948e4b0b55912c592d34cb5ea83c649b1f9d5e, reversing
changes made to 2372872974d1049c2beafe7dedb7f8f882502058.
---
 Library/Homebrew/dev-cmd/tap-new.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Library/Homebrew/dev-cmd')

diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb
index 0dbb5476d..48449e98d 100644
--- a/Library/Homebrew/dev-cmd/tap-new.rb
+++ b/Library/Homebrew/dev-cmd/tap-new.rb
@@ -46,10 +46,9 @@ module Homebrew
     travis = <<-EOS.undent
       language: ruby
       os: osx
+      env: OSX=10.12
       osx_image: xcode8.3
       rvm: system
-      cache:
-        directories: /usr/local/Homebrew/Library/Homebrew/vendor
 
       before_install:
         - export TRAVIS_COMMIT="$(git rev-parse --verify -q HEAD)"
-- 
cgit v1.2.3


From 57db2e539eaa5fbae351963265312bd24ed08f6b Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sun, 7 May 2017 17:28:39 +0100
Subject: Revert "Merge pull request #2597 from MikeMcQuaid/vendor-gems"

This reverts commit 3e4547f52e7ebec633f8bfefc8a396d944edf908, reversing
changes made to 6edf9382bcc1240ad6f97c8b752cfe56cef9965d.
---
 Library/Homebrew/dev-cmd/audit.rb |  3 ---
 Library/Homebrew/dev-cmd/man.rb   |  2 +-
 Library/Homebrew/dev-cmd/tests.rb | 20 ++++++++++----------
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'Library/Homebrew/dev-cmd')

diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 9ea3faf11..cb25ca794 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -65,9 +65,6 @@ module Homebrew
     ENV.activate_extensions!
     ENV.setup_build_environment
 
-    # Add RubyGems (for RuboCop).
-    ENV["PATH"] = PATH.new(ENV["PATH"]).append(HOMEBREW_GEM_HOME/"bin")
-
     if ARGV.named.empty?
       ff = Formula
       files = Tap.map(&:formula_dir)
diff --git a/Library/Homebrew/dev-cmd/man.rb b/Library/Homebrew/dev-cmd/man.rb
index 6e71c248b..4e5103910 100644
--- a/Library/Homebrew/dev-cmd/man.rb
+++ b/Library/Homebrew/dev-cmd/man.rb
@@ -35,7 +35,7 @@ module Homebrew
   end
 
   def regenerate_man_pages
-    Homebrew.run_bundler_if_needed!
+    Homebrew.install_gem_setup_path! "ronn"
 
     markup = build_man_page
     convert_man_page(markup, TARGET_DOC_PATH/"Manpage.md")
diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index da1f5365c..72d6143fc 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -49,6 +49,8 @@ module Homebrew
         FileUtils.rm_f "test/coverage/.resultset.json"
       end
 
+      ENV["BUNDLE_GEMFILE"] = "#{HOMEBREW_LIBRARY_PATH}/test/Gemfile"
+
       # Override author/committer as global settings might be invalid and thus
       # will cause silent failure during the setup of dummy Git repositories.
       %w[AUTHOR COMMITTER].each do |role|
@@ -57,7 +59,10 @@ module Homebrew
         ENV["GIT_#{role}_DATE"]  = "Sun Jan 22 19:59:13 2017 +0000"
       end
 
-      Homebrew.run_bundler_if_needed!
+      Homebrew.install_gem_setup_path! "bundler"
+      unless quiet_system("bundle", "check")
+        system "bundle", "install"
+      end
 
       parallel = true
 
@@ -101,15 +106,10 @@ module Homebrew
         files = files.reject { |p| p =~ %r{^test/os/linux(/.*|_spec\.rb)$} }
       end
 
-      files.map! { |p| HOMEBREW_LIBRARY_PATH/p }
-
-      (HOMEBREW_LIBRARY_PATH/"vendor/#{RUBY_ENGINE}/#{RUBY_VERSION}").cd do
-        if parallel
-          system "parallel_rspec", *opts, "--", *args, "--", *files
-        else
-          system "rspec", *args, "--", *files
-        end
-        FileUtils.rm_rf "tmp"
+      if parallel
+        system "bundle", "exec", "parallel_rspec", *opts, "--", *args, "--", *files
+      else
+        system "bundle", "exec", "rspec", *args, "--", *files
       end
 
       return if $?.success?
-- 
cgit v1.2.3