diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-01 23:29:38 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-01 23:29:38 +0000 |
| commit | be7b5929126cb3e696ef222339237faba9b8fe5a (patch) | |
| tree | 51eae376f93c09bc82dde5a657a91df2c89062e4 /lib/bundler/environment_preserver.rb | |
| parent | ae49dbd392083f69026f2a0fff4a1d5f42d172a7 (diff) | |
Update bundled bundler to 1.16.0.
* lib/bundler, spec/bundler: Merge bundler-1.16.0.
* common.mk: rspec examples of bundler-1.16.0 needs require option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/bundler/environment_preserver.rb')
| -rw-r--r-- | lib/bundler/environment_preserver.rb | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/lib/bundler/environment_preserver.rb b/lib/bundler/environment_preserver.rb index a891f4854d..af7c1ef0a4 100644 --- a/lib/bundler/environment_preserver.rb +++ b/lib/bundler/environment_preserver.rb @@ -1,12 +1,29 @@ # frozen_string_literal: true + module Bundler class EnvironmentPreserver + INTENTIONALLY_NIL = "BUNDLER_ENVIRONMENT_PRESERVER_INTENTIONALLY_NIL".freeze + BUNDLER_KEYS = %w[ + BUNDLE_BIN_PATH + BUNDLE_GEMFILE + BUNDLER_ORIG_MANPATH + BUNDLER_VERSION + GEM_HOME + GEM_PATH + MANPATH + PATH + RB_USER_INSTALL + RUBYLIB + RUBYOPT + ].map(&:freeze).freeze + BUNDLER_PREFIX = "BUNDLER_ORIG_".freeze + # @param env [ENV] # @param keys [Array<String>] def initialize(env, keys) @original = env.to_hash @keys = keys - @prefix = "BUNDLER_ORIG_" + @prefix = BUNDLER_PREFIX end # @return [Hash] @@ -14,9 +31,10 @@ module Bundler env = @original.clone @keys.each do |key| value = env[key] - original_value = env[@prefix + key] - if !value.nil? && !value.empty? && original_value.nil? - env[@prefix + key] = value + if !value.nil? && !value.empty? + env[@prefix + key] ||= value + elsif value.nil? + env[@prefix + key] ||= INTENTIONALLY_NIL end end env @@ -27,10 +45,13 @@ module Bundler env = @original.clone @keys.each do |key| value_original = env[@prefix + key] - unless value_original.nil? || value_original.empty? + next if value_original.nil? || value_original.empty? + if value_original == INTENTIONALLY_NIL + env.delete(key) + else env[key] = value_original - env.delete(@prefix + key) end + env.delete(@prefix + key) end env end |