lock_jar 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e8000e6eabfa436d403adf58c2df66c89f2939
-  data.tar.gz: de15e6014fadc83bee21a403ca80cb25d595849d
+  metadata.gz: 795a7aedb78dcc0d8913b25fb263617d4018e707
+  data.tar.gz: f09a029a84c9a0123292473cde5110ec502299c9
 SHA512:
-  metadata.gz: f6a3d83e53fa5759b2b0099e9325e87a183f46e37047d6b92741f169f2f46fadc5890c481014da4a7140f4a8555d9c55ca4d941728e3a4f45c1415fd549ceda7
-  data.tar.gz: 65d1ea5290e981d89f32066d37fbac6a91626744d130e58c1cb1ca96d9e7227555130ceca93927b3a06c58615599a98010a21fdbcb7605fe6ddb31c6364df1c2
+  metadata.gz: 833e4bda38e0332690a916ea0641463f589ccab70a245f0f4bf56e2757ae15fe604f8757463d94238cb3f63703ba3f8f2d1398ac3841f9d04d25376ab37e8fb1
+  data.tar.gz: 09b4ca6624b2f03b173309d2dd2e630e1f744b29050163671e6db0ab1a2e137b6788779df2fd4063ecb9da35d5ad6d95b554a6fb2cccc4ce2fc3dc70d917577f

data/lib/lock_jar/bundler.rb

@@ -10,41 +10,18 @@ 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)
+        ::Bundler::Definition.class_eval do
+          alias_method :_lockjar_extended_to_lock, :to_lock
+          define_method(:to_lock) do
+            result = _lockjar_extended_to_lock
 
-      def load(*groups)
-        return if groups.empty? || !File.exist?('Jarfile.lock')
+            LockJar::Bundler.lock!(opts)
 
-        lockfile = LockJar::Domain::Lockfile.read('Jarfile.lock')
-
-        # expand merged paths to include gem base path
-        unless lockfile.merged.empty?
-          lockfile.merged = LockJar::Bundler.expand_gem_paths(lockfile.merged)
-        end
-
-        LockJar.load(lockfile, groups)
-
-        puts(
-          '[LockJar] Loaded Jars for #{groups.inspect}: '\
-          "#{LockJar::Registry.instance.loaded_jars.inspect}"
-        ) if ENV['DEBUG']
-      end
-
-      def expand_gem_paths(merged)
-        merged_gem_paths = []
-        Gem.path.each do |gem_root|
-          merged.each do |merge|
-            next unless merge.start_with? 'gem:'
-
-            # merged gems follow the notation: gem:gemname:path
-            gem_path = merge.gsub(/^gem:.+:/, '')
-            gem_path = File.join(gem_root, gem_path)
-
-            merged_gem_paths << gem_path if File.exist? gem_path
+            result
           end
         end
-
-        merged_gem_paths
       end
 
       # Create a lock file from bundled gems
@@ -99,62 +76,3 @@ module LockJar
     end
   end
 end
-
-# Patch Bundler module to allow LockJar to lock and load when Bundler is run
-module Bundler
-  class << self
-    alias_method :_lockjar_extended_require, :require
-    def require(*groups)
-      LockJar::Bundler.load(*groups)
-
-      LockJar::Bundler.skip_lock = true
-
-      _lockjar_extended_require
-    end
-
-    alias_method :_lockjar_extended_setup, :setup
-    def setup(*groups)
-      LockJar::Bundler.load(*groups)
-
-      LockJar::Bundler.skip_lock = true
-
-      _lockjar_extended_setup
-    end
-  end
-
-  # Patch Bundler::Runtime.require and Bundler::Runtime.setup to execute
-  # Lockjar::Bundler.load
-  class Runtime
-    alias_method :_lockjar_extended_require, :require
-    def require(*groups)
-      LockJar::Bundler.load(*groups)
-
-      LockJar::Bundler.skip_lock = true
-
-      _lockjar_extended_require
-    end
-
-    alias_method :_lockjar_extended_setup, :setup
-    def setup(*groups)
-      LockJar::Bundler.load(*groups)
-
-      LockJar::Bundler.skip_lock = true
-
-      _lockjar_extended_setup
-    end
-  end
-
-  # Patch Bundler::Definition.to_lock to run LockJar::Bundler.lock!
-  class Definition
-    alias_method :_lockjar_extended_to_lock, :to_lock
-    def to_lock
-      result = _lockjar_extended_to_lock
-
-      return result if LockJar::Bundler.skip_lock
-
-      LockJar::Bundler.lock!
-
-      result
-    end
-  end
-end

data/lib/lock_jar/version.rb

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

data/spec/lock_jar/bundler_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 require 'lock_jar/bundler'
+require 'bundler/cli'
+require 'bundler/cli/install'
 
 describe LockJar::Bundler do
   include Spec::Helpers
 
-  before do
-    remove_file('Jarfile.lock')
-    LockJar::Bundler.lock!('spec/fixtures/Jarfile')
-  end
-
   describe '.lock!' do
+    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')
     end
   end
 
-  describe '.load' do
-    it 'should load jars' do
-      LockJar::Bundler.load('test')
-
-      expected_jars = %w(junit:junit:jar:4.10 org.hamcrest:hamcrest-core:jar:1.1)
-
-      expect(LockJar::Registry.instance.loaded_jars).to eql(expected_jars)
+  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
   end
 end

data/spec/lock_jar_spec.rb

@@ -287,15 +287,14 @@ describe LockJar do
   end
 
   describe '#lock_registered_jarfiles' do
+    let(:lockfile) { "#{TEMP_DIR}/Jarfile.lock" }
+    let(:lock_registered_jarfiles) { LockJar.lock_registered_jarfiles lockfile: lockfile }
+
     after do
       LockJar.reset_registered_jarfiles
     end
 
-    let(:lock_registered_jarfiles) { LockJar.lock_registered_jarfiles lockfile: lockfile }
-
     context 'with LRJJarfile1.lock' do
-      let(:lockfile) { "#{TEMP_DIR}/LRJJarfile1.lock" }
-
       before do
         File.unlink lockfile if File.exist? lockfile
       end
@@ -307,8 +306,6 @@ describe LockJar do
     end
 
     context 'with multiple lockfiles' do
-      let(:lockfile) { "#{TEMP_DIR}/LRJJarfile2.lock" }
-
       before do
         LockJar.register_jarfile 'spec/fixtures/Jarfile'
         LockJar.register_jarfile 'spec/fixtures/Jarfile2'
@@ -327,12 +324,11 @@ describe LockJar do
     end
 
     context 'with gem lockfiles' do
-      let(:lockfile) { "#{TEMP_DIR}/Jarfile.lock" }
       let(:gem_spec) { Gem::Specification.find_by_name('jarfile_gem') }
       let(:lock_registered_jarfiles) { LockJar.lock_registered_jarfiles lockfile: lockfile }
 
       before do
-        LockJar.register_jarfile File.join(gem_spec.full_gem_path, 'Jarfile'), gem_spec
+        LockJar.register_jarfile 'spec/fixtures/jarfile_gem/Jarfile', gem_spec
         File.unlink lockfile if File.exist? lockfile
       end
 

metadata

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