resolve deps directly (don't create deps.lst)

Author: kares

lib/jars/installer.rb

@@ -8,58 +8,89 @@ class Installer
     class Dependency
       attr_reader :path, :file, :gav, :scope, :type, :coord
 
-      def self.new(line)
-        super if /:jar:|:pom:/.match?(line)
-      end
+      # @param line [String] Maven dependency:list output line
+      # @return [Dependency, nil]
+      def self.parse(line)
+        return unless /:jar:|:pom:/.match?(line)
 
-      def setup_type(line)
-        if line.index(':pom:')
-          @type = :pom
-        elsif line.index(':jar:')
-          @type = :jar
-        end
-      end
-      private :setup_type
-
-      def setup_scope(line)
-        @scope =
-          case line
-          when /:provided:/
-            :provided
-          when /:test:/
-            :test
-          else
-            :runtime
-          end
-      end
-      private :setup_scope
-
-      REG = /:jar:|:pom:|:test:|:compile:|:runtime:|:provided:|:system:/.freeze
-      EMPTY = ''
-      def initialize(line)
         # remove ANSI escape sequences and module section (https://issues.apache.org/jira/browse/MDEP-974)
         line = line.gsub(/\e\[\d*m/, '')
         line = line.gsub(/ -- module.*/, '')
 
-        setup_type(line)
+        type = if line.index(':pom:')
+                 :pom
+               elsif line.index(':jar:')
+                 :jar
+               end
 
         line.strip!
 
-        @coord = line.sub(/:[^:]+:([A-Z]:\\)?[^:]+$/, EMPTY)
-        first, second = @coord.split(/:#{type}:/)
+        coord = line.sub(/:[^:]+:([A-Z]:\\)?[^:]+$/, '')
+        first, second = coord.split(/:#{type}:/)
         group_id, artifact_id = first.split(':')
         parts = group_id.split('.')
         parts << artifact_id
         parts << second.split(':')[-1]
-        @file = line.slice(@coord.length, line.length).sub(REG, EMPTY).strip
-        last = @file.reverse.index(%r{\\|/})
+        file = line.slice(coord.length, line.length).sub(REG, '').strip
+        last = file.reverse.index(%r{\\|/})
         parts << line[-last..]
-        @path = File.join(parts).strip
+        path = File.join(parts).strip
+
+        scope = case line
+                when /:provided:/
+                  :provided
+                when /:test:/
+                  :test
+                else
+                  :runtime
+                end
+
+        new(
+          path: path,
+          file: file,
+          gav: coord.sub(REG, ':'),
+          scope: scope,
+          type: type,
+          coord: coord,
+          system: !line.index(':system:').nil?
+        )
+      end
 
-        setup_scope(line)
+      # @param dep [Jars::Mima::ResolvedDependency]
+      # @return [Dependency]
+      def self.from_resolved(dep)
+        coord = "#{dep.group_id}:#{dep.artifact_id}:#{dep.type}:"
+        coord << "#{dep.classifier}:" if dep.classifier
+        coord << "#{dep.version}:#{dep.scope}"
+
+        scope = case dep.scope
+                when 'test'
+                  :test
+                when 'provided'
+                  :provided
+                else
+                  :runtime
+                end
+
+        new(
+          path: dep.path,
+          file: dep.file,
+          gav: dep.gav,
+          scope: scope,
+          type: dep.type.to_sym,
+          coord: coord,
+          system: dep.system?
+        )
+      end
 
-        @system = !line.index(':system:').nil?
-        @gav = @coord.sub(REG, ':')
+      def initialize(path:, file:, gav:, scope:, type:, coord:, system: false)
+        @path = path
+        @file = file
+        @gav = gav
+        @scope = scope
+        @type = type
+        @coord = coord
+        @system = system
       end
 
       def system?
@@ -74,12 +105,21 @@ def self.install_jars(write_require_file: false)
     def self.load_from_maven(file)
       result = []
       File.read(file).each_line do |line|
-        dep = Dependency.new(line)
+        dep = Dependency.parse(line)
         result << dep if dep && dep.scope == :runtime
       end
       result
     end
 
+    def self.load_from_resolved(resolved)
+      resolved.each_with_object([]) do |mima_dep, result|
+        next unless MavenExec::RESOLVED_TYPES.include?(mima_dep.type)
+
+        dep = Dependency.from_resolved(mima_dep)
+        result << dep if dep.scope == :runtime
+      end
+    end
+
     def self.vendor_file(dir, dep)
       return unless !dep.system? && dep.type == :jar && dep.scope == :runtime
 
@@ -211,14 +251,8 @@ def do_install(vendor_dir, write_require_file)
     end
 
     def install_dependencies
-      deps = File.join(@mvn.basedir, 'deps.lst')
-
       puts "  jar dependencies for #{spec.spec_name} . . ." unless Jars.quiet?
-      @mvn.resolve_dependencies_list(deps)
-
-      self.class.load_from_maven(deps)
-    ensure
-      FileUtils.rm_f(deps) if deps
+      self.class.load_from_resolved(@mvn.resolve_dependencies)
     end
   end
 end

lib/jars/maven_exec.rb

@@ -56,21 +56,25 @@ def setup(spec = nil, allow_no_file: false)
       @spec = spec
     end
 
-    def resolve_dependencies_list(file)
+    def resolve_dependencies
       require 'jars/mima'
 
       artifacts = GemspecArtifacts.new(@spec)
       is_local_file = File.expand_path(File.dirname(@specfile)) == File.expand_path(Dir.pwd)
 
-      resolved = Jars::Mima.resolve_artifacts(artifacts.artifacts, all_dependencies: is_local_file)
+      Jars::Mima.resolve_artifacts(artifacts.artifacts, all_dependencies: is_local_file)
+    end
+
+    RESOLVED_TYPES = %w[jar pom].freeze
+
+    def resolve_dependencies_list(file)
+      resolved = resolve_dependencies
 
       # 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)
+          next unless RESOLVED_TYPES.include?(dep.type)
 
           line = +"   #{dep.group_id}:#{dep.artifact_id}:#{dep.type}:"
           line << "#{dep.classifier}:" if dep.classifier