jar-dependencies 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ea93d521587d958b524fadd3267e37dcb79bb1
-  data.tar.gz: 8e5e545837cf107446f13e34f754d5aa5a2e1f21
+  metadata.gz: 5fcca0d2cb7ec38d8207414244e5d5410132dc74
+  data.tar.gz: 2d5406449bced170d8ff87c7440c127312138a03
 SHA512:
-  metadata.gz: d9a02cd9b7fd7399d050f36e0ffcace147bfd4546a7d31ec0b211c41eb79d43d2c1dfe1375201769ebdace2a2e6421f27ea3f6270711af6282d800aead94f734
-  data.tar.gz: 7083aaca912c0236cb0a8825edfc9d58867da99bf9cdfbc4bf0f69925eb3838abb879de30ef3a8ef603160ceddfdbf648ccc126cb200bbfd69b1fb3757506b25
+  metadata.gz: e85cdacb44107f0e58860c04d74ddda3c680cf9b382ccd5f12b41711627bf60affa60aebb16a095950244abf635531531687ef036c60a3b19c5e39a0757df942
+  data.tar.gz: 27f21cdfeae6d0732ff704a6db91af6c8cb34158f56467606443a2b9a92d04dcc72bbdbe56a58d6a04a2e31940c85e6fe97100b1071e772f0afecd48ff688e64

data/lib/jar_dependencies.rb

@@ -18,6 +18,7 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+require 'jars/maven_settings'
 module Jars
   unless defined? Jars::SKIP_LOCK
     MAVEN_SETTINGS = 'JARS_MAVEN_SETTINGS'.freeze
@@ -151,60 +152,24 @@ module Jars
 
     def reset
       instance_variables.each { |var| instance_variable_set(var, nil) }
+      Jars::MavenSettings.reset
       ( @@jars ||= {} ).clear
     end
 
     def maven_local_settings
-      unless instance_variable_defined?(:@_jars_maven_local_settings_)
-        @_jars_maven_local_settings_ = nil
-      end
-      if @_jars_maven_local_settings_.nil?
-        if settings = absolute( 'settings.xml' )
-          if File.exists?(settings)
-            @_jars_maven_local_settings_ = settings
-          end
-        end
-      end
-      @_jars_maven_local_settings_ || nil
+      Jars::MavenSettings.local_settings
     end
 
     def maven_user_settings
-      unless instance_variable_defined?(:@_jars_maven_user_settings_)
-        @_jars_maven_user_settings_ = nil
-      end
-      if @_jars_maven_user_settings_.nil?
-        if settings = absolute( to_prop( MAVEN_SETTINGS ) )
-          unless File.exists?(settings)
-            Jars.warn { "configured ENV['#{MAVEN_SETTINGS}'] = '#{settings}' not found" }
-            settings = false
-          end
-        else # use maven default (user) settings
-          settings = File.join( user_home, '.m2', 'settings.xml' )
-          settings = false unless File.exists?(settings)
-        end
-        @_jars_maven_user_settings_ = settings
-      end
-      @_jars_maven_user_settings_ || nil
+      Jars::MavenSettings.user_settings
     end
 
     def maven_settings
-      maven_local_settings || maven_user_settings
+      Jars::MavenSettings.settings
     end
 
     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' )
-            settings = false unless File.exists?(settings)
-          else
-            settings = false
-          end
-          @_jars_maven_global_settings_ = settings
-      end
-      @_jars_maven_global_settings_ || nil
+      Jars::MavenSettings.global_settings
     end
 
     def local_maven_repo
@@ -297,6 +262,20 @@ module Jars
       Kernel.warn(msg || block.call) if verbose?
     end
 
+    def absolute( file )
+      File.expand_path( file ) if file
+    end
+
+    def user_home
+      ENV[ 'HOME' ] || begin
+        user_home = Dir.home if Dir.respond_to?(:home)
+        unless user_home
+          user_home = ENV_JAVA[ 'user.home' ] if Object.const_defined?(:ENV_JAVA)
+        end
+        user_home
+      end
+    end
+
     private
 
     def require_jar_with_block( group_id, artifact_id, *classifier_version )
@@ -319,20 +298,6 @@ module Jars
       end
     end
 
-    def absolute( file )
-      File.expand_path( file ) if file
-    end
-
-    def user_home
-      ENV[ 'HOME' ] || begin
-        user_home = Dir.home if Dir.respond_to?(:home)
-        unless user_home
-          user_home = ENV_JAVA[ 'user.home' ] if Object.const_defined?(:ENV_JAVA)
-        end
-        user_home
-      end
-    end
-
     def detect_local_repository(settings)
       return nil unless settings
 

data/lib/jars/installer.rb

@@ -36,25 +36,27 @@ module Jars
       end
       private :setup_scope
 
+      REG = /:jar:|:pom:|:test:|:compile:|:runtime:|:provided:|:system:/
+      EMPTY = ''
       def initialize( line )
         setup_type( line )
 
-        line.sub!( /^\s+/, empty = '' )
-        @coord = line.sub( /:[^:]+:([A-Z]:\\)?[^:]+$/, empty )
+        line.strip!
+        @coord = line.sub( /:[^:]+:([A-Z]:\\)?[^:]+$/, EMPTY )
         first, second = @coord.split( /:#{type}:/ )
         group_id, artifact_id = first.split( /:/ )
         parts = group_id.split( '.' )
         parts << artifact_id
         parts << second.split( ':' )[ -1 ]
-        parts << File.basename( line.sub( /.:/, empty ) )
+        @file = line.slice(@coord.length, line.length).sub(REG, EMPTY).strip
+        last = @file.reverse.index /\\|\//
+        parts << line[-last..-1]
         @path = File.join( parts ).strip
 
         setup_scope( line )
 
-        reg = /:jar:|:pom:|:test:|:compile:|:runtime:|:provided:|:system:/
-        @file = line.slice(@coord.length, line.length).sub(reg, empty).strip
         @system = line.index(':system:') != nil
-        @gav = @coord.sub(reg, ':')
+        @gav = @coord.sub(REG, ':')
       end
 
       def system?

data/lib/jars/maven_factory.rb

@@ -71,7 +71,7 @@ module Jars
       maven[ 'verbose' ] = (@debug || @verbose) == true
 
       if Jars.maven_settings
-        maven.options[ '-s' ] = Jars.maven_settings
+        maven.options[ '-s' ] = Jars::MavenSettings.effective_settings
       end
 
       maven[ 'maven.repo.local' ] = "#{java.io.File.new( Jars.local_maven_repo ).absolute_path}"

data/lib/jars/maven_settings.rb

@@ -0,0 +1,143 @@
+require 'jar_dependencies'
+require 'rubygems/request'
+require 'rubygems/uri_formatter'
+module Jars
+  class MavenSettings
+
+    LINE_SEPARATOR = java.lang.System.line_separator
+    
+    class << self
+
+      def local_settings
+        unless instance_variable_defined?(:@_jars_maven_local_settings_)
+          @_jars_maven_local_settings_ = nil
+        end
+        if @_jars_maven_local_settings_.nil?
+          if settings = Jars.absolute( 'settings.xml' )
+            if File.exists?(settings)
+              @_jars_maven_local_settings_ = settings
+            end
+          end
+        end
+        @_jars_maven_local_settings_ || nil
+      end
+
+      def user_settings
+        unless instance_variable_defined?(:@_jars_maven_user_settings_)
+          @_jars_maven_user_settings_ = nil
+        end
+        if @_jars_maven_user_settings_.nil?
+          if settings = Jars.absolute( Jars.to_prop( MAVEN_SETTINGS ) )
+            unless File.exists?(settings)
+              Jars.warn { "configured ENV['#{MAVEN_SETTINGS}'] = '#{settings}' not found" }
+              settings = false
+            end
+          else # use maven default (user) settings
+            settings = File.join( Jars.user_home, '.m2', 'settings.xml' )
+            settings = false unless File.exists?(settings)
+          end
+          @_jars_maven_user_settings_ = settings
+        end
+        @_jars_maven_user_settings_ || nil
+      end
+
+      def effective_settings
+        unless instance_variable_defined?(:@_jars_effective_maven_settings_)
+          @_jars_effective_maven_settings_ = nil
+        end
+        if @_jars_effective_maven_settings_.nil?
+          begin
+            http = Gem::Request.proxy_uri(Gem.configuration[:http_proxy] || Gem::Request.get_proxy_from_env('http'))
+            https = Gem::Request.proxy_uri(Gem.configuration[:https_proxy] || Gem::Request.get_proxy_from_env('https'))
+          rescue NoMethodError
+            Jars.debug('ignore rubygems proxy configuration as rubygems is too old')
+          end
+          if http.nil? && https.nil?
+            @_jars_effective_maven_settings_ = settings
+          else
+            @_jars_effective_maven_settings_ =
+              setup_interpolated_settings(http, https) || settings
+          end
+        end
+        @_jars_effective_maven_settings_
+      end
+
+      def cleanup
+        if effective_settings != settings
+          File.unlink(effective_settings)
+        end
+      ensure
+        reset
+      end
+
+      def reset
+        instance_variables.each { |var| instance_variable_set(var, nil) }
+      end
+
+      def settings
+        unless instance_variable_defined?(:@_jars_maven_settings_)
+          @_jars_maven_settings_ = nil
+        end
+        if @_jars_maven_settings_.nil?
+          local_settings || user_settings
+        end
+      end
+
+      def 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' )
+            settings = false unless File.exists?(settings)
+          else
+            settings = false
+          end
+          @_jars_maven_global_settings_ = settings
+        end
+        @_jars_maven_global_settings_ || nil
+      end
+
+      private
+
+      def setup_interpolated_settings(http, https)
+        proxy = raw_proxy_settings_xml(http, https).gsub("\n", LINE_SEPARATOR)
+        if settings.nil?
+          raw = "<settings>#{LINE_SEPARATOR}#{proxy}</settings>"
+        else
+          raw = File.read(settings)
+          if raw.includes?('<proxy>')
+            Jars.info("can not interpolated proxy info for #{settings}")
+            return
+          else
+            raw.sub!("<settings>", "<settings>#{LINE_SEPARATOR}#{proxy}")
+          end
+        end
+        tempfile = java.io.File.create_temp_file('settings', '.xml')
+        tempfile.delete_on_exit
+        File.write(tempfile.path, raw)
+        tempfile.path
+      end
+
+      def raw_proxy_settings_xml(http, https)
+        raw = File.read(File.join(File.dirname(__FILE__), 'settings.xml'))
+        if http
+          raw.sub!('__HTTP_ACTIVE__', 'true')
+          raw.sub!('__HTTP_SERVER__', http.host)
+          raw.sub!('__HTTP_PORT__', http.port.to_s)
+        else
+          raw.sub!('__HTTP_ACTIVE__', 'false')    
+        end
+        if https
+          raw.sub!('__HTTPS_ACTIVE__', 'true')
+          raw.sub!('__HTTPS_SERVER__', https.host)
+          raw.sub!('__HTTPS_PORT__', https.port.to_s)
+        else
+          raw.sub!('__HTTPS_ACTIVE__', 'false')
+        end
+        raw
+      end
+    end
+  end
+end

data/lib/jars/settings.xml

@@ -0,0 +1,20 @@
+  <proxies>
+    <proxy>
+      <active>__HTTP_ACTIVE__</active>
+      <protocol>http</protocol>
+      <host>__HTTP_SERVER__</host>
+      <port>__HTTP_PORT__</port>
+      <!--nonProxyHosts>
+        www.oracle.com|localhost|127.0.0.1
+      </nonProxyHosts-->
+    </proxy>
+    <proxy>
+      <active>__HTTPS_ACTIVE__</active>
+      <protocol>https</protocol>
+      <host>__HTTPS_SERVER__</host>
+      <port>__HTTPS_PORT__</port>
+      <!--nonProxyHosts>
+        www.oracle.com|localhost|127.0.0.1
+      </nonProxyHosts-->
+    </proxy>
+  </proxies>

data/lib/jars/version.rb

@@ -1,5 +1,5 @@
 module Jars
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.3.6'.freeze
   JRUBY_PLUGINS_VERSION = '1.1.3'.freeze
   DEPENDENCY_PLUGIN_VERSION = '2.8'.freeze
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-12-03 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.3.11
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.11
-  name: ruby-maven
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.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
@@ -80,8 +80,10 @@ files:
 - lib/jars/lock_down_pom.rb
 - lib/jars/maven_exec.rb
 - lib/jars/maven_factory.rb
+- lib/jars/maven_settings.rb
 - lib/jars/output_jars_pom.rb
 - lib/jars/post_install_hook.rb
+- lib/jars/settings.xml
 - lib/jars/setup.rb
 - lib/jars/version.rb
 - lib/rubygems_plugin.rb