jar-dependencies 0.5.7 → 0.6.0.pre2

data/lib/jars/lock_down.rb

@@ -1,101 +1,132 @@
 # frozen_string_literal: true
 
-require 'fileutils'
 require 'jar_dependencies'
 require 'jars/version'
-require 'jars/maven_factory'
 require 'jars/gemspec_artifacts'
 
 module Jars
   class LockDown
-    attr_reader :debug, :verbose
-
-    def initialize(debug, verbose)
-      @debug = debug
-      @verbose = verbose
+    def basedir
+      File.expand_path('.')
     end
 
-    def maven_new
-      factory = MavenFactory.new({}, @debug, @verbose)
-      pom = File.expand_path('lock_down_pom.rb', __dir__)
-      m = factory.maven_new(pom)
-      m['jruby.plugins.version'] = Jars::JRUBY_PLUGINS_VERSION
-      m['dependency.plugin.version'] = Jars::DEPENDENCY_PLUGIN_VERSION
-      m['jars.basedir'] = File.expand_path(basedir)
-      jarfile = File.expand_path(Jars.jarfile)
-      m['jars.jarfile'] = jarfile if File.exist?(jarfile)
-      attach_jar_coordinates_from_bundler_dependencies(m)
-      m
-    end
-    private :maven_new
+    def collect_artifacts
+      artifacts = []
+      done = []
 
-    def maven
-      @maven ||= maven_new
-    end
+      attach_jar_coordinates_from_bundler_dependencies(artifacts, done)
 
-    def basedir
-      File.expand_path('.')
+      # Also collect from local gemspec if present
+      specs = Dir['*.gemspec']
+      if specs.size == 1
+        spec = eval(File.read(specs.first), TOPLEVEL_BINDING, specs.first) # rubocop:disable Security/Eval
+        ga = GemspecArtifacts.new(spec)
+        ga.artifacts.each do |a|
+          unless done.include?(a.key)
+            artifacts << a
+            done << a.key
+          end
+        end
+      end
+
+      artifacts
     end
+    private :collect_artifacts
 
-    def attach_jar_coordinates_from_bundler_dependencies(maven)
+    def attach_jar_coordinates_from_bundler_dependencies(artifacts, done)
       load_path = $LOAD_PATH.dup
       require 'bundler'
       # TODO: make this group a commandline option
       Bundler.setup('default')
-      maven.property('jars.bundler', true)
       cwd = File.expand_path('.')
-      Gem.loaded_specs.each do |_name, spec|
-        # if gemspec is local then include all dependencies
-        maven.attach_jars(spec, all_dependencies: cwd == spec.full_gem_path)
+      Gem.loaded_specs.each_value do |spec|
+        all = cwd == spec.full_gem_path # if gemspec is local then include all dependencies
+        ga = GemspecArtifacts.new(spec)
+        ga.artifacts.each do |a|
+          next if done.include?(a.key)
+          next unless all || (a.scope != 'provided' && a.scope != 'test')
+
+          artifacts << a
+          done << a.key
+        end
       end
     rescue LoadError => e
-      if Jars.verbose?
-        warn e.message
-        warn 'no bundler found - ignore Gemfile if exists'
-      end
+      Jars.warn "bundler unavailable (#{e.message}); skipping dependency discovery" if Jars.verbose?
     rescue Bundler::GemfileNotFound
-    # do nothing then as we have bundler but no Gemfile
+      # bundler is available, but there is no Gemfile to inspect
     rescue Bundler::GemNotFound
-      warn "can not setup bundler with #{Bundler.default_lockfile}"
+      Jars.warn "cannot set up bundler with #{Bundler.default_lockfile}"
       raise
     ensure
       $LOAD_PATH.replace(load_path)
     end
 
-    def lock_down(vendor_dir = nil, force: false, update: false, tree: nil)
-      out = File.expand_path('.jars.output')
-      tree_provided = tree
-      tree ||= File.expand_path('.jars.tree')
-      maven.property('jars.outputFile', out)
-      maven.property('maven.repo.local', Jars.local_maven_repo)
-      maven.property('jars.home', File.expand_path(vendor_dir)) if vendor_dir
-      maven.property('jars.lock', File.expand_path(Jars.lock))
-      maven.property('jars.force', force)
-      maven.property('jars.update', update) if update
-      # tell not to use Jars.lock as part of POM when running mvn
-      maven.property('jars.skip.lock', true)
-
-      args = ['gem:jars-lock']
-      args += ['dependency:tree', '-P -gemfile.lock', "-DoutputFile=#{tree}"] if tree_provided
+    def lock_down(vendor_dir = nil, force: false, update: false, tree: nil) # rubocop:disable Lint/UnusedMethodArgument
+      lock_file = File.expand_path(Jars.lock)
+
+      if !force && File.exist?(lock_file)
+        puts 'Jars.lock already exists, use --force to overwrite'
+        return
+      end
+
+      artifacts = collect_artifacts
+
+      if artifacts.empty?
+        puts 'no jar dependencies found'
+        return
+      end
 
       puts
       puts '-- jar root dependencies --'
       puts
-      status = maven.exec(*args)
-      exit 1 unless status
-      if File.exist?(tree)
+      artifacts.each do |a|
+        puts "      #{a.to_gacv}:#{a.scope || 'compile'}"
+        puts "          exclusions: #{a.exclusions}" if a.exclusions && !a.exclusions.empty?
+      end
+
+      context = Jars::Mima.create_context
+      begin
+        resolved = Jars::Mima.resolve_with_context(context, artifacts, all_dependencies: true)
+      ensure
+        context.close
+      end
+
+      # Write Jars.lock
+      File.open(lock_file, 'w') do |f|
+        resolved.each do |dep|
+          next unless dep.type == 'jar'
+
+          f.puts dep.to_lock_entry
+        end
+      end
+
+      # Optionally vendor jars
+      if vendor_dir
+        require 'fileutils'
+        vendor_path = File.expand_path(vendor_dir)
+        resolved.each do |dep|
+          next unless dep.type == 'jar' && dep.runtime? && !dep.system?
+
+          target = File.join(vendor_path, dep.jar_path)
+          FileUtils.mkdir_p(File.dirname(target))
+          FileUtils.cp(dep.file, target)
+        end
+      end
+
+      if tree
         puts
         puts '-- jar dependency tree --'
         puts
-        puts File.read(tree)
+        resolved.each do |dep|
+          prefix = dep.classifier ? "#{dep.classifier}:" : ''
+          puts "   #{dep.group_id}:#{dep.artifact_id}:#{prefix}#{dep.version}:#{dep.scope}"
+        end
         puts
       end
+
       puts
-      puts File.read(out).gsub("#{File.dirname(out)}/", '')
+      puts File.read(lock_file)
       puts
-    ensure
-      FileUtils.rm_f out
-      FileUtils.rm_f tree
     end
   end
 end

data/lib/jars/maven_exec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'jar_dependencies'
-require 'jars/maven_factory'
+require 'jars/gemspec_artifacts'
 
 module Jars
   class MavenExec
@@ -13,7 +13,7 @@ module Jars
       when 1
         specs.first
       else
-        raise 'more then one gemspec found. please specify a specfile' unless allow_no_file
+        raise 'more than one gemspec found; please specify a specfile' unless allow_no_file
       end
     end
     private :find_spec
@@ -21,12 +21,10 @@ module Jars
     attr_reader :basedir, :spec, :specfile
 
     def initialize(spec = nil)
-      @options = {}
       setup(spec)
     rescue StandardError, LoadError => e
-      # If spec load fails, skip looking for jar-dependencies
-      warn "jar-dependencies: #{e}"
-      warn e.backtrace.join("\n") if Jars.verbose?
+      Jars.warn "unable to load gemspec (#{e.message}); skipping jar dependency discovery"
+      Jars.debug(e)
     end
 
     def setup(spec = nil, allow_no_file: false)
@@ -45,8 +43,7 @@ module Jars
           @specfile = spec.loaded_from
         else
           # this happens with bundle and local gems
-          # there the spec_file is "not installed" but inside
-          # the gem_dir directory
+          # there spec_file is "not installed" but is inside the gem_dir directory
           Dir.chdir(spec.gem_dir) do
             setup(nil, allow_no_file: true)
           end
@@ -54,32 +51,33 @@ module Jars
       when nil
         # ignore
       else
-        Jars.debug('spec must be either String or Gem::Specification. ' \
-                   'File an issue on github if you need it.')
+        Jars.debug "unsupported spec argument #{spec.class}; expected String or Gem::Specification"
       end
       @spec = spec
     end
 
-    def ruby_maven_install_options=(options)
-      @options = options
-    end
-
     def resolve_dependencies_list(file)
-      factory = MavenFactory.new(@options)
-      maven = factory.maven_new(File.expand_path('gemspec_pom.rb', __dir__))
+      require 'jars/mima'
 
+      artifacts = GemspecArtifacts.new(@spec)
       is_local_file = File.expand_path(File.dirname(@specfile)) == File.expand_path(Dir.pwd)
-      maven.attach_jars(@spec, all_dependencies: is_local_file)
 
-      maven['jars.specfile'] = @specfile.to_s
-      maven['outputAbsoluteArtifactFilename'] = 'true'
-      maven['includeTypes'] = 'jar'
-      maven['outputScope'] = 'true'
-      maven['useRepositoryLayout'] = 'true'
-      maven['outputDirectory'] = Jars.home.to_s
-      maven['outputFile'] = file.to_s
+      resolved = Jars::Mima.resolve_artifacts(artifacts.artifacts, all_dependencies: is_local_file)
+
+      # Write output in Maven dependency:list format for Installer::Dependency compatibility
+      allowed_types = %w[jar pom].freeze
+      File.open(file, 'w') do |f|
+        f.puts
+        f.puts 'The following files have been resolved:'
+        resolved.each do |dep|
+          next unless allowed_types.include?(dep.type)
 
-      maven.exec('dependency:copy-dependencies', 'dependency:list')
+          line = +"   #{dep.group_id}:#{dep.artifact_id}:#{dep.type}:"
+          line << "#{dep.classifier}:" if dep.classifier
+          line << "#{dep.version}:#{dep.scope}:#{dep.file}"
+          f.puts line
+        end
+      end
     end
   end
 end

data/lib/jars/maven_settings.rb

@@ -2,8 +2,6 @@
 
 module Jars
   class MavenSettings
-    LINE_SEPARATOR = ENV_JAVA['line.separator']
-
     class << self
       def local_settings
         @_jars_maven_local_settings_ = nil unless instance_variable_defined?(:@_jars_maven_local_settings_)
@@ -36,36 +34,6 @@ module Jars
         @_jars_maven_user_settings_ || nil
       end
 
-      def effective_settings
-        @_jars_effective_maven_settings_ = nil unless instance_variable_defined?(:@_jars_effective_maven_settings_)
-        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
-            Jars.debug('ignore rubygems proxy configuration as rubygems is too old')
-          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
-
-      def cleanup
-        File.unlink(effective_settings) if effective_settings != settings
-      ensure
-        reset
-      end
-
-      def reset
-        instance_variables.each { |var| instance_variable_set(var, nil) }
-      end
-
       def settings
         @_jars_maven_settings_ = nil unless instance_variable_defined?(:@_jars_maven_settings_)
         local_settings || user_settings if @_jars_maven_settings_.nil?
@@ -85,44 +53,8 @@ module Jars
         @_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.include?('<proxy>')
-            Jars.warn("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
+      def reset
+        instance_variables.each { |var| instance_variable_set(var, nil) }
       end
     end
   end

data/lib/jars/mima/version.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Jars
+  module Mima
+    MIMA_VERSION = '2.4.42'
+    SLF4J_VERSION = '2.0.17'
+
+    MAVEN_CENTRAL = 'https://repo.maven.apache.org/maven2'
+    MIMA_DIR = 'lib/jars/mima'
+
+    # GAV and SHA-1 checksum (as published on Maven Central) for each jar
+    jars = %w[
+      org.slf4j:slf4j-api:2.0.17
+      d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
+
+      org.slf4j:slf4j-simple:2.0.17
+      9872a3fd794ffe7b18d17747926a64d61526ca96
+
+      org.slf4j:jcl-over-slf4j:2.0.17
+      76ea503eb688f06556a9ba69995d7eab63e34531
+
+      eu.maveniverse.maven.mima:context:2.4.42
+      72aa4d9ccef7a329f473e43752ec863c5194c72c
+
+      eu.maveniverse.maven.mima.runtime:standalone-static-uber:2.4.42
+      43666099e6eb31610f9d3b146811479dd3e4aef1
+    ]
+
+    JARS = jars.each_slice(2).to_h do |gav, sha1|
+      group, artifact, version = gav.split(':')
+      group = group.tr('.', '/')
+      jar_file = "#{artifact}-#{version}.jar"
+      [
+        jar_file,
+        {
+          url: "#{MAVEN_CENTRAL}/#{group}/#{artifact}/#{version}/#{jar_file}",
+          sha1: sha1
+        }
+      ]
+    end
+  end
+end