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/cask/lib/hbc/artifact/pkg.rb         | 2 +-
 Library/Homebrew/cask/lib/hbc/cli/style.rb            | 2 +-
 Library/Homebrew/cask/lib/hbc/container/executable.rb | 2 +-
 Library/Homebrew/cask/lib/hbc/system_command.rb       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Library/Homebrew/cask/lib/hbc')

diff --git a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb b/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
index 1ba2b4b97..c43481c82 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
+++ b/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
@@ -2,7 +2,7 @@ require "hbc/artifact/base"
 
 require "hbc/utils/hash_validator"
 
-require "plist"
+require "vendor/plist/plist"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/cli/style.rb b/Library/Homebrew/cask/lib/hbc/cli/style.rb
index 930742ed7..191aefd3c 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/style.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/style.rb
@@ -26,7 +26,7 @@ module Hbc
       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
diff --git a/Library/Homebrew/cask/lib/hbc/container/executable.rb b/Library/Homebrew/cask/lib/hbc/container/executable.rb
index 61bd4ef9b..848f6d4be 100644
--- a/Library/Homebrew/cask/lib/hbc/container/executable.rb
+++ b/Library/Homebrew/cask/lib/hbc/container/executable.rb
@@ -1,5 +1,5 @@
 require "hbc/container/naked"
-require "macho"
+require "vendor/macho/macho"
 
 module Hbc
   class Container
diff --git a/Library/Homebrew/cask/lib/hbc/system_command.rb b/Library/Homebrew/cask/lib/hbc/system_command.rb
index d610f0fde..c14079bc8 100644
--- a/Library/Homebrew/cask/lib/hbc/system_command.rb
+++ b/Library/Homebrew/cask/lib/hbc/system_command.rb
@@ -1,6 +1,6 @@
 require "open3"
 require "shellwords"
-require "plist"
+require "vendor/plist/plist"
 
 require "extend/io"
 
-- 
cgit v1.2.3