lock_jar 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ea5120a753aae9eb91e96f329fbcae0c92e9c3
-  data.tar.gz: 61472dda7102182b9b89585b682d32b26c47063a
+  metadata.gz: dfc96065e3e9627fc0db3267dfc96c2749c13bab
+  data.tar.gz: 405653c6f9961b07ce3009cf0c04cf9a0834da68
 SHA512:
-  metadata.gz: b655a750d8c9144d72d51e7239028a3a7aa62f90434a03199099fd1a68cea9bf57286ba26d536fb50dc2907132a186ea162339da97ee4e9a2f51131188f33b33
-  data.tar.gz: 52d4ce70c69ff71dc80fef77cf2fc4b864a8ed55809423bdbafdb74b151c117bd0a2db1ad6e50bed6fac1afd1a7163d8af6d5bbf44254e827b9a54e09a375f32
+  metadata.gz: 0841da259510056f369cda445a9aea607f1a85b0ffb2ab84fb283eb5a308393589c4138a7e2eca6502905020e3210e61fd67c902ab46aed6fe68b93efc708e79
+  data.tar.gz: 44c737e6d62349948a2ac1839d6199d66c1b0abaea839b5bf2df32a23e20ed266b0b8109272db0aa18313a799ed127759342ff64123cd31bdcb793ca6c9c1510

data/lib/lock_jar/bundler.rb

@@ -10,40 +10,13 @@ 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 |*args|
-            result = _lockjar_extended_to_lock
-
-            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
-      def lock!(*opts)
-        definition = ::Bundler.definition
+      #
+      # rubocop:disable Metrics/PerceivedComplexity
+      def lock!(bundler, *opts)
+        return unless bundler.instance_variable_get('@setup').nil?
 
         dsl = nil
-        gems_with_jars = []
 
         jarfile_opt = opts.find { |option| option.is_a? String }
 
@@ -58,10 +31,11 @@ module LockJar
           dsl = LockJar::Domain::Dsl.new
         end
 
-        definition.groups.each do |group|
+        gems_with_jars = []
+        ::Bundler.definition.groups.each do |group|
           puts "[LockJar] Group #{group}:" if ENV['DEBUG']
 
-          definition.specs_for([group]).each do |spec|
+          ::Bundler.definition.specs_for([group]).each do |spec|
             next unless File.exist? File.join(spec.gem_dir, 'Jarfile')
 
             merged_dsl = merge_gem_dsl(dsl, spec, group)
@@ -75,6 +49,7 @@ module LockJar
         puts "[LockJar] Locking Jars for: #{gems_with_jars.inspect}"
         LockJar.lock(*([dsl] + opts))
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       private
 

data/lib/lock_jar/version.rb

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

data/spec/lock_jar/bundler_spec.rb

@@ -7,28 +7,27 @@ describe LockJar::Bundler do
   include Spec::Helpers
 
   describe '.lock!' do
+    let(:bundler) do
+      Class.new { attr_accessor :setup }.new
+    end
+
     before do
       remove_file('Jarfile.lock')
-      LockJar::Bundler.lock!('spec/fixtures/Jarfile')
     end
 
-    it 'should create Jarfile.lock' do
-      expect(File).to exist('Jarfile.lock')
+    context 'when Bundler.install has run' do
+      it 'should create Jarfile.lock' do
+        LockJar::Bundler.lock!(bundler, 'spec/fixtures/Jarfile')
+        expect(File).to exist('Jarfile.lock')
+      end
     end
-  end
 
-  describe '.lock_with_bundler' do
-    it 'should call lock! from Bundler' do
-      LockJar::Bundler.lock_with_bundler(test: :arg)
-      expect(LockJar::Bundler).to receive(:lock!).with([{ test: :arg }])
-      ::Bundler::CLI::Install.new({}).run
-    end
+    context 'when Bundler.setup has run' do
+      before { bundler.setup = true }
 
-    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
+      it 'should create Jarfile.lock' do
+        LockJar::Bundler.lock!(bundler, 'spec/fixtures/Jarfile')
+        expect(File).to_not exist('Jarfile.lock')
       end
     end
   end

metadata

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