lock_jar 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 795a7aedb78dcc0d8913b25fb263617d4018e707
-  data.tar.gz: f09a029a84c9a0123292473cde5110ec502299c9
+  metadata.gz: a4ea5120a753aae9eb91e96f329fbcae0c92e9c3
+  data.tar.gz: 61472dda7102182b9b89585b682d32b26c47063a
 SHA512:
-  metadata.gz: 833e4bda38e0332690a916ea0641463f589ccab70a245f0f4bf56e2757ae15fe604f8757463d94238cb3f63703ba3f8f2d1398ac3841f9d04d25376ab37e8fb1
-  data.tar.gz: 09b4ca6624b2f03b173309d2dd2e630e1f744b29050163671e6db0ab1a2e137b6788779df2fd4063ecb9da35d5ad6d95b554a6fb2cccc4ce2fc3dc70d917577f
+  metadata.gz: b655a750d8c9144d72d51e7239028a3a7aa62f90434a03199099fd1a68cea9bf57286ba26d536fb50dc2907132a186ea162339da97ee4e9a2f51131188f33b33
+  data.tar.gz: 52d4ce70c69ff71dc80fef77cf2fc4b864a8ed55809423bdbafdb74b151c117bd0a2db1ad6e50bed6fac1afd1a7163d8af6d5bbf44254e827b9a54e09a375f32

data/lib/lock_jar/bundler.rb

@@ -10,18 +10,32 @@ module LockJar
   #
   class Bundler
     class << self
+      attr_accessor :skip_lock
+
       # Patch Bundler::Definition.to_lock to run LockJar::Bundler.lock!
       def lock_with_bundler(*opts)
+        next if @lock_with_bundler_patched
+
         ::Bundler::Definition.class_eval do
           alias_method :_lockjar_extended_to_lock, :to_lock
-          define_method(:to_lock) do
+          define_method(:to_lock) do |*args|
             result = _lockjar_extended_to_lock
 
-            LockJar::Bundler.lock!(opts)
+            LockJar::Bundler.lock!(opts) unless LockJar::Bundler.skip_lock
 
             result
           end
         end
+
+        ::Bundler::Runtime.class_eval do
+          alias_method :_lockjar_extended_setup, :setup
+          define_method(:setup) do |*groups|
+            LockJar::Bundler.skip_lock = true
+            _lockjar_extended_setup
+          end
+        end
+
+        @lock_with_bundler_patched = true
       end
 
       # Create a lock file from bundled gems

data/lib/lock_jar/version.rb

@@ -1,4 +1,4 @@
 # the version
 module LockJar
-  VERSION = '0.14.3'
+  VERSION = '0.14.4'
 end

data/spec/lock_jar/bundler_spec.rb

@@ -23,5 +23,13 @@ describe LockJar::Bundler do
       expect(LockJar::Bundler).to receive(:lock!).with([{ test: :arg }])
       ::Bundler::CLI::Install.new({}).run
     end
+
+    context 'with Bundler.setup' do
+      it 'should not call lock!' do
+        LockJar::Bundler.lock_with_bundler(test: :arg)
+        expect(LockJar::Bundler).to_not receive(:lock!).with([{ test: :arg }])
+        ::Bundler::setup
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Michael Guymon