jar-dependencies 0.3.9 → 0.4.1

data/lib/jars/maven_settings.rb

@@ -1,22 +1,16 @@
-require 'jar_dependencies'
-require 'rubygems/request'
 require 'rubygems/uri_formatter'
 module Jars
   class MavenSettings
-
     LINE_SEPARATOR = ENV_JAVA['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
+          if settings = Jars.absolute('settings.xml')
+            @_jars_maven_local_settings_ = settings if File.exist?(settings)
           end
         end
         @_jars_maven_local_settings_ || nil
@@ -27,14 +21,14 @@ module Jars
           @_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)
+          if settings = Jars.absolute(Jars.to_prop(MAVEN_SETTINGS))
+            unless File.exist?(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)
+            settings = File.join(Jars.user_home, '.m2', 'settings.xml')
+            settings = false unless File.exist?(settings)
           end
           @_jars_maven_user_settings_ = settings
         end
@@ -47,9 +41,11 @@ module Jars
         end
         if @_jars_effective_maven_settings_.nil?
           begin
+            require 'rubygems/request'
+
             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
+          rescue
             Jars.debug('ignore rubygems proxy configuration as rubygems is too old')
           end
           if http.nil? && https.nil?
@@ -63,9 +59,7 @@ module Jars
       end
 
       def cleanup
-        if effective_settings != settings
-          File.unlink(effective_settings)
-        end
+        File.unlink(effective_settings) if effective_settings != settings
       ensure
         reset
       end
@@ -78,9 +72,7 @@ module Jars
         unless instance_variable_defined?(:@_jars_maven_settings_)
           @_jars_maven_settings_ = nil
         end
-        if @_jars_maven_settings_.nil?
-          local_settings || user_settings
-        end
+        local_settings || user_settings if @_jars_maven_settings_.nil?
       end
 
       def global_settings
@@ -88,9 +80,9 @@ module Jars
           @_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)
+          if mvn_home = ENV['M2_HOME'] || ENV['MAVEN_HOME']
+            settings = File.join(mvn_home, 'conf/settings.xml')
+            settings = false unless File.exist?(settings)
           else
             settings = false
           end
@@ -111,7 +103,7 @@ module Jars
             Jars.warn("can not interpolated proxy info for #{settings}")
             return
           else
-            raw.sub!("<settings>", "<settings>#{LINE_SEPARATOR}#{proxy}")
+            raw.sub!('<settings>', "<settings>#{LINE_SEPARATOR}#{proxy}")
           end
         end
         tempfile = java.io.File.create_temp_file('settings', '.xml')
@@ -127,7 +119,7 @@ module Jars
           raw.sub!('__HTTP_SERVER__', http.host)
           raw.sub!('__HTTP_PORT__', http.port.to_s)
         else
-          raw.sub!('__HTTP_ACTIVE__', 'false')    
+          raw.sub!('__HTTP_ACTIVE__', 'false')
         end
         if https
           raw.sub!('__HTTPS_ACTIVE__', 'true')

data/lib/jars/output_jars_pom.rb

@@ -2,7 +2,7 @@
 
 if ENV_JAVA['jars.quiet'] != 'true'
   model.dependencies.each do |d|
-    puts "      " + d.group_id + ':' + d.artifact_id + (d.classifier ? ":" + d.classifier : "" ) + ":" + d.version + ':' + (d.scope || 'compile')
-    puts "          exclusions: " + d.exclusions.collect{ |e| e.group_id + ':' + e.artifact_id }.join unless d.exclusions.empty?
+    puts '      ' + d.group_id + ':' + d.artifact_id + (d.classifier ? ':' + d.classifier : '') + ':' + d.version + ':' + (d.scope || 'compile')
+    puts '          exclusions: ' + d.exclusions.collect { |e| e.group_id + ':' + e.artifact_id }.join unless d.exclusions.empty?
   end
 end

data/lib/jars/post_install_hook.rb

@@ -19,11 +19,11 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-if defined?( JRUBY_VERSION ) && Gem.post_install_hooks.empty?
+if defined?(JRUBY_VERSION) && Gem.post_install_hooks.empty?
   Gem.post_install do |gem_installer|
     unless (ENV['JARS_SKIP'] || ENV_JAVA['jars.skip']) == 'true'
       require 'jars/installer'
-      jars = Jars::Installer.new( gem_installer.spec )
+      jars = Jars::Installer.new(gem_installer.spec)
       jars.ruby_maven_install_options = gem_installer.options || {}
       jars.vendor_jars
     end

data/lib/jars/setup.rb

@@ -1,4 +1,4 @@
-# to do as bundler does and allow to load Jars.lock via 
+# to do as bundler does and allow to load Jars.lock via
 # require 'jars/setup'. can be useful via commandline -rjars/setup
 # or tell bundler autorequire to load it
 

data/lib/jars/version.rb

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

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.1
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 5.10.0
   name: minitest
   prerelease: false
   type: :development
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 5.10.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -52,7 +52,10 @@ dependencies:
     - - "~>"
       - !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.
+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
 executables:
@@ -91,10 +94,16 @@ homepage: https://github.com/mkristian/jar-dependencies
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\nif you want to use the executable lock_jars then install\
-  \ ruby-maven gem before using lock_jars \n\n   $ gem install ruby-maven -v '~> 3.3.11'\n\
-  \nor add it as a development dependency to your Gemfile\n\n   gem 'ruby-maven',\
-  \ '~> 3.3.11'\n\n"
+post_install_message: |2+
+
+  if you want to use the executable lock_jars then install ruby-maven gem before using lock_jars
+
+    $ gem install ruby-maven -v '~> 3.3.11'
+
+  or add it as a development dependency to your Gemfile
+
+     gem 'ruby-maven', '~> 3.3.11'
+
 rdoc_options: []
 require_paths:
 - lib
@@ -110,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: manage jar dependencies for gems