mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Merge Bundler 2.1.0.pre.3
Features: - Add caller information to some deprecation messages to make them easier to fix [#7361](https://github.com/bundler/bundler/pull/7361) - Reconcile `bundle cache` vs `bundle package` everywhere. Now in docs, CLI help and everywhere else `bundle cache` is the preferred version and `bundle package` remains as an alias [#7389](https://github.com/bundler/bundler/pull/7389) - Display some basic `bundler` documentation together with ruby's RDoc based documentation [#7394](https://github.com/bundler/bundler/pull/7394) Bugfixes: - Fix typos deprecation message and upgrading docs [#7374](https://github.com/bundler/bundler/pull/7374) - Deprecation warnings about `taint` usage on ruby 2.7 [#7385](https://github.com/bundler/bundler/pull/7385) - Fix `--help` flag not correctly delegating to `man` when used with command aliases [#7388](https://github.com/bundler/bundler/pull/7388) - `bundle add` should cache newly added gems if an application cache exists [#7393](https://github.com/bundler/bundler/pull/7393) - Stop using an insecure folder as a "fallback home" when user home is not defined [#7416](https://github.com/bundler/bundler/pull/7416) - Fix `bundler/inline` warning about `Bundler.root` redefinition [#7417](https://github.com/bundler/bundler/pull/7417)
This commit is contained in:
parent
fd69f82675
commit
7585bc3187
Notes:
git
2019-11-11 18:56:53 +09:00
158 changed files with 1920 additions and 1521 deletions
|
@ -38,6 +38,8 @@ def gemfile(install = false, options = {}, &gemfile)
|
|||
raise ArgumentError, "Unknown options: #{opts.keys.join(", ")}" unless opts.empty?
|
||||
|
||||
old_root = Bundler.method(:root)
|
||||
bundler_module = class << Bundler; self; end
|
||||
bundler_module.send(:remove_method, :root)
|
||||
def Bundler.root
|
||||
Bundler::SharedHelpers.pwd.expand_path
|
||||
end
|
||||
|
@ -56,7 +58,7 @@ def gemfile(install = false, options = {}, &gemfile)
|
|||
definition.missing_specs?
|
||||
end
|
||||
|
||||
Bundler.ui = ui if install
|
||||
Bundler.ui = install ? ui : Bundler::UI::Silent.new
|
||||
if install || missing_specs.call
|
||||
Bundler.settings.temporary(:inline => true, :disable_platform_warnings => true) do
|
||||
installer = Bundler::Installer.install(Bundler.root, definition, :system => true)
|
||||
|
@ -70,6 +72,8 @@ def gemfile(install = false, options = {}, &gemfile)
|
|||
runtime.setup.require
|
||||
end
|
||||
ensure
|
||||
bundler_module = class << Bundler; self; end
|
||||
bundler_module.send(:define_method, :root, old_root) if old_root
|
||||
if bundler_module
|
||||
bundler_module.send(:remove_method, :root)
|
||||
bundler_module.send(:define_method, :root, old_root)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue