jar-dependencies 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18e0d621bcb8e41bb7e4ff42801952483a29f42b
-  data.tar.gz: fd330a66fa69ddc0f84cf0fef25f0f3ffad21caa
+  metadata.gz: 285c3578922ce5e751b875aac6728649d38a174f
+  data.tar.gz: a20d84a454308495cc0c10475bcbda345df89037
 SHA512:
-  metadata.gz: cfa381d4c43fe3464fc9bf730ed6666b3c17f4e24c0e40e7d96a57b5eb82352f3f2d4c49591bf9036dc66ece232c4d1a376c44e5b37d2aa8c9d7bf93fed49492
-  data.tar.gz: 2589fe23b38231268b2436d1261a71173384b822c797cbbdc0fc62c9edfc245ec32538fc6de21319be6c29587e051e6ffa5b814ed472b1b3da4af591c6511c08
+  metadata.gz: 02086bfa2664b6ab0bc185d007f9504903ec24bcf94b4053f23d611297e0932c6fd5c0b02d6d7f6ac485b66d8c443f8f0f0e7b01853d65f8feca4849ca412f57
+  data.tar.gz: a096cc1e27693b6898ba1eabb315cd54b55c5ac65bf7f8da4031ba44b682367b62658063a8fdc494444a3e54e329c74783b546864d3b928f0b75880440ba4a0d

data/Readme.md

@@ -23,9 +23,9 @@ in such cases **jbundler** can always **overwrite** any such version.
 
 add following to your *Rakefile*:
 
-    require 'jar_installer'
+    require 'jars/installer'
     task :install_jars do
-      Jars::JarInstaller.vendor_jars
+      Jars::Installer.vendor_jars!
     end
 
 which will install (download) the dependent jars into **JARS_HOME** and create a
@@ -148,6 +148,26 @@ the gemspec files and just load the bundle jars into jruby
 classloader, can easily create problems as the jackson and
 xalan/xerces libraries used by those gems are popular ones in the java world.
 
+# trouble shooting #
+
+since maven is used under the hood it is possible to get more insight
+what maven is doing. show the regualr maven output:
+
+
+    JARS_VERBOSE=true bundle install
+    JARS_VERBOSE=true gem install some_gem
+
+or with maven debug enabled
+
+    JARS_DEBUG=true bundle install
+    JARS_DEBUG=true gem install some_gem
+
+the maven command line which gets printed needs maven-3.3.x and the
+ruby DSL extension for maven:
+[https://github.com/takari/polyglot-maven#configuration](polyglot-maven
+configuration) where ```${maven.multiModuleProjectDirectory}``` is
+your current directory.
+
 # configuration #
 
 <table border='1'>

data/jar-dependencies.gemspec

@@ -36,7 +36,7 @@ if you want to use the executable #{LOCK_JARS} then install ruby-maven gem befor
 
    $ gem install ruby-maven -v '#{RUBY_MAVEN_VERSION}'
 
-or add it as deveopment dependency to your Gemfile
+or add it as a development dependency to your Gemfile
 
    gem 'ruby-maven', '#{RUBY_MAVEN_VERSION}'
 

data/lib/jar_dependencies.rb

@@ -28,6 +28,8 @@ module Jars
     HOME = 'JARS_HOME'.freeze
     # skip the gem post install hook
     SKIP = 'JARS_SKIP'.freeze
+    # skip Jars.lock mainly to run lock_jars
+    SKIP_LOCK = 'JARS_SKIP_LOCK'.freeze
     # do not require any jars if set to false
     REQUIRE = 'JARS_REQUIRE'.freeze
     # @private
@@ -47,8 +49,11 @@ module Jars
   class << self
 
     def lock_down( debug = false, verbose = false, options = {} )
+      ENV[ SKIP_LOCK ] = 'true'
       require 'jars/lock_down' # do this lazy to keep things clean
       Jars::LockDown.new( debug, verbose ).lock_down( options )
+    ensure
+      ENV[ SKIP_LOCK ] = nil
     end
 
     if defined? JRUBY_VERSION
@@ -117,6 +122,10 @@ module Jars
       self.require = false
     end
 
+    def skip_lock?
+      to_prop( SKIP_LOCK ) || false
+    end
+
     def lock
       to_prop( LOCK ) || 'Jars.lock'
     end
@@ -140,10 +149,6 @@ module Jars
       nil
     end
 
-    def local_maven_repo
-      to_prop( LOCAL_MAVEN_REPO ) || home
-    end
-
     def reset
       instance_variables.each { |var| instance_variable_set(var, nil) }
       ( @@jars ||= {} ).clear
@@ -203,7 +208,8 @@ module Jars
     end
 
     def local_maven_repo
-      @_local_maven_repo ||= detect_local_repository(maven_local_settings) ||
+      @_local_maven_repo ||= absolute(to_prop(LOCAL_MAVEN_REPO)) ||
+                             detect_local_repository(maven_local_settings) ||
                              detect_local_repository(maven_user_settings) ||
                              detect_local_repository(maven_global_settings) ||
                              File.join( user_home, '.m2', 'repository' )
@@ -224,7 +230,7 @@ module Jars
         while done != urls do
           urls.each do |url|
             unless done.member?( url )
-              Jars.debug { "--- load jars from #{url}" }
+              Jars.debug { "--- load jars from uri #{url}" }
               classpath = Jars::Classpath.new( nil, "uri:#{url}" )
               classpath.require( scope )
               done << url
@@ -277,7 +283,7 @@ module Jars
     end
 
     def require_jar( group_id, artifact_id, *classifier_version )
-      require_jars_lock
+      require_jars_lock unless skip_lock?
       require_jar_with_block( group_id, artifact_id, *classifier_version ) do |gid, aid, version, classifier|
         do_require( gid, aid, version, classifier )
       end
@@ -355,10 +361,18 @@ module Jars
 
     def do_require( *args )
       jar = to_jar( *args )
+      local = File.join( Dir.pwd, 'jars', jar )
+      vendor = File.join( Dir.pwd, 'vendor', 'jars', jar )
       file = File.join( home, jar )
       # use jar from local repository if exists
       if File.exists?( file )
         require file
+      # use jar from PWD/jars if exists
+      elsif File.exists?( local )
+        require local
+      # use jar from PWD/vendor/jars if exists
+      elsif File.exists?( vendor )
+        require vendor
       else
         # otherwise try to find it on the load path
         require jar

data/lib/jars/installer.rb

@@ -149,15 +149,21 @@ module Jars
 
     def vendor_jars( write_require_file = true )
       return unless has_jars?
+      vendor_jars!( write_require_file )
+    end
+
+    def self.vendor_jars!
+      new.vendor_jars!
+    end
+
+    def vendor_jars!( write_require_file = true )
       case Jars.to_prop( Jars::VENDOR )
       when 'true'
         do_vendor = true
       when 'false'
         do_vendor = false
       else
-        # if the spec_file does not exists this means it is a local gem
-        # coming via bundle :path or :git
-        do_vendor = File.exists?( spec.spec_file )
+        do_vendor = true
       end
       do_install( do_vendor, write_require_file )
     end

data/lib/jars/version.rb

@@ -1,5 +1,5 @@
 module Jars
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
   JRUBY_PLUGINS_VERSION = '1.1.3'.freeze
   DEPENDENCY_PLUGIN_VERSION = '2.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -91,8 +91,8 @@ licenses:
 metadata: {}
 post_install_message: "\nif you want to use the executable lock_jars then install\
   \ ruby-maven gem before using lock_jars \n\n   $ gem install ruby-maven -v '~> 3.3.3'\n\
-  \nor add it as deveopment dependency to your Gemfile\n\n   gem 'ruby-maven', '~>\
-  \ 3.3.3'\n\n"
+  \nor add it as a development dependency to your Gemfile\n\n   gem 'ruby-maven',\
+  \ '~> 3.3.3'\n\n"
 rdoc_options: []
 require_paths:
 - lib