From ee253e465b8e2f5acdb53daf572311e87055e082 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sun, 7 May 2017 13:52:57 +0100
Subject: Vendor all Homebrew's gems.

Homebrew's actually ended up using a fair few gems. While we want to
avoid Bundler at runtime (and this PR still does that, in fact uses
Bundler even less at runtime than it did before) writing our own version
to use at build-time seems redundant.
---
 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')

diff --git a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb b/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
index c43481c82..1ba2b4b97 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 "vendor/plist/plist"
+require "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 191aefd3c..930742ed7 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.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
diff --git a/Library/Homebrew/cask/lib/hbc/container/executable.rb b/Library/Homebrew/cask/lib/hbc/container/executable.rb
index 848f6d4be..61bd4ef9b 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 "vendor/macho/macho"
+require "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 c14079bc8..d610f0fde 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 "vendor/plist/plist"
+require "plist"
 
 require "extend/io"
 
-- 
cgit v1.2.3