jar-dependencies 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8285b7214e47fe153c7757817c250fe9a7752fdc
-  data.tar.gz: f99b7597244bdbf340fb945c7cf39a699734b15a
+  metadata.gz: a34bb3f36e6ad44d263107a9d6fe8d3e513b934f
+  data.tar.gz: 620b12873948e1347d0020596dcb7cc080304952
 SHA512:
-  metadata.gz: b55db0cfecaaf73eac4d95cc3b7d061d809d112afe815afffd2a8a12b83ed4d3c8beb0cbfb19e27ff2f14ece87068d3267c49e79298dda32d273cbbc69f0284b
-  data.tar.gz: 5bcf7abf25d8709a98ff405a94bdba3f219450bf58b8a2c0d6a99b2499f1067f0870277d4f32fd7520a50b3095ec3bb1315616a34606c5d57e88f6695086174b
+  metadata.gz: d2f5934de747736b5f733cfac0aeb932be5896ff8e1ff1536290894f71bc50733b41c4bdd2533ed596b5acff65c0cd511b719ff4f6f6efb93c7c00051eaac813
+  data.tar.gz: d76e95558788a112844391576b838af227d2f2871f0f988b5817a645af450a39ea276861beb5236a26410ac3587479e18f06789736d02c71f8a7a16ca2a9901a

data/Mavenfile

@@ -16,6 +16,7 @@ properties( 'jruby.versions' => ['1.6.8', '1.7.12', '${jruby.version}', '9.0.0.0
             'jruby.modes' => ['1.9', '2.0', '2.1'].join(','),
             # just lock the version
             'jruby.version' => '1.7.19',
+            'jruby.plugins.version' => '1.0.9',
             'tesla.dump.pom' => 'pom.xml',
             'tesla.dump.readonly' => true )
 
@@ -26,7 +27,13 @@ plugin :invoker, '1.8' do
                  :streamLogs => true,
                  :goals => ['install'],
                  :cloneProjectsTo => '${project.build.directory}',
-                 :properties => { 'jar-dependencies.version' => '${project.version}' })
+                 :properties => { 'jar-dependencies.version' => '${project.version}',
+                   'jruby.version' => '${jruby.version}',
+                   'jruby.plugins.version' => '${jruby.plugins.version}',
+                   'bundler.version' => '1.9.2',
+                   'ruby-maven.version' => '3.1.1.0.11',
+                   # dump pom for the time being - for travis
+                   'polyglot.dump.pom' => 'pom.xml'})
 end
 
 # vim: syntax=Ruby

data/jar-dependencies.gemspec

@@ -1,8 +1,10 @@
 #-*- mode: ruby -*-
 
+require './lib/jars/version'
+
 Gem::Specification.new do |s|
   s.name = 'jar-dependencies'
-  s.version = "0.1.10"
+  s.version = Jars::VERSION
   s.author = 'christian meier'
   s.email = [ 'mkristian@web.de' ]
   s.summary = 'manage jar dependencies for gems'
@@ -10,17 +12,15 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.executable = 'bundle-with-jars'
-
   s.files = Dir[ 'lib/**/*rb' ]
   s.files += Dir[ '*file' ]
   s.files += [ 'Readme.md', 'jar-dependencies.gemspec', 'MIT-LICENSE' ]
 
-  s.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.'
+  s.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.'
 
   s.add_development_dependency 'minitest', '~> 5.3'
   s.add_development_dependency 'rake', '~> 10.2'
-  s.add_development_dependency "ruby-maven", "~> 3.1.1.0.9"
+  s.add_development_dependency "ruby-maven", "~> 3.1.1.0.11"
 end
 
 # vim: syntax=Ruby

data/lib/jar_dependencies.rb

@@ -18,10 +18,12 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-
 module Jars
   unless defined? Jars::MAVEN_SETTINGS
     MAVEN_SETTINGS = 'JARS_MAVEN_SETTINGS'.freeze
+    LOCAL_MAVEN_REPO = 'JARS_LOCAL_MAVEN_REPO'.freeze
+    # lock file to use
+    LOCK = 'JARS_LOCK'.freeze
     # where the locally stored jars are search for or stored
     HOME = 'JARS_HOME'.freeze
     # skip the gem post install hook
@@ -96,6 +98,14 @@ module Jars
       @frozen = true
     end
 
+    def lock
+      to_prop( LOCK ) || 'Jars.lock'
+    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
@@ -151,18 +161,23 @@ module Jars
       @_jars_home_
     end
 
+    def require_jars_lock!( scope = :runtime )
+      # 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
+      classpath = Jars::Classpath.new
+      if jars_lock = classpath.jars_lock
+        @@jars_lock = jars_lock
+        classpath.require( scope )
+        self.no_more_warnings
+      end
+    end
+
     def require_jars_lock
       @@jars_lock ||= false
       unless @@jars_lock
-        # be lazy and only load if there are jar dependencies
-        require 'jars/classpath'
-        classpath = Jars::Classpath.new
-        if @@jars_lock = classpath.jars_lock
-          classpath.require
-          self.no_more_warnings
-        else
-          @@jars_lock = true
-        end
+        require_jars_lock!
+        @@jars_lock ||= true
       end
     end
 

data/lib/jars/classpath.rb

@@ -16,7 +16,9 @@ module Jars
     end
 
     def jars_lock
-      deps = File.join( @mvn.basedir || '.', 'Jars.lock' )
+      deps = Jars.lock
+      return deps if File.exists?( deps )
+      deps = File.join( @mvn.basedir || '.', Jars.lock )
       deps if File.exists?( deps )
     end
 
@@ -35,7 +37,7 @@ module Jars
     def resolve_dependencies
       basedir = workdir( 'pkg' ) || workdir( 'target' ) || workdir( '' )
       deps = File.join( basedir, DEPENDENCY_LIST )      
-      @mvn.resolve_dependencies( deps )
+      @mvn.resolve_dependencies_list( deps )
       deps
     end
     private :resolve_dependencies

data/lib/jars/installer.rb

@@ -175,7 +175,7 @@ module Jars
       deps = File.join( @mvn.basedir, 'deps.lst' )
 
       puts "  jar dependencies for #{@mvn.spec.spec_name} . . ." unless Jars.quiet?
-      @mvn.resolve_dependencies( deps )
+      @mvn.resolve_dependencies_list( deps )
 
       self.class.load_from_maven( deps )
     ensure

data/lib/jars/jar_pom.rb

@@ -5,10 +5,10 @@ specfile = java.lang.System.getProperty('jars.specfile')
 # needed since the gemspec does not allow absolute files
 basedir( File.dirname( specfile ) )
 
-# add jruby for compilation
+# add jruby as provided for compilation when used vi Jars::Classpath#classpath
 jar 'org.jruby:jruby-core', JRUBY_VERSION, :scope => :provided
 
-# get ALL depenedencies from the specfile
+# get ALL dependencies from the specfile
 gemspec File.basename( specfile )
 
 # we do not want those gem dependencies, each gem takes care of its

data/lib/jars/jars_lock_pom.rb

@@ -3,7 +3,7 @@
 require_relative 'lock'
 require_relative '../jar_dependencies'
 
-lock = Jars::Lock.new( java.lang.System.getProperty('outputFile') )
+lock = Jars::Lock.new( ENV_JAVA['jars.lock'] )
 
 lock.process( :all ) do |coord|
 
@@ -14,5 +14,3 @@ lock.process( :all ) do |coord|
   jar coord.group_id, coord.artifact_id, coord.version, options
 
 end
-
-properties :excludeTransitive => true

data/lib/jars/lock.rb

@@ -55,7 +55,7 @@ module Jars
     end
 
     def process( scope )
-      scope ||= :compile
+      scope ||= :runtime
       File.read( @file ).each_line do |line|
         next if not line =~ /:.+:/
         jar = JarDetails.new( line.strip
@@ -65,11 +65,13 @@ module Jars
         when :all
           yield jar
         when :compile
+          # jar.scope is maven scope
           yield jar if jar.scope != :test
         when :runtime
+          # jar.scope is maven scope
           yield jar if jar.scope != :test and jar.scope != :provided
         when :test
-          yield jar if jar.scope != :runtime
+          yield jar
         end
       end
     end

data/lib/jars/maven_exec.rb

@@ -29,7 +29,9 @@ module Jars
       when String
         @specfile = File.expand_path( spec )
         @basedir = File.dirname( @specfile )
-        spec =  eval( File.read( spec ) )
+        spec =  Dir.chdir( File.dirname(@specfile) ) do
+          eval( File.read( @specfile ) )
+        end
       when Gem::Specification
         if File.exists?( spec.spec_file )
           @basedir = spec.gem_dir
@@ -57,26 +59,26 @@ module Jars
       @options.delete( :ignore_dependencies )
     end
 
+    def resolve_dependencies_list( file )
+      do_resolve_dependencies( *setup_arguments( 'jar_pom.rb', 'dependency:copy-dependencies', 'dependency:list', "-DoutputFile=#{file}" ) )
+    end
+
     def resolve_dependencies( file )
+      do_resolve_dependencies( *setup_arguments( 'jars_lock_pom.rb', 'dependency:copy-dependencies', '-DexcludeTransitive=true' , "-Djars.lock=#{file}") )
+    end
+
+    private
+
+    def do_resolve_dependencies( *args )
       lazy_load_maven
 
       maven = Maven::Ruby::Maven.new
       maven.verbose = Jars.verbose?
-      maven.exec( *setup_arguments( file ) )
+      maven.exec( *args )
     end
 
-    private
-
-    def setup_arguments( deps )
-      if File.basename( deps ) == 'Jars.lock'
-        pom = 'jars_lock_pom.rb'
-        goals = [ 'dependency:copy-dependencies' ]
-      else
-        pom = 'jar_pom.rb'
-        goals = [ 'dependency:copy-dependencies', 'dependency:list' ]
-      end
-      args = [ *goals,
-               "-DoutputFile=#{deps}", 
+    def setup_arguments( pom, *goals )
+      args = [ *goals, 
                '-DoutputAbsoluteArtifactFilename=true', 
                '-DincludeTypes=jar', 
                '-DoutputScope=true',
@@ -98,11 +100,7 @@ module Jars
         args << "-DproxyPort=#{uri.port}"
       end
 
-      if defined? JRUBY_VERSION
-        args << "-Dmaven.repo.local=#{java.io.File.new( Jars.home ).absolute_path}"
-      else
-        args << "-Dmaven.repo.local=#{File.expand_path( Jars.home )}"
-      end
+      args << "-Dmaven.repo.local=#{java.io.File.new( Jars.local_maven_repo ).absolute_path}"
 
       args
     end

data/lib/jars/version.rb

@@ -0,0 +1,3 @@
+module Jars
+  VERSION = '0.1.11'.freeze
+end

metadata

@@ -1,80 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-13 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.1.1.0.9
+        version: '10.2'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1.0.9
+        version: 3.1.1.0.11
+  name: ruby-maven
   prerelease: false
   type: :development
-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.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.1.0.11
+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
-executables:
-- bundle-with-jars
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/rubygems_plugin.rb
+- lib/jar-dependencies.rb
 - lib/jar_install_post_install_hook.rb
 - lib/jar_dependencies.rb
 - lib/jar_installer.rb
-- lib/jar-dependencies.rb
-- lib/rubygems_plugin.rb
-- lib/jars/jar_pom.rb
+- lib/jars/classpath.rb
 - lib/jars/jars_lock_pom.rb
-- lib/jars/installer.rb
-- lib/jars/lock.rb
 - lib/jars/maven_exec.rb
-- lib/jars/classpath.rb
+- lib/jars/version.rb
+- lib/jars/installer.rb
+- lib/jars/jar_pom.rb
 - lib/jars/post_install_hook.rb
-- bin/bundle-with-jars
-- Rakefile
+- lib/jars/lock.rb
 - Mavenfile
+- Rakefile
 - Gemfile
 - Readme.md
 - jar-dependencies.gemspec

data/bin/bundle-with-jars

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'jar_install_post_install_hook'
-   
-load Gem.bin_path('bundler', 'bundle')