Auto merge of #4713 - bundler:seg-postit-trampoline-load-path, r=segi…

…ddins

[Trampoline] Dont change the load path just for postit

Rakefile

@@ -309,11 +309,8 @@ begin
   Automatiek::RakeTask.new("postit") do |lib|
     lib.download = { :github => "https://github.com/bundler/postit" }
     lib.namespace = "PostIt"
+    lib.prefix = "BundlerVendoredPostIt"
     lib.vendor_lib = "lib/bundler/vendor/postit"
-
-    def lib.namespace_files
-      process_files(namespace, "BundlerVendoredPostIt")
-    end
   end
 rescue LoadError
   namespace :vendor do

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 @@
 
 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
@@ -53,5 +52,3 @@
 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))

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

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 @@ def lockfile
     end
 
     def lockfile_version
-      BundlerVendoredPostIt::Parser.new(lockfile).parse
+      BundlerVendoredPostIt::PostIt::Parser.new(lockfile).parse
     end
 
     def bundler_version

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

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

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

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