jar-dependencies 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67596525df0c9a029290a56e4c2e0fbca74fc298
-  data.tar.gz: 44fe4eb030153ed7e44dc790ea65d3bbc59f0633
+  metadata.gz: f61541c9618a7319040695dbccad08964f6ad347
+  data.tar.gz: 15cdc1a05d4c51b6850b01112c52ed94f5bb630c
 SHA512:
-  metadata.gz: f1ecf583501d0d4c8214c8e376100afa426db341dd8f0ea86af1478426321dfb6aaaa7512a3f0dfccc0601ed652d5f3cd2964051986c495576462f316015013d
-  data.tar.gz: c0f829b0e0dda85a4f9f8696c4b7d7f9a55323b2fcac1cdf1c6658c0fc424a98b521f628b9e8674edfed19b4d34b5f0d9f7ec45cd9e852fd6b0c6c747ce92980
+  metadata.gz: 3c80d41900c8ee8653233e5b8e83c6a8ed1c366c018002b21b7fb88f23fce31843c880183bf41bf020ba7365e574ae1a6f1e74ecf610a8a91215667b18d029fb
+  data.tar.gz: 747eeb704d2f7c052205dd33905527913638d6f995e4326f28d80b3e9d11d371ae068c355e4e71a1561ac2de0df79d2a2d55ce780da1311c2410134dd94e77f7

data/Mavenfile

@@ -7,17 +7,17 @@ plugin_repository :id => 'rubygems-releases', :url => 'http://rubygems-proxy.tor
 
 jruby_plugin( :minitest, :minispecDirectory => "specs/*_spec.rb" ) do
   execute_goals(:spec)
-  gem 'ruby-maven', '3.1.1.0.8'
+  gem 'ruby-maven', '${ruby-maven.version}'
 end
 
-properties( 'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.0.0.pre1'
+properties( 'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.0.0.pre2'
                                 ].join(','),
             'jruby.modes' => ['1.9', '2.0', '2.1'].join(','),
             # just lock the version
-            'jruby.version' => '1.7.19',
-            'jruby.plugins.version' => '1.0.9',
-            'tesla.dump.pom' => 'pom.xml',
-            'tesla.dump.readonly' => true )
+            'bundler.version' => '1.9.2',
+            'ruby-maven.version' => '3.1.1.0.11',
+            'jruby.version' => '1.7.20',
+            'jruby.plugins.version' => '1.0.9' )
 
 plugin :invoker, '1.8' do
   execute_goals( :install, :run,
@@ -30,10 +30,29 @@ plugin :invoker, '1.8' do
                  :properties => { 'jar-dependencies.version' => '${project.version}',
                    'jruby.version' => '${jruby.version}',
                    'jruby.plugins.version' => '${jruby.plugins.version}',
-                   'bundler.version' => '1.9.2',
-                   'ruby-maven.version' => '3.1.1.0.11',
+                   'bundler.version' => '${bundler.version}',
+                   'ruby-maven.version' => '${ruby-maven.version}',
                    # dump pom for the time being - for travis
                    'polyglot.dump.pom' => 'pom.xml'})
 end
 
+distribution_management do
+  repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+
+end
+
+plugin :deploy, '2.8.2' do
+  execute_goal :deploy, :phase => :deploy, :id => 'deploy gem to maven central'
+end
+
+profile :id => :release do
+  properties 'maven.test.skip' => true, 'invoker.skip' => true
+  plugin :gpg, '1.5' do
+    execute_goal :sign, :id => 'sign artifacts', :phase => :verify
+  end
+  build do
+    default_goal :deploy
+  end
+end
+
 # vim: syntax=Ruby

data/lib/jar_dependencies.rb

@@ -149,22 +149,10 @@ module Jars
     end
 
     def home
-      if ( @_jars_home_ ||= nil ).nil?
-        unless @_jars_home_ = absolute( to_prop( HOME ) )
-          begin
-            if user_settings = maven_user_settings
-              @_jars_home_ = detect_local_repository(user_settings)
-            end
-            if ! @_jars_home_ && global_settings = maven_global_settings
-              @_jars_home_ = detect_local_repository(global_settings)
-            end
-          rescue # ignore
-          end
-        end
-        # use maven default repository
-        @_jars_home_ ||= File.join( user_home, '.m2', 'repository' )
-      end
-      @_jars_home_
+      @_jars_home_ ||= absolute(to_prop(HOME)) ||
+                       detect_local_repository(maven_user_settings) ||
+                       detect_local_repository(maven_global_settings) ||
+                       File.join( user_home, '.m2', 'repository' )
     end
 
     def require_jars_lock!( scope = :runtime )
@@ -227,6 +215,8 @@ module Jars
     end
 
     def detect_local_repository(settings)
+      return nil unless settings
+      
       doc = File.read( settings )
       # TODO filter out xml comments
       local_repo = doc.sub( /<\/localRepository>.*/m, '' ).sub( /.*<localRepository>/m, '' )
@@ -238,6 +228,9 @@ module Jars
         local_repo = nil
       end
       local_repo
+    rescue
+      warn "error reading or parsing #{settings}"
+      nil
     end
 
     def to_jar( group_id, artifact_id, version, classifier = nil )

data/lib/jars/installer.rb

@@ -149,10 +149,16 @@ module Jars
 
     def has_jars?
       # first look if there are any requirements in the spec
-      # and then if gem depends on jar-dependencies
+      # and then if gem depends on jar-dependencies for runtime.
       # only then install the jars declared in the requirements
-      spec && ! spec.requirements.empty? &&
-          spec.dependencies.detect { |d| d.name == 'jar-dependencies' && d.type == :runtime }
+      result = spec && ! spec.requirements.empty? &&
+               spec.dependencies.detect { |d| d.name == 'jar-dependencies' && d.type == :runtime } != nil
+      if result && spec.platform.to_s != 'java'
+        warn "\njar dependencies found on non-java platform gem - do not install jars\n"
+        false
+      else
+        result
+      end
     end
     alias_method :jars?, :has_jars?
 

data/lib/jars/version.rb

@@ -1,3 +1,3 @@
 module Jars
-  VERSION = '0.1.13'.freeze
+  VERSION = '0.1.14'.freeze
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-05-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: '5.3'
-- !ruby/object:Gem::Dependency
+        version: '10.2'
   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: '10.2'
-- !ruby/object:Gem::Dependency
+        version: 3.1.1.0.11
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.1.0.11
-  name: ruby-maven
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0.11
 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
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: manage jar dependencies for gems