jar-dependencies 0.4.1 → 0.5.0

data/lib/jars/maven_factory.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'jar_dependencies'
 require 'jars/gemspec_artifacts'
 
 module Jars
   class MavenFactory
     module AttachJars
-      def attach_jars(spec, all_dependencies = false)
+      def attach_jars(spec, all_dependencies: false)
         @index ||= 0
         @done ||= []
 
@@ -63,17 +65,13 @@ module Jars
       end
       maven['verbose'] = (@debug || @verbose) == true
 
-      if Jars.maven_settings
-        maven.options['-s'] = Jars::MavenSettings.effective_settings
-      end
+      maven.options['-s'] = Jars::MavenSettings.effective_settings if Jars.maven_settings
 
       maven['maven.repo.local'] = java.io.File.new(Jars.local_maven_repo).absolute_path.to_s
 
       maven
     end
 
-    private
-
     def lazy_load_maven
       add_gem_to_load_path('ruby-maven')
       add_gem_to_load_path('ruby-maven-libs')
@@ -97,22 +95,22 @@ module Jars
     def add_gem_to_load_path(name)
       # if the gem is already activated => good
       return if Gem.loaded_specs[name]
+
       # just install gem if needed and add it to the load_path
       # and leave activated gems as they are
       req = requirement(name)
-      unless spec = find_spec_via_rubygems(name, req)
+      unless (spec = find_spec_via_rubygems(name, req))
         spec = install_gem(name, req)
       end
-      unless spec
-        raise "failed to resolve gem '#{name}' if you're using Bundler add it as a dependency"
-      end
+      raise "failed to resolve gem '#{name}' if you're using Bundler add it as a dependency" unless spec
+
       path = File.join(spec.full_gem_path, spec.require_path)
       $LOAD_PATH << path unless $LOAD_PATH.include?(path)
     end
 
     def requirement(name)
       jars = Gem.loaded_specs['jar-dependencies']
-      dep = jars.nil? ? nil : jars.dependencies.detect { |d| d.name == name }
+      dep = jars&.dependencies&.detect { |d| d.name == name }
       dep.nil? ? Gem::Requirement.create('>0') : dep.requirement
     end
 
@@ -124,10 +122,11 @@ module Jars
       inst.install(name, req).first
     rescue => e
       if Jars.verbose?
-        warn e.inspect.to_s
+        warn e.inspect
         warn e.backtrace.join("\n")
       end
-      raise "there was an error installing '#{name} (#{req})' #{@options[:domain]}. please install it manually: #{e.inspect}"
+      raise "there was an error installing '#{name} (#{req})' " \
+            "#{@options[:domain]}. please install it manually: #{e.inspect}"
     end
   end
 end

data/lib/jars/maven_settings.rb

@@ -1,27 +1,28 @@
-require 'rubygems/uri_formatter'
+# frozen_string_literal: true
+
 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
+        @_jars_maven_local_settings_ = nil unless instance_variable_defined?(:@_jars_maven_local_settings_)
         if @_jars_maven_local_settings_.nil?
-          if settings = Jars.absolute('settings.xml')
-            @_jars_maven_local_settings_ = settings if File.exist?(settings)
-          end
+          settings = Jars.absolute('settings.xml')
+          @_jars_maven_local_settings_ =
+            if settings && File.exist?(settings)
+              settings
+            else
+              false
+            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
+        @_jars_maven_user_settings_ = nil unless instance_variable_defined?(:@_jars_maven_user_settings_)
         if @_jars_maven_user_settings_.nil?
-          if settings = Jars.absolute(Jars.to_prop(MAVEN_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
@@ -36,9 +37,7 @@ module Jars
       end
 
       def effective_settings
-        unless instance_variable_defined?(:@_jars_effective_maven_settings_)
-          @_jars_effective_maven_settings_ = nil
-        end
+        @_jars_effective_maven_settings_ = nil unless instance_variable_defined?(:@_jars_effective_maven_settings_)
         if @_jars_effective_maven_settings_.nil?
           begin
             require 'rubygems/request'
@@ -48,12 +47,11 @@ module Jars
           rescue
             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
+          @_jars_effective_maven_settings_ = if http.nil? && https.nil?
+                                               settings
+                                             else
+                                               setup_interpolated_settings(http, https) || settings
+                                             end
         end
         @_jars_effective_maven_settings_
       end
@@ -69,18 +67,14 @@ module Jars
       end
 
       def settings
-        unless instance_variable_defined?(:@_jars_maven_settings_)
-          @_jars_maven_settings_ = nil
-        end
+        @_jars_maven_settings_ = nil unless instance_variable_defined?(:@_jars_maven_settings_)
         local_settings || user_settings if @_jars_maven_settings_.nil?
       end
 
       def global_settings
-        unless instance_variable_defined?(:@_jars_maven_global_settings_)
-          @_jars_maven_global_settings_ = nil
-        end
+        @_jars_maven_global_settings_ = nil unless instance_variable_defined?(:@_jars_maven_global_settings_)
         if @_jars_maven_global_settings_.nil?
-          if mvn_home = ENV['M2_HOME'] || ENV['MAVEN_HOME']
+          if (mvn_home = ENV['M2_HOME'] || ENV['MAVEN_HOME'])
             settings = File.join(mvn_home, 'conf/settings.xml')
             settings = false unless File.exist?(settings)
           else

data/lib/jars/output_jars_pom.rb

@@ -1,8 +1,16 @@
+# frozen_string_literal: true
+
 # this file is maven DSL
 
 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'}"
+    next if d.exclusions.empty?
+
+    puts "          exclusions: #{d.exclusions.collect do |e|
+      "#{e.group_id}:#{e.artifact_id}"
+    end.join}"
   end
 end

data/lib/jars/post_install_hook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Copyright (C) 2014 Christian Meier
 #
@@ -21,7 +23,7 @@
 
 if defined?(JRUBY_VERSION) && Gem.post_install_hooks.empty?
   Gem.post_install do |gem_installer|
-    unless (ENV['JARS_SKIP'] || ENV_JAVA['jars.skip']) == 'true'
+    if ENV['JARS_SKIP'] != 'true' && ENV_JAVA['jars.skip'] != 'true'
       require 'jars/installer'
       jars = Jars::Installer.new(gem_installer.spec)
       jars.ruby_maven_install_options = gem_installer.options || {}

data/lib/jars/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # 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,7 @@
+# frozen_string_literal: true
+
 module Jars
-  VERSION = '0.4.1'.freeze
-  JRUBY_PLUGINS_VERSION = '1.1.3'.freeze
-  DEPENDENCY_PLUGIN_VERSION = '2.8'.freeze
+  VERSION = '0.5.0'
+  JRUBY_PLUGINS_VERSION = '3.0.2'
+  DEPENDENCY_PLUGIN_VERSION = '2.8'
 end

data/lib/rubygems_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Copyright (C) 2014 Christian Meier
 #

metadata

@@ -1,61 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - christian meier
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.10.0
+        version: '5.10'
   name: minitest
-  prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.10.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.2'
-  name: rake
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.11
+        version: '3.9'
   name: ruby-maven
-  prerelease: false
   type: :development
+  prerelease: false
   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.
+        version: '3.9'
+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:
@@ -67,12 +55,11 @@ files:
 - Mavenfile
 - Rakefile
 - Readme.md
-- bin/lock_jars
+- exe/lock_jars
 - jar-dependencies.gemspec
 - lib/jar-dependencies.rb
 - lib/jar_dependencies.rb
 - lib/jar_install_post_install_hook.rb
-- lib/jar_installer.rb
 - lib/jars/attach_jars_pom.rb
 - lib/jars/classpath.rb
 - lib/jars/gemspec_artifacts.rb
@@ -93,16 +80,17 @@ files:
 homepage: https://github.com/mkristian/jar-dependencies
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 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'
+    $ gem install ruby-maven -v '~> 3.9'
 
   or add it as a development dependency to your Gemfile
 
-     gem 'ruby-maven', '~> 3.3.11'
+     gem 'ruby-maven', '~> 3.9'
 
 rdoc_options: []
 require_paths:
@@ -111,15 +99,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.1
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: manage jar dependencies for gems

data/lib/jar_installer.rb

@@ -1 +0,0 @@
-require 'jars/installer'