jar-dependencies 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa36ecd310e85a018381f6f1a619c697873b7f1f
-  data.tar.gz: 0db8878e2c8825d1e037ac99aa07b5d7b1f065f6
+  metadata.gz: 9af7f3df159b3a9eb53f8af55f533107b73bc88d
+  data.tar.gz: bac89ca7cf7f7db5d2e2c5f14c153100dd8eb87f
 SHA512:
-  metadata.gz: 4a2452584a7508da029a4d4c6c8bf3913e792869e3b20c03950a05975cf4f14e45d395787b22d5a082b36f2a151be129af22582cd45b9d31d42ef8d9df027336
-  data.tar.gz: 625eb01f0d0aaed9d4d017f1dbb11167ab087e2230b4553c337737710592f434ad581aae72f12c17316047164fa83102d8059114825217bb44fba306dfa73d69
+  metadata.gz: 8a3e4898522d92e63d8088ffdd32e5e4143061078ab7feef26f3c98281f6f3a0a3f72c4bdce6c5c39e34e7ffce14a954ea0a44422aa74e5decd854ffe0c0cce9
+  data.tar.gz: 47b2c9bf2e6a8fda74c3a6baeadd96284d022da54dbc36cbf1477e4017f4a899b8fa3553d69162810cd55cd640cd202a341d5033c74899f6ffb009c6238ba8f7

data/Mavenfile

@@ -2,13 +2,17 @@
 
 gemfile
 
+# TODO should be setup whenever a plugin uses gems
+plugin_repository :id => 'rubygems-releases', :url => 'http://rubygems-proxy.torquebox.org/releases'
+
 jruby_plugin( :minitest, :minispecDirectory => "specs/*_spec.rb" ) do
   execute_goals(:spec)
+  gem 'ruby-maven', '3.1.1.0.8'
 end
 
 snapshot_repository :jruby, 'http://ci.jruby.org/snapshots/maven'
 
-# (jruby-1.6.8 produces a lot of yaml errors parsing gemspecs)
+# (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'].join(','),
             'jruby.modes' => ['1.9', '2.0','2.1'].join(','),
             # just lock the version
@@ -16,4 +20,12 @@ properties( 'jruby.versions' => ['1.6.8', '1.7.13','9000.dev-SNAPSHOT'].join(','
             'tesla.dump.pom' => 'pom.xml',
             'tesla.dump.readonly' => true )
 
+plugin :invoker, '1.8' do
+  execute_goals( :install, :run,
+                 :id => 'integration-tests',
+                 :projectsDirectory => 'integration',
+                 :pomIncludes => [ 'pom.xml' ],
+                 :streamLogs => true )
+end
+
 # vim: syntax=Ruby

data/jar-dependencies.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'jar-dependencies'
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.author = 'christian meier'
   s.email = [ 'mkristian@web.de' ]
   s.summary = 'manage jar dependencies for gems'
@@ -18,9 +18,10 @@ 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'
 end
 
 # vim: syntax=Ruby

data/lib/jar_installer.rb

@@ -133,7 +133,7 @@ module Jars
     end
 
     def ruby_maven_install_options=( options )
-      @options = options
+      @options = options.dup
     end
 
     def vendor_jars
@@ -153,7 +153,7 @@ module Jars
       # first look if there are any requirements in the spec
       # and then if gem depends on jar-dependencies
       # only then install the jars declared in the requirements
-      ! @spec.requirements.empty? && @spec.dependencies.detect { |d| d.name == 'jar-dependencies' }
+      ! @spec.requirements.empty? && @spec.dependencies.detect { |d| d.name == 'jar-dependencies' && d.type == :runtime }
     end
 
     def do_install( vendor, write_require_file )
@@ -200,7 +200,7 @@ module Jars
       require 'rubygems/dependency_installer'
       jars = Gem.loaded_specs[ 'jar-dependencies' ]
       dep = jars.dependencies.detect { |d| d.name == 'ruby-maven' }
-      req = dep ? Gem::Requirement.create( '>0' ) : dep.requirement
+      req = dep.nil? ? Gem::Requirement.create( '>0' ) : dep.requirement
       inst = Gem::DependencyInstaller.new( @options || {} )
       inst.install 'ruby-maven', req
     rescue => e
@@ -227,6 +227,7 @@ EOF
       deps = File.join( @basedir, 'deps.lst' )
 
       maven = Maven::Ruby::Maven.new
+      maven.verbose = Jars.verbose?
       maven.exec( *setup_arguments( deps ) )
 
       self.class.load_from_maven( deps )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,20 +38,6 @@ 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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0
-  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
@@ -89,7 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- gem ruby-maven, ~> 3.1.1.0, :scope => :runtime
 rubyforge_project:
 rubygems_version: 2.1.9
 signing_key: