Merge pull request #47 from scarver2/bundler-4

Bundler 4 compatibility

Author: rymai

.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 3.0.5
   - 3.1.3
   - 3.2.0
+  - 4.0.0
 
 jobs:
   fast_finish: true

README.md

@@ -5,7 +5,7 @@
 Bundler guard allows to automatically & intelligently install/update bundle when needed.
 
 * Compatible with Bundler 2.1.x
-* Tested against the latest Ruby 2.7.x, 3.0.x, 3.1.x & 3.2.x. See [`.travis-ci.yml`](https://github.com/guard/guard-bundler/blob/master/.travis.yml) for the exact versions.
+* Tested against the latest Ruby 2.7.x, 3.0.x, 3.1.x, 3.2.x & 4.0.x. See [`.travis-ci.yml`](https://github.com/guard/guard-bundler/blob/master/.travis.yml) for the exact versions.
 
 ## Install
 

guard-bundler.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'guard',   '~> 2.2'
   s.add_dependency 'guard-compat', '~> 1.1'
-  s.add_dependency 'bundler', '>= 2.1', '< 3'
+  s.add_dependency 'bundler', '>= 2.1', '< 5'
 
   s.files        = Dir.glob('{lib}/**/*') + %w[LICENSE README.md]
   s.require_path = 'lib'

lib/guard/bundler.rb

@@ -1,10 +1,14 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 require 'bundler'
 
 require "guard/compat/plugin"
 
 module Guard
   class Bundler < Plugin
+    DEFAULT_LOCKFILE = 'Gemfile.lock'
+
     autoload :Notifier, 'guard/bundler/notifier'
 
     def start
@@ -33,6 +37,14 @@ def cli?
 
     private
 
+    def lockfile_path
+      if defined?(::Bundler::SharedHelpers) && ::Bundler::SharedHelpers.respond_to?(:default_lockfile)
+        ::Bundler::SharedHelpers.default_lockfile&.to_s || DEFAULT_LOCKFILE
+      else
+        DEFAULT_LOCKFILE
+      end
+    end
+
     def refresh_bundle
       start_at = Time.now
       result = bundle_check || bundle_install
@@ -54,12 +66,12 @@ def refresh_bundle
     end
 
     def bundle_check
-      gemfile_lock_mtime = File.exist?('Gemfile.lock') ? File.mtime('Gemfile.lock') : nil
+      gemfile_lock_mtime = File.exist?(lockfile_path) ? File.mtime(lockfile_path) : nil
       ::Bundler.with_unbundled_env do
         `bundle check`
       end
       return false unless $? == 0
-      if gemfile_lock_mtime && gemfile_lock_mtime == File.mtime('Gemfile.lock')
+      if gemfile_lock_mtime && gemfile_lock_mtime == File.mtime(lockfile_path)
         :bundle_already_up_to_date
       else
         :bundle_installed_using_local_gems

spec/guard/bundler_spec.rb

@@ -123,4 +123,18 @@
 
   end
 
+  context '#lockfile_path' do
+
+    it 'should return default lockfile path' do
+      expect(subject.send(:lockfile_path)).to end_with('Gemfile.lock')
+    end
+
+    it 'should return custom lockfile path' do
+      allow(Bundler::SharedHelpers).to receive(:default_lockfile).and_return('custom.lock')
+      subject = Guard::Bundler.new
+      expect(subject.send(:lockfile_path)).to end_with('custom.lock')
+    end
+
+  end
+
 end