From e97741e12a22d78825a3a9dfcb7382adb0e27855 Mon Sep 17 00:00:00 2001 From: hsbt Date: Fri, 4 Jan 2019 13:10:58 +0000 Subject: Merge Bundler 2.0.1 from upstream. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/bundler/support/helpers.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/bundler/support/helpers.rb') diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index b027e7a922..43bf6af229 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -53,7 +53,7 @@ module Spec end def bundle_update_requires_all? - Bundler::VERSION.start_with?("1.") ? nil : true + Bundler::VERSION.start_with?("2.") ? nil : true end def in_app_root(&blk) @@ -104,7 +104,7 @@ module Spec bundle_bin = options.delete("bundle_bin") || bindir.join("bundle") if system_bundler = options.delete(:system_bundler) - bundle_bin = "-S bundle" + bundle_bin = system_bundle_bin_path end env = options.delete(:env) || {} @@ -152,7 +152,7 @@ module Spec bang :bundle def forgotten_command_line_options(options) - remembered = Bundler::VERSION.split(".", 2).first == "1" + remembered = Bundler.bundler_major_version < 3 options = options.map do |k, v| k = Array(k)[remembered ? 0 : -1] v = '""' if v && v.to_s.empty? -- cgit v1.2.3