Merge pull request #41 from guard/40-fix-bundler-warning

Depend on Bundler >= 2.1 and fix deprecations
guard · Dec 23, 2019 · 1d5939c · 1d5939c
2 parents 88bd9fa + bafa1aa
commit 1d5939c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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