From d8044958126984a48f21d0ce659bbc2f06b80cbc Mon Sep 17 00:00:00 2001 From: Tim Morgan Date: Thu, 13 Feb 2020 16:01:47 -0600 Subject: [PATCH] When is Bundler loaded? (this is nuts) --- bin/puma-wild | 7 ++++++- lib/puma/launcher.rb | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/puma-wild b/bin/puma-wild index 9bbd1e35..8eb2902e 100644 --- a/bin/puma-wild +++ b/bin/puma-wild @@ -3,6 +3,7 @@ # Copyright (c) 2014 Evan Phoenix # +puts "puma-wild 111 defined?(Bundler) = #{defined?(Bundler).inspect}" require 'rubygems' gems = ARGV.shift @@ -15,18 +16,22 @@ if gems == "-I" gems = ARGV.shift end +p gems + gems.split(",").each do |s| name, ver = s.split(":",2) gem name, ver end +puts "puma-wild 222 defined?(Bundler) = #{defined?(Bundler).inspect}" + module Puma; end Puma.const_set("WILD_ARGS", ["-I", inc, gems]) require 'puma/cli' +puts "puma-wild 333 defined?(Bundler) = #{defined?(Bundler).inspect}" cli = Puma::CLI.new ARGV -puts "puma-wild defined?(Bundler) = #{defined?(Bundler).inspect}" cli.run diff --git a/lib/puma/launcher.rb b/lib/puma/launcher.rb index c457c7fd..98025d2b 100644 --- a/lib/puma/launcher.rb +++ b/lib/puma/launcher.rb @@ -300,8 +300,7 @@ module Puma log "* Pruning Bundler environment" home = ENV['GEM_HOME'] - #Bundler.with_original_env do - Bundler.with_clean_env do + Bundler.with_original_env do ENV['GEM_HOME'] = home ENV['PUMA_BUNDLER_PRUNED'] = '1' args = [Gem.ruby, puma_wild_location, '-I', dirs.join(':'), deps.join(',')] + @original_argv