From bafa1aa4bf89ff209c8123a68cb4323123aa6ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Mon, 23 Dec 2019 17:14:35 +0100 Subject: [PATCH] Depend on Bundler >= 2.1 and fix deprecations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- guard-bundler.gemspec | 4 ++-- lib/guard/bundler.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guard-bundler.gemspec b/guard-bundler.gemspec index d7d0d3d..7bb8de4 100644 --- a/guard-bundler.gemspec +++ b/guard-bundler.gemspec @@ -16,8 +16,8 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.9.2' s.add_dependency 'guard', '~> 2.2' - s.add_dependency 'guard-compat', '~> 1.1' - s.add_dependency 'bundler', '>= 1.3.0', '< 3' + s.add_dependency 'guard-compat', '~> 1.1' + s.add_dependency 'bundler', '>= 2.1', '< 3' s.files = Dir.glob('{lib}/**/*') + %w[LICENSE README.md] s.require_path = 'lib' diff --git a/lib/guard/bundler.rb b/lib/guard/bundler.rb index afb5242..f0ea2d6 100644 --- a/lib/guard/bundler.rb +++ b/lib/guard/bundler.rb @@ -55,7 +55,7 @@ def refresh_bundle def bundle_check gemfile_lock_mtime = File.exists?('Gemfile.lock') ? File.mtime('Gemfile.lock') : nil - ::Bundler.with_clean_env do + ::Bundler.with_unbundled_env do `bundle check` end return false unless $? == 0 @@ -68,7 +68,7 @@ def bundle_check def bundle_install Guard::Compat::UI.info 'Bundling...', reset: true - ::Bundler.with_clean_env do + ::Bundler.with_unbundled_env do system("bundle install#{" #{options[:cli]}" if options[:cli]}") end $? == 0 ? :bundle_installed : false