From 5712f9705a46f9cb2ea2775d53a90671499ecc60 Mon Sep 17 00:00:00 2001
From: Homu <homu@barosl.com>
Date: Sat, 25 Jun 2016 13:11:16 +0900
Subject: Auto merge of #4713 - bundler:seg-postit-trampoline-load-path,
 r=segiddins

[Trampoline] Dont change the load path just for postit

(cherry picked from commit bacb0e7835996df44681f84bf662dbe0fb9deb30)
---
 lib/bundler/postit_trampoline.rb                    | 11 ++++-------
 lib/bundler/vendor/postit/lib/postit.rb             | 10 +++++-----
 lib/bundler/vendor/postit/lib/postit/environment.rb |  6 +++---
 lib/bundler/vendor/postit/lib/postit/installer.rb   |  2 +-
 lib/bundler/vendor/postit/lib/postit/parser.rb      |  2 +-
 lib/bundler/vendor/postit/lib/postit/setup.rb       |  8 ++++----
 lib/bundler/vendor/postit/lib/postit/version.rb     |  4 ++--
 7 files changed, 20 insertions(+), 23 deletions(-)

(limited to 'lib')

diff --git a/lib/bundler/postit_trampoline.rb b/lib/bundler/postit_trampoline.rb
index 7406612e..9a7fed4f 100644
--- a/lib/bundler/postit_trampoline.rb
+++ b/lib/bundler/postit_trampoline.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-postit_lib = File.expand_path("../vendor/postit/lib", __FILE__)
-$:.unshift(postit_lib)
-require "postit"
+module BundlerVendoredPostIt; end
+require "bundler/vendor/postit/lib/postit"
 require "rubygems"
 
-environment = BundlerVendoredPostIt::Environment.new([])
+environment = BundlerVendoredPostIt::PostIt::Environment.new([])
 version = Gem::Requirement.new(environment.bundler_version)
 
 installed_version =
@@ -19,7 +18,7 @@ installed_version &&= Gem::Version.new(installed_version)
 
 if !version.satisfied_by?(installed_version)
   begin
-    installer = BundlerVendoredPostIt::Installer.new(version)
+    installer = BundlerVendoredPostIt::PostIt::Installer.new(version)
     installer.install!
   rescue => e
     abort <<-EOS.strip
@@ -50,5 +49,3 @@ end
 if !Gem::Version.correct?(running_version.to_s) || !version.satisfied_by?(Gem::Version.create(running_version))
   abort "The running bundler (#{running_version}) does not match the required `#{version}`"
 end
-
-$:.delete_at($:.find_index(postit_lib))
diff --git a/lib/bundler/vendor/postit/lib/postit.rb b/lib/bundler/vendor/postit/lib/postit.rb
index 4b3ff34d..e07dfcca 100644
--- a/lib/bundler/vendor/postit/lib/postit.rb
+++ b/lib/bundler/vendor/postit/lib/postit.rb
@@ -1,10 +1,10 @@
-require 'postit/environment'
-require 'postit/installer'
-require 'postit/parser'
-require 'postit/version'
+require 'bundler/vendor/postit/lib/postit/environment'
+require 'bundler/vendor/postit/lib/postit/installer'
+require 'bundler/vendor/postit/lib/postit/parser'
+require 'bundler/vendor/postit/lib/postit/version'
 require 'rubygems'
 
-module BundlerVendoredPostIt
+module BundlerVendoredPostIt::PostIt
   def self.setup
     load File.expand_path('../postit/setup.rb', __FILE__)
   end
diff --git a/lib/bundler/vendor/postit/lib/postit/environment.rb b/lib/bundler/vendor/postit/lib/postit/environment.rb
index b758fa0c..0c27f2cd 100644
--- a/lib/bundler/vendor/postit/lib/postit/environment.rb
+++ b/lib/bundler/vendor/postit/lib/postit/environment.rb
@@ -1,6 +1,6 @@
-require 'postit/parser'
+require 'bundler/vendor/postit/lib/postit/parser'
 
-module BundlerVendoredPostIt
+module BundlerVendoredPostIt::PostIt
   class Environment
     def initialize(argv)
       @argv = argv
@@ -31,7 +31,7 @@ module BundlerVendoredPostIt
     end
 
     def lockfile_version
-      BundlerVendoredPostIt::Parser.new(lockfile).parse
+      BundlerVendoredPostIt::PostIt::Parser.new(lockfile).parse
     end
 
     def bundler_version
diff --git a/lib/bundler/vendor/postit/lib/postit/installer.rb b/lib/bundler/vendor/postit/lib/postit/installer.rb
index 4139038d..5fa34b69 100644
--- a/lib/bundler/vendor/postit/lib/postit/installer.rb
+++ b/lib/bundler/vendor/postit/lib/postit/installer.rb
@@ -1,4 +1,4 @@
-module BundlerVendoredPostIt
+module BundlerVendoredPostIt::PostIt
   class Installer
     def initialize(bundler_version)
       @bundler_version = bundler_version
diff --git a/lib/bundler/vendor/postit/lib/postit/parser.rb b/lib/bundler/vendor/postit/lib/postit/parser.rb
index 98c4a357..7b2eb72f 100644
--- a/lib/bundler/vendor/postit/lib/postit/parser.rb
+++ b/lib/bundler/vendor/postit/lib/postit/parser.rb
@@ -1,6 +1,6 @@
 require 'rubygems'
 
-module BundlerVendoredPostIt
+module BundlerVendoredPostIt::PostIt
   class Parser
     def initialize(file)
       @file = file
diff --git a/lib/bundler/vendor/postit/lib/postit/setup.rb b/lib/bundler/vendor/postit/lib/postit/setup.rb
index 260edd55..2580e7b7 100644
--- a/lib/bundler/vendor/postit/lib/postit/setup.rb
+++ b/lib/bundler/vendor/postit/lib/postit/setup.rb
@@ -1,10 +1,10 @@
-require 'postit/environment'
-require 'postit/installer'
+require 'bundler/vendor/postit/lib/postit/environment'
+require 'bundler/vendor/postit/lib/postit/installer'
 
-environment = BundlerVendoredPostIt::Environment.new(ARGV)
+environment = BundlerVendoredPostIt::PostIt::Environment.new(ARGV)
 version = environment.bundler_version
 
-installer = BundlerVendoredPostIt::Installer.new(version)
+installer = BundlerVendoredPostIt::PostIt::Installer.new(version)
 installer.install!
 
 gem 'bundler', version
diff --git a/lib/bundler/vendor/postit/lib/postit/version.rb b/lib/bundler/vendor/postit/lib/postit/version.rb
index 1a165010..b5417525 100644
--- a/lib/bundler/vendor/postit/lib/postit/version.rb
+++ b/lib/bundler/vendor/postit/lib/postit/version.rb
@@ -1,3 +1,3 @@
-module BundlerVendoredPostIt
-  VERSION = '0.1.2'.freeze
+module BundlerVendoredPostIt::PostIt
+  VERSION = '0.2.0'.freeze
 end
-- 
cgit v1.2.3