diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-15 08:32:54 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-15 10:54:09 +0900 |
commit | 2fa9f3c0322570dfb1672b49bc1f3306ef595131 (patch) | |
tree | bdb2889c822e634f931d27f2ca81c6192e6e5b0e /lib/bundler.rb | |
parent | 7898f4243f5df9ead0bf91cc8c40907c559d18c0 (diff) |
Prepare to release rubygems-3.2.1 and bundler-2.2.1
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3901
Diffstat (limited to 'lib/bundler.rb')
-rw-r--r-- | lib/bundler.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 0ddd2c7f88..7a01de5ddb 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -212,6 +212,15 @@ module Bundler end end + def locked_bundler_version + return nil unless defined?(@definition) && @definition + + locked_gems = definition.locked_gems + return nil unless locked_gems + + locked_gems.bundler_version + end + def ruby_scope "#{Bundler.rubygems.ruby_engine}/#{RbConfig::CONFIG["ruby_version"]}" end @@ -602,8 +611,9 @@ EOF reset_rubygems! end - def reset_settings! + def reset_settings_and_root! @settings = nil + @root = nil end def reset_paths! |