jar-dependencies 0.1.15 → 0.1.16.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eec8cd538aef1d82692bc4c955a3c3836530fae
-  data.tar.gz: 0f3c2d90c39f9b162e0cde6e48b2b3a1555ad694
+  metadata.gz: 61323d91e4b550079bc732eaacd34c43d6938522
+  data.tar.gz: 44458b80a2e517b6a166ac43ad452daa4ce432fc
 SHA512:
-  metadata.gz: 6c306e7d5452f34d951982e0614ea333f7c3c634803371b45051b72095e3a68b456fa4cb4162d3e6df73a30f05e4be2471e7e6dfae927d65d0fe81bdda9ca46f
-  data.tar.gz: 27bfde1dbc03629636af5e140a1deabaa3714370ca7016df96e7df021ba8dbb5740631672df12d80e838aa124758c4acee591eaaee592825ddbd14fd3cc1a204
+  metadata.gz: 941f4704dadfeeb3e1074e91eafd9c57efbfbbb48fb7ef4a118b5a1ff56c1f211ff9a3bdf0d5a451381684a63de289b1ab452b62e0d4e6ec35a7f66da2e7c969
+  data.tar.gz: f1203ff4ab4b688a23c5f1b2bb6e724a48edd95d4e3cef9f753c411f92944c05d9e21cdfa10c85c827f274f9ba48f67c4737ea981399d45c0fc4f130f74825d9

data/bin/lock_jars

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+require 'jar_dependencies'
+require 'optparse' 
+options = {}  
+optparse = OptionParser.new do|opts| 
+
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
+
+  opts.separator ''
+  opts.separator '* load jars "Jars.lock" from current working directory: `Jars.require_jars_lock!`'
+  opts.separator '* classpath features: see `Jars::Classpath'
+  opts.separator ''
+  opts.separator 'Options:'
+  opts.separator ''
+
+  opts.on( '-v', '--verbose', 'Output more information' ) do |t|
+    options[:verbose] = t
+  end
+
+  opts.on( '-d', '--debug', 'Output debug information' ) do |t|
+    options[:debug] = t
+  end
+
+  opts.on( '-f', '--force', 'Force creation of Jars.lock' ) do |t|
+    options[:force] = t
+  end
+
+  opts.on( '-t', '--tree', 'Show dependency tree' ) do |t|
+    options[:tree] = t
+  end
+
+  opts.on( '-u', '--update JAR_COORDINATE', 'Resolves given dependency and use  latest version' ) do |u|
+    options[:update] = u
+  end
+
+  opts.on( '--vendor-dir DIRECTORY', 'Vendor directory where to copy the installed jars.', 'add this directory to $LOAD_PATH or set JARS_HOME respectively.' ) do |dir|
+    options[:vendor_dir] = dir
+  end
+
+  opts.on( '-h', '--help', 'Display this screen' ) do
+    puts opts
+    exit
+  end
+end
+optparse.parse!
+
+Jars.lock_down( options[:debug], options[:verbose], options )

data/jar-dependencies.gemspec

@@ -11,6 +11,9 @@ Gem::Specification.new do |s|
   s.summary = 'manage jar dependencies for gems'
   s.homepage = 'https://github.com/mkristian/jar-dependencies'
 
+  s.bindir = "bin"
+  s.executables = ['lock_jars']
+
   s.license = 'MIT'
 
   s.files = `git ls-files`.split($/).select do |file|

data/lib/jar_dependencies.rb

@@ -48,6 +48,11 @@ module Jars
 
   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 )
+    end
+
     if defined? JRUBY_VERSION
       def to_prop( key )
         key = key.gsub( '_', '.' )
@@ -86,7 +91,11 @@ module Jars
     def quiet?
       ( @silent ||= false ) || to_boolean( QUIET )
     end
-    
+
+    def self.jarfile
+      ENV[ 'JARFILE' ] || ENV_JAVA[ 'jarfile' ] || ENV[ 'JBUNDLER_JARFILE' ] || ENV_JAVA[ 'jbundler.jarfile' ] || 'Jarfile'
+    end
+
     # @deprecated
     def no_require?; ! require? end
 
@@ -204,8 +213,8 @@ module Jars
 
     def require_jar( group_id, artifact_id, *classifier_version )
       require_jars_lock
-      require_jar_with_block( group_id, artifact_id, *classifier_version ) do |group_id, artifact_id, version, classifier|
-        do_require( group_id, artifact_id, version, classifier )
+      require_jar_with_block( group_id, artifact_id, *classifier_version ) do |gid, aid, version, classifier|
+        do_require( gid, aid, version, classifier )
       end
     end
 

data/lib/jars/executor.rb

@@ -0,0 +1,107 @@
+require 'maven/ruby/maven'
+require 'maven/tools/artifact'
+require 'maven/tools/gemspec_dependencies'
+require 'fileutils'
+require 'jar_dependencies'
+module Jars
+  
+  class Executor
+
+    attr_reader :debug, :verbose
+
+    def initialize( debug = false, verbose = false )
+      @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 )
+      m
+    end
+    private :maven_new
+
+    def maven
+      @maven ||= maven_new
+    end
+
+    def basedir
+      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 )
+      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|
+          unless done.include? a.key
+            maven.property( "jars.#{index}", a.to_s )
+            index += 1
+            done << a.key
+          end
+        end
+      end
+    rescue LoadError
+      warn "no bundler found - ignore Gemfile if exists"
+    ensure
+      $LOAD_PATH.replace( load_path )
+    end
+
+    def lock_down( options = {} )
+      vendor_dir = File.expand_path( options[ :vendor_dir ] ) if options[ :vendor_dir ]
+      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( '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 ]
+
+      args = [ 'gem:jars-lock' ]
+      if options[ :tree ]
+        args += [ 'dependency:tree', '-P -gemfile.lock', '-DoutputFile=' + tree ]
+      end
+
+      puts
+      puts '-- jar root dependencies --'
+      puts
+      status = exec( *args )
+      exit 1 unless status
+      if File.exists?( tree )
+        puts
+        puts '-- jar dependency tree --'
+        puts
+        puts File.read( tree )
+        puts
+      end
+      puts
+      puts File.read( out ).gsub( /#{File.dirname(out)}\//, '' )
+      puts
+    ensure
+      FileUtils.rm_f out
+      FileUtils.rm_f tree
+    end
+  end
+end

data/lib/jars/installer.rb

@@ -80,11 +80,11 @@ module Jars
     end
 
     def self.write_require_file( require_filename )
-      FileUtils.mkdir_p( File.dirname( require_filename ) )
-      comment = '# this is a generated file, to avoid over-writing it just delete this comment'
-      if ! File.exists?( require_filename ) || File.read( require_filename ).match( comment )
+      warn "deprecated"
+      if needs_to_write?(require_filename)
+        FileUtils.mkdir_p( File.dirname( require_filename ) )
         f = File.open( require_filename, 'w' )
-        f.puts comment
+        f.puts COMMENT
         f.puts "require 'jar_dependencies'"
         f.puts
         f
@@ -92,29 +92,58 @@ module Jars
     end
 
     def self.vendor_file( dir, dep )
-      vendored = File.join( dir, dep.path )
-      FileUtils.mkdir_p( File.dirname( vendored ) )
-      FileUtils.cp( dep.file, vendored ) unless dep.system?
+      if !dep.system? && dep.type == :jar && dep.scope == :runtime
+        vendored = File.join( dir, dep.path )
+        FileUtils.mkdir_p( File.dirname( vendored ) )
+        FileUtils.cp( dep.file, vendored )
+      end
     end
 
     def self.write_dep( file, dir, dep, vendor )
+      warn "deprecated"
+      print_require_jar( file, dep )
+    end
+
+    def self.print_require_jar( file, dep )
       return if dep.type != :jar || dep.scope != :runtime
       if dep.system?
         file.puts( "require( '#{dep.file}' )" ) if file
       elsif dep.scope == :runtime
-        vendor_file( dir, dep ) if vendor
         file.puts( "require_jar( '#{dep.gav.gsub( ':', "', '" )}' )" ) if file
       end
     end
 
+    COMMENT = '# this is a generated file, to avoid over-writing it just delete this comment'
+    def self.needs_to_write?(require_filename)
+      ( require_filename and not File.exists?( require_filename ) ) or
+        File.read( require_filename ).match( COMMENT)
+    end
+
     def self.install_deps( deps, dir, require_filename, vendor )
-      f = write_require_file( require_filename ) if require_filename
+      warn "deprecated"
+      write_require_jars( deps, require_filename )
+      vendor_jars( deps, dir ) if dir && vendor
+    end
+
+    def self.write_require_jars( deps, require_filename )
+      if needs_to_write?(require_filename)
+        FileUtils.mkdir_p( File.dirname( require_filename ) )
+        File.open( require_filename, 'w' ) do |f|
+          f.puts COMMENT
+          f.puts "require 'jar_dependencies'"
+          f.puts
+          deps.each do |dep|
+            print_require_jar( f, dep )
+          end
+          yield f if block_given?
+        end
+      end
+    end
+
+    def self.vendor_jars( deps, dir )
       deps.each do |dep|
-        write_dep( f, dir, dep, vendor )
+        vendor_file( dir, dep )
       end
-      yield f if block_given? and f
-    ensure
-      f.close if f
     end
 
     def initialize( spec = nil )
@@ -165,8 +194,8 @@ module Jars
     private
 
     def do_install( vendor, write_require_file )
-      vendor_dir = File.join( @mvn.basedir, spec.require_path )
-      jars_file = File.join( vendor_dir, "#{spec.name}_jars.rb" )
+      target_dir = File.join( @mvn.basedir, spec.require_path )
+      jars_file = File.join( target_dir, "#{spec.name}_jars.rb" )
 
       # write out new jars_file it write_require_file is true or
       # check timestamps:
@@ -177,8 +206,11 @@ module Jars
         # leave jars_file as is
         jars_file = nil
       end
-      self.class.install_deps( install_dependencies, vendor_dir,
-                               jars_file, vendor )
+      deps = install_dependencies()
+      self.class.write_require_jars( deps, jars_file )
+      if vendor
+        self.class.vendor_jars( deps, target_dir )
+      end
     end
 
     def install_dependencies

data/lib/jars/lock_down_pom.rb

@@ -0,0 +1,35 @@
+bdir = java.lang.System.getProperty( "jars.basedir" )
+jfile = java.lang.System.getProperty( "jars.jarfile" )
+
+basedir( bdir )
+if basedir != bdir
+  # older maven-tools needs this
+  self.instance_variable_set( :@basedir, bdir )
+end
+
+( 0..10000 ).each do |i|
+  coord = java.lang.System.getProperty( "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 /,/
+  end
+  dependency_artifact( artifact ) 
+end
+
+jarfile( jfile )
+
+properties( 'project.build.sourceEncoding' => 'utf-8' )
+
+plugin_repository :id => 'sonatype-snapshots', :url => 'https://oss.sonatype.org/content/repositories/snapshots'
+jruby_plugin :gem, '1.0.10-SNAPSHOT'
+
+plugin :dependency, '2.8'
+
+# some output
+model.dependencies.each do |d|
+  puts "      " + d.group_id + ':' + d.artifact_id + (d.classifier ? ":" + d.classifier : "" ) + ":" + d.version + ':' + (d.scope || 'compile')
+end

data/lib/jars/maven_exec.rb

@@ -20,6 +20,10 @@ module Jars
 
     def initialize( spec = nil )
       setup( spec )
+    rescue StandardError, LoadError => e
+      # If spec load fails, skip looking for jar-dependencies
+      warn "jar-dependencies: " + e.to_s
+      warn e.backtrace.join( "\n" ) if Jars.verbose?
     end
 
     def setup( spec = nil, allow_no_file = false )
@@ -48,10 +52,7 @@ module Jars
       else
         raise 'spec must be either String or Gem::Specification'
       end
-
       @spec = spec
-    rescue
-      # for all those strange gemspec we skip looking for jar-dependencies
     end
 
     def ruby_maven_install_options=( options )
@@ -84,6 +85,7 @@ module Jars
       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}"
 
@@ -139,6 +141,7 @@ module Jars
     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 }
@@ -146,8 +149,11 @@ module Jars
       inst = Gem::DependencyInstaller.new( @options ||= {} )
       inst.install( name, req ).first
     rescue => e
-      warn e.backtrace.join( "\n" ) if Jars.verbose?
-      raise "there was an error installing '#{name}'. please install it manually: #{e.inspect}"
+      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/version.rb

@@ -1,3 +1,3 @@
 module Jars
-  VERSION = '0.1.15'.freeze
+  VERSION = '0.1.16.pre'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16.pre
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -69,7 +69,8 @@ dependencies:
 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: []
+executables:
+- lock_jars
 extensions: []
 extra_rdoc_files: []
 files:
@@ -77,16 +78,19 @@ files:
 - Mavenfile
 - Rakefile
 - Readme.md
+- bin/lock_jars
 - jar-dependencies.gemspec
 - lib/jar-dependencies.rb
 - lib/jar_dependencies.rb
 - lib/jar_install_post_install_hook.rb
 - lib/jar_installer.rb
 - lib/jars/classpath.rb
+- lib/jars/executor.rb
 - lib/jars/installer.rb
 - lib/jars/jar_pom.rb
 - lib/jars/jars_lock_pom.rb
 - lib/jars/lock.rb
+- lib/jars/lock_down_pom.rb
 - lib/jars/maven_exec.rb
 - lib/jars/post_install_hook.rb
 - lib/jars/setup.rb
@@ -107,9 +111,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.6