jar-dependencies 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47218aaa72a8f9a2e38b5caba257a637a30419e6
-  data.tar.gz: 657965ecece116b92e2979669db3f9f2c2a9e8b4
+  metadata.gz: f607cf0e0acf6dc622b37a829a8adc1322edfbf6
+  data.tar.gz: 8cf7cc1b6d81ca0f1c664a98b6519586265fa813
 SHA512:
-  metadata.gz: 8118b85d509069969b158b033bd5af94b8a177b3287e7fb502cb3a30ad403bd91993c50f685909c0c670d5eebc3ab4974724b1349d629809550bcb3a48f75be6
-  data.tar.gz: 77736c9d2020481c94e913885e58ee41bf410edc7211ccf9543f85df3440446fc904a009254e72cebb104a572ca8efead09e5241820c88aae6feaf24a04cb9cc
+  metadata.gz: b4bfa3b22e9fd05eee1710cc4859799a7271d6d9779ef86be3925cb08ace83e33e48c3d30bfcd0944995192e4c98414638afe607fe51141c8cbfe9c9d8138fc8
+  data.tar.gz: 326a5440977b4440e20698680843e1f2da0bfc69abc6e285cac0e0e345f25ebef9455fe1659d6c211bd904f6b376ce859cb04c752a358432686afb90ad6d3423

data/Mavenfile

@@ -13,9 +13,9 @@ end
 #snapshot_repository :jruby, 'http://ci.jruby.org/snapshots/maven'
 
 # (jruby-1.6.8 mode 1.8 produces a lot of yaml errors parsing gemspecs)
-properties( 'jruby.versions' => ['1.6.8', '1.7.12', '1.7.16.1'#,'9000.dev-SNAPSHOT'
+properties( 'jruby.versions' => ['1.6.8', '1.7.12', '1.7.19', '9.0.0.0.pre1'
                                 ].join(','),
-            'jruby.modes' => ['1.9', '2.0','2.1'].join(','),
+            'jruby.modes' => ['1.9', '2.0', '2.1'].join(','),
             # just lock the version
             'jruby.version' => '1.7.13',
             'tesla.dump.pom' => 'pom.xml',
@@ -25,7 +25,8 @@ plugin :invoker, '1.8' do
   execute_goals( :install, :run,
                  :id => 'integration-tests',
                  :projectsDirectory => 'integration',
-                 :streamLogs => true ,
+                 :streamLogs => true,
+                 :goals => ['install'],
                  :cloneProjectsTo => '${project.build.directory}',
                  :properties => { 'jar-dependencies.version' => '${project.version}' })
 end

data/jar-dependencies.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'jar-dependencies'
-  s.version = "0.1.7"
+  s.version = "0.1.8"
   s.author = 'christian meier'
   s.email = [ 'mkristian@web.de' ]
   s.summary = 'manage jar dependencies for gems'
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.executable = 'bundle-with-jars'
 
-  s.files = Dir[ 'lib/*rb' ]
+  s.files = Dir[ 'lib/**/*rb' ]
   s.files += Dir[ '*file' ]
   s.files += [ 'Readme.md', 'jar-dependencies.gemspec', 'MIT-LICENSE' ]
 
@@ -20,7 +20,7 @@ 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.1.1.0.8"
+  s.add_development_dependency "ruby-maven", "~> 3.1.1.0.9"
 end
 
 # vim: syntax=Ruby

data/lib/jar_dependencies.rb

@@ -20,14 +20,18 @@
 #
 
 module Jars
-  HOME = 'JARS_HOME'.freeze
-  MAVEN_SETTINGS = 'JARS_MAVEN_SETTINGS'.freeze
-  SKIP = 'JARS_SKIP'.freeze
-  NO_REQUIRE = 'JARS_NO_REQUIRE'.freeze
-  QUIET = 'JARS_QUIET'.freeze
-  VERBOSE = 'JARS_VERBOSE'.freeze
-  DEBUG = 'JARS_DEBUG'.freeze
-  VENDOR = 'JARS_VENDOR'.freeze
+  unless defined? Jars::MAVEN_SETTINGS
+    HOME = 'JARS_HOME'.freeze
+    MAVEN_SETTINGS = 'JARS_MAVEN_SETTINGS'.freeze
+    # skip the gem post install hook
+    SKIP = 'JARS_SKIP'.freeze
+    # just do not require any jars
+    NO_REQUIRE = 'JARS_NO_REQUIRE'.freeze
+    QUIET = 'JARS_QUIET'.freeze
+    VERBOSE = 'JARS_VERBOSE'.freeze
+    DEBUG = 'JARS_DEBUG'.freeze
+    VENDOR = 'JARS_VENDOR'.freeze
+  end
 
   class << self
 
@@ -59,7 +63,7 @@ module Jars
     end
 
     def quiet?
-      to_boolean( QUIET )
+      @silent || to_boolean( QUIET )
     end
 
     def verbose?
@@ -74,6 +78,10 @@ module Jars
       to_boolean( VENDOR )
     end
 
+    def no_more_warnings
+      @silent = true
+    end
+
     def freeze_loading
       @frozen = true
     end
@@ -170,17 +178,16 @@ module Jars
       end
     end
 
-    def detect_local_repository(settings); require 'rexml/document'
-      doc = REXML::Document.new( File.read( settings ) )
-      if local_repo = doc.root.elements['localRepository']
-        if ( local_repo = local_repo.first )
-          local_repo = local_repo.value
-          # replace maven like system properties embedded into the string
-          local_repo.gsub!( /\$\{[a-zA-Z.]+\}/ ) do |a|
-            ENV_JAVA[ a[2..-2] ] || a
-          end
-          local_repo = nil if local_repo.empty?
-        end
+    def detect_local_repository(settings)
+      doc = File.read( settings )
+      # TODO filter out xml comments
+      local_repo = doc.sub( /<\/localRepository>.*/m, '' ).sub( /.*<localRepository>/m, '' )
+      # replace maven like system properties embedded into the string
+      local_repo.gsub!( /\$\{[a-zA-Z.]+\}/ ) do |a|
+        ENV_JAVA[ a[2..-2] ] || a
+      end
+      if local_repo.empty? or not File.exists?( local_repo )
+        local_repo = nil 
       end
       local_repo
     end

data/lib/jar_installer.rb

@@ -170,8 +170,17 @@ module Jars
 
     def vendor_jars( write_require_file = true )
       return unless has_jars?
-      # do not vendor only if set explicitly via ENV/system-properties
-      do_install( Jars.to_prop( Jars::VENDOR ) != 'false', write_require_file )
+      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 )
+      end
+      do_install( do_vendor, write_require_file )
     end
 
     def install_jars( write_require_file = true )
@@ -206,7 +215,13 @@ module Jars
     end
 
     def setup_arguments( deps )
-      args = [ 'dependency:list', "-DoutputFile=#{deps}", '-DoutputAbsoluteArtifactFilename=true', '-DincludeTypes=jar', '-DoutputScope=true', '-f', @specfile ]
+      args = [ 'dependency:list',
+               "-DoutputFile=#{deps}", 
+               '-DoutputAbsoluteArtifactFilename=true', 
+               '-DincludeTypes=jar', 
+               '-DoutputScope=true',
+               '-f', File.dirname( __FILE__ ) + '/jars/jar_pom.rb',
+               "-Djars.specfile=#{@specfile}" ]
 
       if Jars.debug?
         args << '-X'
@@ -269,6 +284,7 @@ EOF
 
       maven = Maven::Ruby::Maven.new
       maven.verbose = Jars.verbose?
+      puts "  jar dependencies for #{@spec.spec_name} . . ." unless Jars.quiet?
       maven.exec( *setup_arguments( deps ) )
 
       self.class.load_from_maven( deps )

data/lib/jars/jar_pom.rb

@@ -0,0 +1,22 @@
+# this file is maven DSL and used by maven via jar_installer.rb
+
+specfile = java.lang.System.getProperty('jars.specfile')
+
+# needed since the gemspec does not allow absolute files
+basedir( File.dirname( specfile ) )
+
+# get ALL depenedencies from the specfile
+gemspec File.basename( specfile )
+
+# we do not want those gem dependencies
+gems = model.dependencies.select do |d|
+  d.group_id == 'rubygems'
+end
+gems.each do |d|
+  model.dependencies.remove( d )
+end
+
+# some output
+model.dependencies.each do |d|
+  puts "      " + d.group_id + ':' + d.artifact_id + (d.classifier ? ":" + d.classifier : "" ) + ":" + d.version
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -44,12 +44,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1.0.8
+        version: 3.1.1.0.9
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1.0.8
+        version: 3.1.1.0.9
   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.
@@ -65,6 +65,7 @@ files:
 - lib/jar_installer.rb
 - lib/jar-dependencies.rb
 - lib/rubygems_plugin.rb
+- lib/jars/jar_pom.rb
 - bin/bundle-with-jars
 - Rakefile
 - Mavenfile