jar-dependencies 0.1.16.pre → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61323d91e4b550079bc732eaacd34c43d6938522
-  data.tar.gz: 44458b80a2e517b6a166ac43ad452daa4ce432fc
+  metadata.gz: 9a8eb8cba64115cb2e8051ccdcae9fcb547795c7
+  data.tar.gz: 6887fefbfe325001e00fa2a6e35cd4bf19649775
 SHA512:
-  metadata.gz: 941f4704dadfeeb3e1074e91eafd9c57efbfbbb48fb7ef4a118b5a1ff56c1f211ff9a3bdf0d5a451381684a63de289b1ab452b62e0d4e6ec35a7f66da2e7c969
-  data.tar.gz: f1203ff4ab4b688a23c5f1b2bb6e724a48edd95d4e3cef9f753c411f92944c05d9e21cdfa10c85c827f274f9ba48f67c4737ea981399d45c0fc4f130f74825d9
+  metadata.gz: 5be5306505b67b6872d483c504b0abdfef02d99b39c1d2e39f8d18dca1795e5ef0e02590b1ffb9162b2d3cb407f5e57a9f0118f15bbd42094b6ad96f8e01db4c
+  data.tar.gz: f99747cdc5985dcaedd93d9d30f6d614f7c0e8e132217cdb5339eba7757528c1cbc696a6131fe186de7899c486598a462239c4917463aa6af9ddcb69ee3830b6

data/Mavenfile

@@ -14,13 +14,13 @@ end
 pro = @model.profiles.detect { |p| p.id.to_sym == :gemfile } || @model
 ruby_maven = pro.dependencies.detect { |d| d.artifact_id == 'ruby-maven' }
 
-properties( 'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.0.0.rc1'
+properties( 'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.1.0'
                                 ].join(','),
             'jruby.modes' => ['1.9', '2.0', '2.1'].join(','),
             # just lock the version
             'bundler.version' => '1.9.2',
             'ruby-maven.version' => ruby_maven.version,
-            'jruby.version' => '1.7.20',
+            'jruby.version' => '1.7.22',
             'jruby.plugins.version' => '1.0.9',
             'push.skip' => true  )
 
@@ -30,7 +30,8 @@ plugin :invoker, '1.8' do
                  :projectsDirectory => 'integration',
                  :streamLogs => true,
                  :goals => ['install'],
-                 :postBuildHookScript =>  'verify.bsh',
+                 :preBuildHookScript => 'setup.bsh',
+                 :postBuildHookScript => 'verify.bsh',
                  :cloneProjectsTo => '${project.build.directory}',
                  :properties => { 'jar-dependencies.version' => '${project.version}',
                    'jruby.version' => '${jruby.version}',

data/bin/lock_jars

@@ -6,6 +6,8 @@ optparse = OptionParser.new do|opts|
 
   opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
 
+  opts.separator ''
+  opts.separator 'THIS IS A EXPERIMETAL FEATURE !!!'
   opts.separator ''
   opts.separator '* load jars "Jars.lock" from current working directory: `Jars.require_jars_lock!`'
   opts.separator '* classpath features: see `Jars::Classpath'
@@ -29,7 +31,7 @@ optparse = OptionParser.new do|opts|
     options[:tree] = t
   end
 
-  opts.on( '-u', '--update JAR_COORDINATE', 'Resolves given dependency and use  latest version' ) do |u|
+  opts.on( '-u', '--update JAR_COORDINATE', 'Resolves given dependency and use  latest version. JAR_COORDINATE is either artifact_id or group_id:artifact_id' ) do |u|
     options[:update] = u
   end
 

data/jar-dependencies.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = 'jar-dependencies'
 
   path = File.expand_path('lib/jars/version.rb', File.dirname(__FILE__))
-  s.version = File.read(path).match( /.*VERSION\s*=\s*['"](.*)['"]/m )[1]
+  s.version = File.read(path).match( /\s*VERSION\s*=\s*['"](.*)['"]/ )[1]
   
   s.author = 'christian meier'
   s.email = [ 'mkristian@web.de' ]
@@ -12,7 +12,8 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/mkristian/jar-dependencies'
 
   s.bindir = "bin"
-  s.executables = ['lock_jars']
+  LOCK_JARS = 'lock_jars'
+  s.executables = [LOCK_JARS]
 
   s.license = 'MIT'
 
@@ -26,8 +27,20 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'minitest', '~> 5.3'
   s.add_development_dependency 'rake', '~> 10.2'
-  s.add_development_dependency 'ruby-maven', '~> 3.3.0'
-  s.add_development_dependency 'ruby-maven-libs', '~> 3.3.0'
+  RUBY_MAVEN_VERSION = '~> 3.3.3'
+  s.add_development_dependency 'ruby-maven', RUBY_MAVEN_VERSION
+
+  s.post_install_message = <<EOF
+
+if you want to use the executable #{LOCK_JARS} then install ruby-maven gem before using #{LOCK_JARS} 
+
+   $ gem install ruby-maven #{RUBY_MAVEN_VERSION}
+
+or add it as deveopment dependency to your Gemfile
+
+   gem 'ruby-maven', #{RUBY_MAVEN_VERSION}
+
+EOF
 end
 
 # vim: syntax=Ruby

data/lib/jar_dependencies.rb

@@ -42,15 +42,13 @@ module Jars
     DEBUG = 'JARS_DEBUG'.freeze
     # vendor jars inside gem when installing gem
     VENDOR = 'JARS_VENDOR'.freeze
-    # resolve jars from Jars.lock
-    RESOLVE = 'JARS_RESOLVE'.freeze
   end
 
   class << self
 
     def lock_down( debug = false, verbose = false, options = {} )
-      require 'jars/executor' # do this lazy to keep things clean
-      Jars::Executor.new( debug, verbose ).lock_down( options )
+      require 'jars/lock_down' # do this lazy to keep things clean
+      Jars::LockDown.new( debug, verbose ).lock_down( options )
     end
 
     if defined? JRUBY_VERSION
@@ -92,7 +90,7 @@ module Jars
       ( @silent ||= false ) || to_boolean( QUIET )
     end
 
-    def self.jarfile
+    def jarfile
       ENV[ 'JARFILE' ] || ENV_JAVA[ 'jarfile' ] || ENV[ 'JBUNDLER_JARFILE' ] || ENV_JAVA[ 'jbundler.jarfile' ] || 'Jarfile'
     end
 
@@ -111,10 +109,6 @@ module Jars
       to_boolean( VENDOR )
     end
 
-    def resolve?
-      to_boolean( RESOLVE )
-    end
-
     def no_more_warnings
       @silent = true
     end
@@ -130,8 +124,12 @@ module Jars
     def lock_path( basedir = nil )
       deps = self.lock
       return deps if File.exists?( deps )
-      deps = File.join( basedir || '.', self.lock )
-      deps if File.exists?( deps )
+      basedir ||= '.'
+      [ '.', 'jars', 'vendor/jars' ].each do |dir|
+        file = File.join( basedir, dir, self.lock )
+        return file if File.exists?( file )
+      end
+      nil
     end
 
     def local_maven_repo
@@ -198,6 +196,19 @@ module Jars
       end
     end
 
+    def setup( options = nil )
+      case options
+      when Symbol
+        require_jars_lock!( options )
+      when Hash
+        @_jars_home = options[:jars_home]
+        @_jars_lock = options[:jars_lock]
+        require_jars_lock!( options[:scope] || :runtime )
+      else
+        require_jars_lock!
+      end
+    end
+
     def require_jars_lock
       @@jars_lock ||= false
       unless @@jars_lock
@@ -295,7 +306,7 @@ module Jars
         require jar
       end
     rescue LoadError => e
-      raise "\n\n\tyou might need to reinstall the gem which depends on the missing jar or in case there is Jars.lock then JARS_RESOLVE=true will install the missing jars\n\n" + e.message + " (LoadError)"
+      raise "\n\n\tyou might need to reinstall the gem which depends on the missing jar or in case there is Jars.lock then resolve the jars with `lock_jars` command\n\n" + e.message + " (LoadError)"
     end
 
   end # class << self

data/lib/jars/classpath.rb

@@ -22,7 +22,6 @@ module Jars
 
     def dependencies_list
       if @deps ||= Jars.lock_path( mvn.basedir )
-        mvn.resolve_dependencies( @deps ) if Jars.resolve?
         @deps
       else
         resolve_dependencies

data/lib/jars/gemspec_artifacts.rb

@@ -0,0 +1,208 @@
+module Jars
+
+  class MavenVersion < String
+    def self.new(*args)
+      if args.size == 0 || (args.size == 1 && args[0].nil?)
+        nil
+      else
+        low, high = convert(args[0])
+        low, high = convert(args[1], low, high) if args[1] =~ /[=~><]/
+        if low == high
+          low
+        else
+          super "#{low || '[0'},#{high || ')'}"
+        end
+      end
+    end
+
+    private
+
+    def self.convert(arg, low = nil, high = nil)
+      if arg =~ /~>/
+        val = arg.sub(/~>\s*/, '')
+        last = val=~/\./ ? val.sub(/\.[0-9]*[a-z]+.*$/, '').sub(/\.[^.]+$/, '.99999') : '99999'
+        ["[#{snapshot_version(val)}", "#{snapshot_version(last)}]"]
+      elsif arg =~ />=/
+        val = arg.sub(/>=\s*/, '')
+        ["[#{snapshot_version(val)}", (nil || high)]
+      elsif arg =~ /<=/
+        val = arg.sub(/<=\s*/, '')
+        [(nil || low), "#{snapshot_version(val)}]"]
+      # treat '!' the same way as '>' since maven can not describe such range
+      elsif arg =~ /[!>]/  
+        val = arg.sub(/[!>]\s*/, '')
+        ["(#{snapshot_version(val)}", (nil || high)]
+      elsif arg =~ /</
+        val = arg.sub(/<\s*/, '')
+        [(nil || low), "#{snapshot_version(val)})"]
+      elsif arg =~ /\=/
+        val = arg.sub(/=\s*/, '')
+        # for prereleased version pick the maven version (no version range)
+        if val.match /[a-z]|[A-Z]/
+          [ val, val ]
+        else
+          ["[#{val}", "#{val}.0.0.0.0.1)"]
+        end
+      else
+        # no conversion here, i.e. assume maven version
+        [arg, arg]
+      end
+    end
+
+    def self.snapshot_version( val )
+      if val.match(/[a-z]|[A-Z]/) && !val.match(/-SNAPSHOT|[${}]/)
+        val + '-SNAPSHOT'
+      else
+        val
+      end
+    end
+  end
+
+  class GemspecArtifacts
+
+    class Exclusion
+      attr_reader :group_id, :artifact_id
+
+      def initialize(line)
+        @group_id, @artifact_id = line.gsub(/['"]/, '').strip.split( ':' )
+        @artifact_id.strip!
+      end
+
+      def to_s
+        "#{@group_id}:#{@artifact_id}"
+      end
+    end
+    
+    class Exclusions < Array
+
+      def to_s
+        "[#{join(', ')}]"
+      end
+
+      def initialize( line )
+        super()
+        line.gsub(/'"|^\s*\[|\]\s*$/, '').split( /,\s*/ ).each do |exclusion|
+          self.<< Exclusion.new( exclusion )
+        end
+        freeze
+      end
+    end
+
+    class Artifact
+ 
+      attr_reader :type, :group_id, :artifact_id, :classifier, :version, :scope, :exclusions
+
+      ALLOWED_TYPES = ['jar', 'pom']
+      
+      def initialize( options, *args )
+        @type, @group_id, @artifact_id, @classifier, @version, @exclusions = *args
+        options.each do |k,v|
+          instance_variable_set( "@#{k}", v )
+        end
+      end
+
+      def self.new( line )
+        line = line.strip
+        index = line.index( /\s/ )
+        if index.nil?
+          return nil
+        end
+        type = line[0..index].strip
+        unless ALLOWED_TYPES.member?( type )
+          return nil
+        end
+        line = line[index..-1]
+        line.gsub!(/['"]/, '')
+        line.strip!
+
+        options = {}
+        line.sub!(/,\s*:exclusions\s*(:|=>)\s*(\[[a-zA-Z0-9_:,]+\])/) do
+          options[ :exclusions ] = Exclusions.new( $2.strip )
+          ''
+        end
+        line.sub!(/,\s*:([a-z]+)\s*(:|=>)\s*(:?[a-zA-Z0-9_]+)/) do
+          options[ $1.to_sym ] = $3.sub(/^:/, '')
+          ''
+        end
+
+        exclusions = nil
+        line.sub!(/[,:]\s*\[(.+:.+,?\s*)+\]$/) do |a|
+          exclusions = Exclusions.new( a[1..-1].strip )
+          ''
+        end
+
+        line.strip!
+        line.gsub!(/,\s*/, ':')
+
+        if line.match(/[\[\(\)\]]/)
+          index = line.index(/[\[\(].+$/)
+          version = line[index..-1].sub(/:/, ', ')
+          line = line[0..index - 1].strip.sub(/:$/, '')
+        else
+          index = line.index(/[:][^:]+$/)
+          version = line[index + 1..-1]
+          line = line[0..index - 1].strip
+        end
+
+        case line.count(':')
+        when 2
+          group_id, artifact_id, classifier = line.split(':')
+        when 1
+          group_id, artifact_id = line.split(':')
+          classifier = nil
+        else
+          warn line
+          return nil
+        end
+        super( options, type, group_id, artifact_id, classifier, version, exclusions )
+      end
+
+      def to_s
+        args = [@group_id, @artifact_id]
+        args << @classifier if @classifier
+        args << @version
+        args << @exclusions.to_s if @exclusions
+        "#{@type} #{group_id}:#{args[1..-1].join(', ')}"
+      end
+
+      def to_gacv
+        args = [@group_id, @artifact_id]
+        args << @classifier if @classifier
+        args << @version
+        args.join(':')
+      end
+
+      def to_coord
+        args = [@group_id, @artifact_id]
+        args << @classifier if @classifier
+        args << @type
+        args << MavenVersion.new( @version )
+        args.join(':')
+      end
+
+      def key
+        args = [@group_id, @artifact_id]
+        args << @classifier if @classifier
+        args.join(':')
+      end
+    end
+
+    attr_reader :artifacts
+
+    def initialize( spec )
+      @artifacts = []
+      spec.requirements.each do |req|
+        req.split( /\n/ ).each do |line|
+          if ( a = Artifact.new( line ) )
+            @artifacts << a
+          end
+        end
+      end
+      @artifacts.freeze
+    end
+
+    def [](index)
+      @artifacts[index]
+    end
+  end
+end

data/lib/jars/{jar_pom.rb → gemspec_pom.rb}

@@ -1,6 +1,6 @@
 # this file is maven DSL and used by maven via jars/maven_exec.rb
 
-specfile = java.lang.System.getProperty('jars.specfile')
+specfile = ENV_JAVA[ 'jars.specfile' ]
 
 # needed since the gemspec does not allow absolute files
 basedir( File.dirname( specfile ) )

data/lib/jars/{executor.rb → lock_down.rb}

@@ -1,33 +1,29 @@
-require 'maven/ruby/maven'
-require 'maven/tools/artifact'
-require 'maven/tools/gemspec_dependencies'
 require 'fileutils'
 require 'jar_dependencies'
+require 'jars/version'
+require 'jars/maven_factory'
+require 'jars/gemspec_artifacts'
+
 module Jars
-  
-  class Executor
+  class LockDown
 
     attr_reader :debug, :verbose
 
-    def initialize( debug = false, verbose = false )
+    def initialize( debug, verbose )
       @debug = debug
       @verbose = verbose
     end
 
     def maven_new
-      m = Maven::Ruby::Maven.new
-      m.property( 'jars.basedir', File.expand_path( basedir ) )
-      m.property( 'jars.jarfile', File.expand_path( Jars.jarfile ) )
-      m.property( 'verbose', (debug || verbose) == true )
-      if debug
-        m.options[ '-X' ] = nil
-      elsif verbose
-        m.options[ '-e' ] = nil
-      else
-        m.options[ '-q' ] = nil
-      end
-      m.verbose = debug
-      attach_jar_coordinates( m )
+      factory = MavenFactory.new( {}, @debug, @verbose )
+      pom = File.expand_path( '../lock_down_pom.rb', __FILE__ )
+      m = factory.maven_new( pom )
+      m[ 'jruby.plugins.version' ] = Jars::JRUBY_PLUGINS_VERSION
+      m[ 'dependency.plugin.version' ] = Jars::DEPENDENCY_PLUGIN_VERSION
+      m[ 'jars.basedir' ] = File.expand_path( basedir )
+      jarfile = File.expand_path( Jars.jarfile )
+      m[ 'jars.jarfile' ] = jarfile if File.exists?( jarfile )
+      attach_jar_coordinates_from_bundler_dependencies( m )
       m
     end
     private :maven_new
@@ -40,29 +36,35 @@ module Jars
       File.expand_path( '.' )
     end
 
-    def exec( *args )
-      maven.options[ '-f' ] = File.expand_path( '../lock_down_pom.rb', __FILE__ )
-      maven.exec( *args )
-    end
-
-    def attach_jar_coordinates( maven )
+    def attach_jar_coordinates_from_bundler_dependencies( maven )
       load_path = $LOAD_PATH.dup
       require 'bundler/setup'
       done = []
       index = 0
       Gem.loaded_specs.each do |name, spec|
-        # TODO get rid of this somehow
-        deps = Maven::Tools::GemspecDependencies.new( spec )
-        deps.java_dependency_artifacts.each do |a|
+        deps = GemspecArtifacts.new( spec )
+        deps.artifacts.each do |a|
           unless done.include? a.key
-            maven.property( "jars.#{index}", a.to_s )
+            maven.property( "jars.#{index}", a.to_coord )
+            if a.exclusions
+              jndex = 0
+              a.exclusions.each do |ex|
+                maven.property( "jars.#{index}.exclusions.#{jndex}", ex.to_s )
+              end
+            end
+            maven.property( "jars.#{index}.scope", a.scope ) if a.scope
             index += 1
             done << a.key
           end
         end
       end
-    rescue LoadError
-      warn "no bundler found - ignore Gemfile if exists"
+    rescue LoadError => e
+      if Jars.verbose?
+        warn e.message
+        warn "no bundler found - ignore Gemfile if exists"
+      end
+    rescue SystemExit
+      # we want to continue
     ensure
       $LOAD_PATH.replace( load_path )
     end
@@ -74,7 +76,6 @@ module Jars
       maven.property( 'jars.outputFile', out )
       maven.property( 'maven.repo.local', Jars.home )
       maven.property( 'jars.home', vendor_dir ) if vendor_dir
-      # TODO move into jar-dependencies
       maven.property( 'jars.lock', File.expand_path( Jars.lock ) )
       maven.property( 'jars.force', options[ :force ] == true )
       maven.property( 'jars.update', options[ :update ] ) if options[ :update ]
@@ -87,7 +88,7 @@ module Jars
       puts
       puts '-- jar root dependencies --'
       puts
-      status = exec( *args )
+      status = maven.exec( *args )
       exit 1 unless status
       if File.exists?( tree )
         puts

data/lib/jars/lock_down_pom.rb

@@ -1,5 +1,6 @@
-bdir = java.lang.System.getProperty( "jars.basedir" )
-jfile = java.lang.System.getProperty( "jars.jarfile" )
+# this file is maven DSL and used by maven via jars/executor.rb
+
+bdir = ENV_JAVA[ "jars.basedir" ]
 
 basedir( bdir )
 if basedir != bdir
@@ -8,28 +9,37 @@ if basedir != bdir
 end
 
 ( 0..10000 ).each do |i|
-  coord = java.lang.System.getProperty( "jars.#{i}" )
+  coord = ENV_JAVA[ "jars.#{i}" ]
   break unless coord
-  artifact = Maven::Tools::Artifact.from_coordinate( coord.to_s )
-  # HACK around broken maven-tools
-  if artifact.exclusions
-    ex = artifact.classifier[1..-1] + ':' +  artifact.exclusions.join(':')
-    artifact.classifier = nil
-    artifact.exclusions = ex.split /,/
+  artifact = Maven::Tools::Artifact.from_coordinate( coord )
+  exclusions = []
+  ( 0..10000 ).each do |j|
+    exclusion = ENV_JAVA[ "jars.#{i}.exclusions.#{j}" ]
+    break unless exclusion
+    exclusions << exclusion
+  end
+  scope = ENV_JAVA[ "jars.#{i}.scope" ]
+  artifact.scope = scope if scope
+  dependency_artifact( artifact ) do
+    exclusions.each do |ex|
+      exclusion ex
+    end
   end
-  dependency_artifact( artifact ) 
 end
 
-jarfile( jfile )
+jruby_plugin :gem, ENV_JAVA[ "jruby.plugins.version" ]
 
-properties( 'project.build.sourceEncoding' => 'utf-8' )
+jfile = ENV_JAVA[ "jars.jarfile" ]
+jarfile( jfile ) if jfile
 
-plugin_repository :id => 'sonatype-snapshots', :url => 'https://oss.sonatype.org/content/repositories/snapshots'
-jruby_plugin :gem, '1.0.10-SNAPSHOT'
+gemspec rescue nil
+
+properties( 'project.build.sourceEncoding' => 'utf-8' )
 
-plugin :dependency, '2.8'
+plugin :dependency, ENV_JAVA[ "dependency.plugin.version" ]
 
 # some output
 model.dependencies.each do |d|
   puts "      " + d.group_id + ':' + d.artifact_id + (d.classifier ? ":" + d.classifier : "" ) + ":" + d.version + ':' + (d.scope || 'compile')
+  puts "          exclusions: " + d.exclusions.collect{ |e| e.group_id + ':' + e.artifact_id }.join unless d.exclusions.empty?
 end

data/lib/jars/maven_exec.rb

@@ -1,4 +1,5 @@
 require 'jar_dependencies'
+require 'jars/maven_factory'
 
 module Jars
   class MavenExec
@@ -19,6 +20,7 @@ module Jars
     attr_reader :basedir, :spec, :specfile
 
     def initialize( spec = nil )
+      @options = {}
       setup( spec )
     rescue StandardError, LoadError => e
       # If spec load fails, skip looking for jar-dependencies
@@ -56,104 +58,22 @@ module Jars
     end
 
     def ruby_maven_install_options=( options )
-      @options = options.dup
-      @options.delete( :ignore_dependencies )
+      @options = options
     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( *args )
-    end
-
-    def setup_arguments( pom, *goals )
-      args = goals.dup
-      args << '-DoutputAbsoluteArtifactFilename=true'
-      args << '-DincludeTypes=jar'
-      args << '-DoutputScope=true'
-      args << '-DuseRepositoryLayout=true'
-      args << "-DoutputDirectory=#{Jars.home}"
-      # TODO copy pom to tmp dir in case it is not a real file
-      args << '-f' << "#{File.dirname( __FILE__ )}/#{pom}"
-      args << "-Djars.specfile=#{@specfile}"
-
-      if Jars.debug?
-        args << '-X'
-      elsif not Jars.verbose?
-        args << '--quiet'
-      end
-
-      # TODO what todo with https proxy ?
-      # FIX this proxy settings seems not to work
-      if (proxy = Gem.configuration[ :http_proxy ]).is_a?( String )
-        require 'uri'; uri = URI.parse( proxy )
-        args << "-DproxySet=true"
-        args << "-DproxyHost=#{uri.host}"
-        args << "-DproxyPort=#{uri.port}"
-      end
-
-      if Jars.maven_settings
-        args << '-s'
-        args << Jars.maven_settings
-      end
-
-      args << "-Dmaven.repo.local=#{java.io.File.new( Jars.local_maven_repo ).absolute_path}"
-
-      args
-    end
-
-    def lazy_load_maven
-      add_gem_to_load_path( 'ruby-maven-libs' )
-      add_gem_to_load_path( 'ruby-maven' )
-      require 'maven/ruby/maven'
-    end
-
-    def find_spec_via_rubygems( name )
-      require 'rubygems/dependency'
-      dep = Gem::Dependency.new( name )
-      dep.matching_specs( true ).last
-    end
-
-    def add_gem_to_load_path( name )
-      # if the gem is already activated => good
-      return if Gem.loaded_specs[ name ]
-      # just install gem if needed and add it to the load_path
-      # and leave activated gems as they are
-      unless spec = find_spec_via_rubygems( name )
-        spec = install_gem( name )
-      end
-      unless spec
-        raise "failed to resolve gem '#{name}' if you're using Bundler add it as a dependency"
-      end
-      $LOAD_PATH << File.join( spec.full_gem_path, spec.require_path )
-    end
-
-    def install_gem( name )
-      puts "Installing gem '#{name}' . . ."
-      require 'rubygems/dependency_installer'
-      jars = Gem.loaded_specs[ 'jar-dependencies' ]
-      dep = jars.dependencies.detect { |d| d.name == name }
-      req = dep.nil? ? Gem::Requirement.create( '>0' ) : dep.requirement
-      inst = Gem::DependencyInstaller.new( @options ||= {} )
-      inst.install( name, req ).first
-    rescue => e
-      if Jars.verbose?
-        warn "#{e.inspect}"
-        warn e.backtrace.join( "\n" )
-      end
-      raise "there was an error installing '#{name} (#{req})' #{@option[:domain]}. please install it manually: #{e.inspect}"
+      factory = MavenFactory.new( @options )
+      maven = factory.maven_new( File.expand_path( '../gemspec_pom.rb', __FILE__ ) )
+
+      maven[ 'outputAbsoluteArtifactFilename' ] = 'true'
+      maven[ 'includeTypes' ] = 'jar'
+      maven[ 'outputScope' ] = 'true'
+      maven[ 'useRepositoryLayout' ] = 'true'
+      maven[ 'outputDirectory' ] = "#{Jars.home}"
+      maven[ 'jars.specfile' ] = "#{@specfile}"
+      maven[ 'outputFile' ] = "#{file}"
+
+      maven.exec( 'dependency:copy-dependencies', 'dependency:list' )
     end
   end
 end

data/lib/jars/maven_factory.rb

@@ -0,0 +1,100 @@
+require 'jar_dependencies'
+
+module Jars
+  class MavenFactory
+
+    attr_reader :debug, :verbose
+
+    def initialize( options = nil,  debug = Jars.debug?, verbose = Jars.verbose? )
+      @options = (options || {}).dup
+      @options.delete( :ignore_dependencies )
+      @debug = debug
+      @verbose = verbose
+    end
+
+    def maven_new( pom )
+      lazy_load_maven
+      maven = setup( Maven::Ruby::Maven.new )
+
+      # TODO copy pom to tmp dir in case it is not a real file
+      maven.options[ '-f' ] = pom
+      maven
+    end
+
+    private
+
+    def setup( maven )
+      maven.verbose = @verbose
+      if @debug
+        maven.options[ '-X' ] = nil
+      end
+      if @verbose
+        maven.options[ '-e' ] = nil
+      elsif not @debug
+        maven.options[ '--quiet' ] = nil
+      end
+      maven[ 'verbose' ] = (@debug || @verbose) == true
+
+      # TODO what todo with https proxy ?
+      # FIX this proxy settings seems not to work
+      if (proxy = Gem.configuration[ :http_proxy ]).is_a?( String )
+        require 'uri'; uri = URI.parse( proxy )
+        maven['proxySet'] = 'true'
+        maven['proxyHost'] = "#{uri.host}"
+        maven['proxyPort'] = "#{uri.port}"
+      end
+
+      if Jars.maven_settings
+        maven.options[ '-s' ] = Jars.maven_settings
+      end
+
+      maven[ 'maven.repo.local' ] = "#{java.io.File.new( Jars.local_maven_repo ).absolute_path}"
+
+      maven
+    end
+
+    private
+
+    def lazy_load_maven
+      add_gem_to_load_path( 'ruby-maven-libs' )
+      add_gem_to_load_path( 'ruby-maven' )
+      require 'maven/ruby/maven'
+    end
+
+    def find_spec_via_rubygems( name )
+      require 'rubygems/dependency'
+      dep = Gem::Dependency.new( name )
+      dep.matching_specs( true ).last
+    end
+
+    def add_gem_to_load_path( name )
+      # if the gem is already activated => good
+      return if Gem.loaded_specs[ name ]
+      # just install gem if needed and add it to the load_path
+      # and leave activated gems as they are
+      unless spec = find_spec_via_rubygems( name )
+        spec = install_gem( name )
+      end
+      unless spec
+        raise "failed to resolve gem '#{name}' if you're using Bundler add it as a dependency"
+      end
+      $LOAD_PATH << File.join( spec.full_gem_path, spec.require_path )
+    end
+
+    def install_gem( name )
+      puts "Installing gem '#{name}' . . ."
+      require 'rubygems/dependency_installer'
+      jars = Gem.loaded_specs[ 'jar-dependencies' ]
+      dep = jars.dependencies.detect { |d| d.name == name }
+      req = dep.nil? ? Gem::Requirement.create( '>0' ) : dep.requirement
+      inst = Gem::DependencyInstaller.new( @options ||= {} )
+      inst.install( name, req ).first
+    rescue => e
+      if Jars.verbose?
+        warn "#{e.inspect}"
+        warn e.backtrace.join( "\n" )
+      end
+      raise "there was an error installing '#{name} (#{req})' #{@option[:domain]}. please install it manually: #{e.inspect}"
+    end
+  end
+end

data/lib/jars/setup.rb

@@ -4,4 +4,4 @@
 
 require 'jar_dependencies'
 
-Jars.require_jars_lock!
+Jars.setup

data/lib/jars/version.rb

@@ -1,3 +1,5 @@
 module Jars
-  VERSION = '0.1.16.pre'.freeze
+  VERSION = '0.2.1'.freeze
+  JRUBY_PLUGINS_VERSION = '1.0.10'.freeze
+  DEPENDENCY_PLUGIN_VERSION = '2.8'.freeze
 end

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.16.pre
+  version: 0.2.1
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-09-06 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.0
+        version: '10.2'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.3
+  name: ruby-maven
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: ruby-maven-libs
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-  prerelease: false
-  type: :development
+        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
@@ -85,13 +71,14 @@ files:
 - lib/jar_install_post_install_hook.rb
 - lib/jar_installer.rb
 - lib/jars/classpath.rb
-- lib/jars/executor.rb
+- lib/jars/gemspec_artifacts.rb
+- lib/jars/gemspec_pom.rb
 - lib/jars/installer.rb
-- lib/jars/jar_pom.rb
-- lib/jars/jars_lock_pom.rb
 - lib/jars/lock.rb
+- lib/jars/lock_down.rb
 - lib/jars/lock_down_pom.rb
 - lib/jars/maven_exec.rb
+- lib/jars/maven_factory.rb
 - lib/jars/post_install_hook.rb
 - lib/jars/setup.rb
 - lib/jars/version.rb
@@ -100,7 +87,10 @@ homepage: https://github.com/mkristian/jar-dependencies
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+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 ~> 3.3.3\n\
+  \nor add it as deveopment dependency to your Gemfile\n\n   gem 'ruby-maven', ~>\
+  \ 3.3.3\n\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -111,12 +101,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: manage jar dependencies for gems

data/lib/jars/jars_lock_pom.rb

@@ -1,16 +0,0 @@
-# this file is maven DSL and used by maven via jars/maven_exec.rb
-
-require_relative 'lock'
-require_relative '../jar_dependencies'
-
-lock = Jars::Lock.new( ENV_JAVA['jars.lock'] )
-
-lock.process( :all ) do |coord|
-
-  options = { :scope => coord.scope }
-  options[ :systemPath ] = coord[ -1 ] if coord.scope == :system
-  options[ :classifier ] = coord.classifier
-  
-  jar coord.group_id, coord.artifact_id, coord.version, options
-
-end