jar-dependencies 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34bb3f36e6ad44d263107a9d6fe8d3e513b934f
-  data.tar.gz: 620b12873948e1347d0020596dcb7cc080304952
+  metadata.gz: f8046f88d8efe9b20de38785a7f2ba5b9cafc963
+  data.tar.gz: dcb3af6f3d1763359e5a00386582a37ebd1963c1
 SHA512:
-  metadata.gz: d2f5934de747736b5f733cfac0aeb932be5896ff8e1ff1536290894f71bc50733b41c4bdd2533ed596b5acff65c0cd511b719ff4f6f6efb93c7c00051eaac813
-  data.tar.gz: d76e95558788a112844391576b838af227d2f2871f0f988b5817a645af450a39ea276861beb5236a26410ac3587479e18f06789736d02c71f8a7a16ca2a9901a
+  metadata.gz: f2bd6d2d4eb6139407e04d67956643b34d60e9110baa6a769d16d2cfbc7a5e7ad586b0b84fd631cafcf7becd643bff5ee8611e046ee41faf642af732507dfba2
+  data.tar.gz: 8f52b67493e13f75cfbe93507fcfa3199631883ef05b9971de0b87f9294f0b84126725e4e5aadb709843c013109be78ebf33aa7fe9f22393693a7aa9e305da43

data/Mavenfile

@@ -10,8 +10,7 @@ jruby_plugin( :minitest, :minispecDirectory => "specs/*_spec.rb" ) do
   gem 'ruby-maven', '3.1.1.0.8'
 end
 
-# (jruby-1.6.8 mode 1.8 produces a lot of yaml errors parsing gemspecs)
-properties( 'jruby.versions' => ['1.6.8', '1.7.12', '${jruby.version}', '9.0.0.0.pre1'
+properties( 'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.0.0.pre1'
                                 ].join(','),
             'jruby.modes' => ['1.9', '2.0', '2.1'].join(','),
             # just lock the version

data/lib/jar_dependencies.rb

@@ -48,18 +48,19 @@ module Jars
 
     if defined? JRUBY_VERSION
       def to_prop( key )
-        java.lang.System.getProperty( key.downcase.gsub( /_/, '.' ) ) ||
-          ENV[ key.upcase.gsub( /[.]/, '_' ) ]
+        key = key.gsub( '_', '.' )
+        ENV_JAVA[ ( key.downcase!; key ) ] ||
+          ENV[ ( key.gsub!( '.', '_' ); key.upcase!; key ) ]
       end
     else
       def to_prop( key )
-        ENV[ key.upcase.gsub( /[.]/, '_' ) ]
+        ENV[ key.gsub( '.', '_' ).upcase ]
       end
     end
 
     def to_boolean( key )
       prop = to_prop( key )
-      prop == '' or prop == 'true'
+      ! prop.nil? && ( prop.empty? || prop.eql?('true') )
     end
 
     def skip?
@@ -67,11 +68,11 @@ module Jars
     end
 
     def no_require?
-      @frozen || to_boolean( NO_REQUIRE )
+      ( @frozen ||= false ) || to_boolean( NO_REQUIRE )
     end
 
     def quiet?
-      @silent || to_boolean( QUIET )
+      ( @silent ||= false ) || to_boolean( QUIET )
     end
 
     def verbose?
@@ -112,9 +113,11 @@ module Jars
     end
 
     def maven_user_settings
-      if @_jars_maven_user_settings_.nil?
+      unless instance_variable_defined?(:@_jars_maven_user_settings_)
+        @_jars_maven_user_settings_ = nil
+      end
+      if ( @_jars_maven_user_settings_ ||= nil ).nil?
         if settings = absolute( to_prop( MAVEN_SETTINGS ) )
-          settings = File.expand_path(settings)
           unless File.exists?(settings)
             warn "configured ENV['#{MAVEN_SETTINGS}'] = '#{settings}' not found" unless quiet?
             settings = false
@@ -130,6 +133,9 @@ module Jars
     alias maven_settings maven_user_settings
 
     def maven_global_settings
+      unless instance_variable_defined?(:@_jars_maven_global_settings_)
+        @_jars_maven_global_settings_ = nil
+      end
       if @_jars_maven_global_settings_.nil?
           if mvn_home = ENV[ 'M2_HOME' ] || ENV[ 'MAVEN_HOME' ]
             settings = File.join( mvn_home, 'conf/settings.xml' )
@@ -143,7 +149,7 @@ module Jars
     end
 
     def home
-      if @_jars_home_.nil?
+      if ( @_jars_home_ ||= nil ).nil?
         unless @_jars_home_ = absolute( to_prop( HOME ) )
           begin
             if user_settings = maven_user_settings
@@ -169,7 +175,7 @@ module Jars
       if jars_lock = classpath.jars_lock
         @@jars_lock = jars_lock
         classpath.require( scope )
-        self.no_more_warnings
+        no_more_warnings
       end
     end
 
@@ -229,7 +235,7 @@ module Jars
         ENV_JAVA[ a[2..-2] ] || a
       end
       if local_repo.empty? or not File.exists?( local_repo )
-        local_repo = nil 
+        local_repo = nil
       end
       local_repo
     end

data/lib/jars/installer.rb

@@ -1,6 +1,6 @@
 require 'jar_dependencies'
 require 'jars/maven_exec'
-require 'uri'
+
 module Jars
   class Installer
 
@@ -183,5 +183,5 @@ module Jars
     end
   end
   # to stay backward compatible
-  JarInstaller = Installer
+  JarInstaller = Installer unless defined? JarInstaller
 end

data/lib/jars/maven_exec.rb

@@ -1,5 +1,5 @@
 require 'jar_dependencies'
-require 'uri'
+
 module Jars
   class MavenExec
 
@@ -78,9 +78,9 @@ module Jars
     end
 
     def setup_arguments( pom, *goals )
-      args = [ *goals, 
-               '-DoutputAbsoluteArtifactFilename=true', 
-               '-DincludeTypes=jar', 
+      args = [ *goals,
+               '-DoutputAbsoluteArtifactFilename=true',
+               '-DincludeTypes=jar',
                '-DoutputScope=true',
                '-DuseRepositoryLayout=true',
                "-DoutputDirectory=#{Jars.home}",
@@ -93,13 +93,20 @@ module Jars
         args << '--quiet'
       end
 
-      if Jars.maven_user_settings.nil? && (proxy = Gem.configuration[ :proxy ]).is_a?( String )
-        uri = URI.parse( proxy )
+      # TODO what todo with https proxy ?
+      # FIX this proxy settings seems not to work
+      if (proxy = Gem.configuration[ :http_proxy ]).is_a?( String )
+        require 'uri'; uri = URI.parse( proxy )
         args << "-DproxySet=true"
         args << "-DproxyHost=#{uri.host}"
         args << "-DproxyPort=#{uri.port}"
       end
 
+      if Jars.maven_settings
+        args << '-s'
+        args << Jars.maven_settings
+      end
+
       args << "-Dmaven.repo.local=#{java.io.File.new( Jars.local_maven_repo ).absolute_path}"
 
       args

data/lib/jars/version.rb

@@ -1,3 +1,3 @@
 module Jars
-  VERSION = '0.1.11'.freeze
+  VERSION = '0.1.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement