jar-dependencies 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53767c5745bde116c2f6cbf6b4c44247590ddfdb
-  data.tar.gz: d6bded82c09871123d5782102b1b6116bbd922fe
+  metadata.gz: 9b5ca03580773f81be7b901142b450a339ff44e8
+  data.tar.gz: 1dd1e49ac644f249edb809e46711d0c284491b4c
 SHA512:
-  metadata.gz: 33c19ed63947debdc596d5323baaba1a0c47888f0a9263ed6ef882496f312c627e95b7b5b04a1be1f7fc7c811823d803b532414db1b95a4a613bdd8a7f0d53f8
-  data.tar.gz: fd02f03753fe532f4289aa44f93678bbaf0428451b45b1c691ae7fd504f2fbaf0ed07fc3db3f323c06c7325a115a8bdd8361fe99dab3f93e5964eb330b2f7390
+  metadata.gz: 2d72c2b427e7b4a207d3ad6555252999b8634a2c892eab21b0b3c32037ef5a6b57acec243eafc649c386931c8e3b5c237ab488abfb917c725cc67fa9968285be
+  data.tar.gz: 4771ea73f136626e720d7bbc7513d1a9e04f90129bd769505b61616d6134b87a2b5571f78e0c54dc07b9262853977250ad98ae2956584b7be8bff3e85cf4fb5a

data/lib/jar_dependencies.rb

@@ -121,6 +121,14 @@ module Jars
       to_prop( LOCK ) || 'Jars.lock'
     end
 
+    def jars_lock_from_class_loader
+      if to_prop( LOCK ).nil? && defined?(JRUBY_VERSION)
+        JRuby.runtime.jruby_class_loader.get_resources( 'Jars.lock' ).collect do |url|
+          url.to_s
+        end
+      end
+    end
+
     def lock_path( basedir = nil )
       deps = self.lock
       return deps if File.exists?( deps )
@@ -177,15 +185,35 @@ module Jars
       @_jars_maven_global_settings_ || nil
     end
 
+    def local_maven_repo
+      @_local_maven_repo ||= detect_local_repository(maven_user_settings) ||
+                             detect_local_repository(maven_global_settings) ||
+                             File.join( user_home, '.m2', 'repository' )
+    end
+
     def home
-      @_jars_home_ ||= absolute(to_prop(HOME)) ||
-                       detect_local_repository(maven_user_settings) ||
-                       detect_local_repository(maven_global_settings) ||
-                       File.join( user_home, '.m2', 'repository' )
+      @_jars_home_ ||= absolute(to_prop(HOME)) || local_maven_repo
     end
 
     def require_jars_lock!( scope = :runtime )
-      if jars_lock = Jars.lock_path
+      urls = jars_lock_from_class_loader
+      if urls and urls.size > 0
+        @@jars_lock = true
+        # funny error during spec where it tries to load it again
+        # and finds it as gem instead of the LOAD_PATH
+        require 'jars/classpath' unless defined? Jars::Classpath
+        done = []
+        while done != urls do
+          urls.each do |url|
+            unless done.member?( url )
+              classpath = Jars::Classpath.new( nil, "uri:#{url}" )
+              classpath.require( scope )
+              done << url
+            end
+          end
+          urls = jars_lock_from_class_loader
+        end
+      elsif jars_lock = Jars.lock_path
         @@jars_lock = jars_lock
         # funny error during spec where it tries to load it again
         # and finds it as gem instead of the LOAD_PATH

data/lib/jars/lock_down.rb

@@ -80,7 +80,7 @@ module Jars
       out = File.expand_path( '.jars.output' )
       tree = File.expand_path( '.jars.tree' )
       maven.property( 'jars.outputFile', out )
-      maven.property( 'maven.repo.local', Jars.home )
+      maven.property( 'maven.repo.local', Jars.local_maven_repo )
       maven.property( 'jars.home', vendor_dir ) if vendor_dir
       maven.property( 'jars.lock', File.expand_path( Jars.lock ) )
       maven.property( 'jars.force', options[ :force ] == true )

data/lib/jars/lock_down_pom.rb

@@ -1,12 +1,6 @@
 # this file is maven DSL and used by maven via jars/executor.rb
 
-bdir = ENV_JAVA[ "jars.basedir" ]
-
-basedir( bdir )
-if basedir != bdir
-  # older maven-tools needs this
-  self.instance_variable_set( :@basedir, bdir )
-end
+basedir( ENV_JAVA[ "jars.basedir" ] )
 
 ( 0..10000 ).each do |i|
   coord = ENV_JAVA[ "jars.#{i}" ]

data/lib/jars/version.rb

@@ -1,5 +1,5 @@
 module Jars
-  VERSION = '0.2.3'.freeze
-  JRUBY_PLUGINS_VERSION = '1.1.2'.freeze
+  VERSION = '0.2.4'.freeze
+  JRUBY_PLUGINS_VERSION = '1.1.3'.freeze
   DEPENDENCY_PLUGIN_VERSION = '2.8'.freeze
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+  name: minitest
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '5.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: '10.2'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.3
+  name: ruby-maven
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.3
 description: manage jar dependencies for gems and keep track which jar was already loaded using maven artifact coordinates. it warns on version conflicts and loads only ONE jar assuming the first one is compatible to the second one otherwise your project needs to lock down the right version by providing a Jars.lock file.
 email:
 - mkristian@web.de