jar-dependencies 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b0779dda127fa309b6e7403b2f4dab16b4d1fe
-  data.tar.gz: 76fc989f956c1e72a140de043a417a713a444ecc
+  metadata.gz: 47218aaa72a8f9a2e38b5caba257a637a30419e6
+  data.tar.gz: 657965ecece116b92e2979669db3f9f2c2a9e8b4
 SHA512:
-  metadata.gz: 75bc7bc19f0f0a41423a2be7206bb125ac7735099a48b7250193b8948d6e4da3de4ec36a2641c0eb727a83d02c57aa2502d62c0a6a0b2ce0e687ef3ce4e48f0d
-  data.tar.gz: 06afdf617b0a7b17f3c6095039bec02a7202a42afe298ecc59c725e0a57225ecc76cacb53abf07d2882654d179560096902eec97aa5ab2394d0f2d121af66272
+  metadata.gz: 8118b85d509069969b158b033bd5af94b8a177b3287e7fb502cb3a30ad403bd91993c50f685909c0c670d5eebc3ab4974724b1349d629809550bcb3a48f75be6
+  data.tar.gz: 77736c9d2020481c94e913885e58ee41bf410edc7211ccf9543f85df3440446fc904a009254e72cebb104a572ca8efead09e5241820c88aae6feaf24a04cb9cc

data/Mavenfile

@@ -13,7 +13,7 @@ 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.13'#,'9000.dev-SNAPSHOT'
+properties( 'jruby.versions' => ['1.6.8', '1.7.12', '1.7.16.1'#,'9000.dev-SNAPSHOT'
                                 ].join(','),
             'jruby.modes' => ['1.9', '2.0','2.1'].join(','),
             # just lock the version
@@ -25,9 +25,9 @@ plugin :invoker, '1.8' do
   execute_goals( :install, :run,
                  :id => 'integration-tests',
                  :projectsDirectory => 'integration',
-                 :properties => { 'jar-dependencies.version' => '${project.version}' },
-                 :pomIncludes => [ '*/pom.xml' ],
-                 :streamLogs => true )
+                 :streamLogs => true ,
+                 :cloneProjectsTo => '${project.build.directory}',
+                 :properties => { 'jar-dependencies.version' => '${project.version}' })
 end
 
 # vim: syntax=Ruby

data/jar-dependencies.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'jar-dependencies'
-  s.version = "0.1.4"
+  s.version = "0.1.7"
   s.author = 'christian meier'
   s.email = [ 'mkristian@web.de' ]
   s.summary = 'manage jar dependencies for gems'
@@ -18,10 +18,9 @@ Gem::Specification.new do |s|
 
   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.requirements << "gem ruby-maven, ~> 3.1.1.0, :scope => :runtime"
-
   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"
 end
 
 # vim: syntax=Ruby

data/lib/jar_dependencies.rb

@@ -55,7 +55,7 @@ module Jars
     end
 
     def no_require?
-      to_boolean( NO_REQUIRE )
+      @frozen || to_boolean( NO_REQUIRE )
     end
 
     def quiet?
@@ -75,7 +75,7 @@ module Jars
     end
 
     def freeze_loading
-      ENV[ NO_REQUIRE ] = 'true'
+      @frozen = true
     end
 
     def reset

data/lib/jar_installer.rb

@@ -39,8 +39,8 @@ module Jars
         setup_type( line )
 
         line.sub!( /^\s+/, '' )
-        @coord = line.sub( /:[^:]+:[^:]+$/, '' )
-        first, second = line.sub( /:[^:]+:[^:]+$/, '' ).split( /:#{type}:/ )
+        @coord = line.sub( /:[^:]+:([A-Z]:\\)?[^:]+$/, '' )
+        first, second = @coord.split( /:#{type}:/ )
         group_id, artifact_id = first.split( /:/ )
         parts = group_id.split( '.' )
         parts << artifact_id
@@ -50,9 +50,14 @@ module Jars
 
         setup_scope( line )
 
-        line.gsub!( /:jar:|:pom:|:test:|:compile:|:runtime:|:provided:/, ':' )
-        @file = line.sub( /^.*:/, '' ).strip
-        @gav = line.sub( /:[^:]+$/, '' )
+        reg = /:jar:|:pom:|:test:|:compile:|:runtime:|:provided:|:system:/
+        @file = line.slice(@coord.length, line.length).sub(reg, '').strip
+        @system = nil != (line =~ /:system:/)
+        @gav = @coord.sub(reg, ':')
+      end
+
+      def system?
+        @system
       end
     end
 
@@ -88,18 +93,25 @@ module Jars
     def self.vendor_file( dir, dep )
       vendored = File.join( dir, dep.path )
       FileUtils.mkdir_p( File.dirname( vendored ) )
-      FileUtils.cp( dep.file, vendored )
+      FileUtils.cp( dep.file, vendored ) unless dep.system?
+    end
+
+    def self.write_dep( file, dir, dep, vendor )
+      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
 
     def self.install_deps( deps, dir, require_filename, vendor )
       f = write_require_file( require_filename ) if require_filename
       deps.each do |dep|
-        next if dep.type != :jar || dep.scope != :runtime
-        args = dep.gav.gsub( /:/, "', '" )
-        vendor_file( dir, dep ) if vendor
-        f.puts( "require_jar( '#{args}' )" ) if f
+        write_dep( f, dir, dep, vendor )
       end
-      yield f if block_given?
+      yield f if block_given? and f
     ensure
       f.close if f
     end
@@ -153,6 +165,7 @@ module Jars
 
     def ruby_maven_install_options=( options )
       @options = options.dup
+      @options.delete( :ignore_dependencies )
     end
 
     def vendor_jars( write_require_file = true )
@@ -193,7 +206,7 @@ module Jars
     end
 
     def setup_arguments( deps )
-      args = [ 'dependency:list', "-DoutputFile=#{deps}", '-DincludeScope=runtime', '-DoutputAbsoluteArtifactFilename=true', '-DincludeTypes=jar', '-DoutputScope=true', '-f', @specfile ]
+      args = [ 'dependency:list', "-DoutputFile=#{deps}", '-DoutputAbsoluteArtifactFilename=true', '-DincludeTypes=jar', '-DoutputScope=true', '-f', @specfile ]
 
       if Jars.debug?
         args << '-X'
@@ -236,7 +249,7 @@ module Jars
       raise "there was an error installing 'ruby-maven'. please install it manually: #{e.inspect}"
     end
 
-    def monkey_path_gem_dependencies
+    def monkey_patch_gem_dependencies
       # monkey patch to NOT include gem dependencies
       require 'maven/tools/gemspec_dependencies'
       eval <<EOF
@@ -250,7 +263,7 @@ EOF
     def install_dependencies
       lazy_load_maven
 
-      monkey_path_gem_dependencies
+      monkey_patch_gem_dependencies
 
       deps = File.join( @basedir, 'deps.lst' )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,6 +38,20 @@ dependencies:
         version: '10.2'
   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.8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.1.0.8
+  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.
 email:
 - mkristian@web.de
@@ -76,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- gem ruby-maven, ~> 3.1.1.0, :scope => :runtime
+requirements: []
 rubyforge_project:
 rubygems_version: 2.1.9
 signing_key: