diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-12-25 06:27:56 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-12-25 07:40:52 +0900 |
| commit | da6a5e3ed16ab0cdda7546dd9caf55c59be7b86f (patch) | |
| tree | bd6f624e694dc6b96ce429c1100d3ab240001c19 /lib | |
| parent | 2b2115318b4ee236ef61a3450bf85b16e591006d (diff) | |
Merge RubyGems-3.3.3 and Bundler-2.3.3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5342
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/cli/install.rb | 3 | ||||
| -rw-r--r-- | lib/bundler/settings.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems.rb | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index 85f702bc64..c3400c3959 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -165,9 +165,6 @@ module Bundler def normalize_settings Bundler.settings.set_command_option :path, nil if options[:system] - Bundler.settings.temporary(:path_relative_to_cwd => false) do - Bundler.settings.set_command_option :path, "vendor/bundle" if Bundler.settings[:deployment] && Bundler.settings[:path].nil? - end Bundler.settings.set_command_option_if_given :path, options[:path] Bundler.settings.temporary(:path_relative_to_cwd => false) do Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil? diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 1ced590b6f..72728fb20f 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -219,6 +219,7 @@ module Bundler def path configs.each do |_level, settings| path = value_for("path", settings) + path = "vendor/bundle" if value_for("deployment", settings) && path.nil? path_system = value_for("path.system", settings) disabled_shared_gems = value_for("disable_shared_gems", settings) next if path.nil? && path_system.nil? && disabled_shared_gems.nil? diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index a7ccc9c201..a7d32cb0a1 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.3.2".freeze + VERSION = "2.3.3".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i diff --git a/lib/rubygems.rb b/lib/rubygems.rb index ddadd0f797..e24580c5b8 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -8,7 +8,7 @@ require 'rbconfig' module Gem - VERSION = "3.3.2".freeze + VERSION = "3.3.3".freeze end # Must be first since it unloads the prelude from 1.9.2 |