Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Depend on Bundler >= 2.1 and fix deprecations #41

Merged
merged 1 commit into from
Dec 23, 2019
Merged

Depend on Bundler >= 2.1 and fix deprecations #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions guard-bundler.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions lib/guard/bundler.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down