lib/libis/format/tool/pdf_merge.rb in libis-format-1.3.4 vs lib/libis/format/tool/pdf_merge.rb in libis-format-2.0.0

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 require 'os'
 
 require 'libis/tools/extend/string'
 require 'libis/tools/logger'
 require 'libis/tools/command'
@@ -9,46 +7,42 @@
 require 'libis/format/config'
 
 module Libis
   module Format
     module Tool
+
       class PdfMerge
         include ::Libis::Tools::Logger
 
-        def self.installed?
-          result = Libis::Tools::Command.run(Libis::Format::Config[:java_cmd], '-version')
-          return false unless (result[:status]).zero?
-
-          File.exist?(Libis::Format::Config[:pdf_tool])
+        def self.run(source, target, options = [])
+          self.new.run source, target, options
         end
 
-        def self.run(source, target, *options)
-          new.run source, target, options
-        end
-
-        def run(source, target, *options)
+        def run(source, target, options = [])
           source = [source] unless source.is_a?(Array)
 
           if OS.java?
             # TODO: import library and execute in current VM. For now do exactly as in MRI.
           end
 
-          timeout = Libis::Format::Config[:timeouts][:pdf_tool]
-          args = [
-            Libis::Format::Config[:java_cmd],
-            '-jar', Libis::Format::Config[:pdf_tool],
-            'merge',
-            '-o', target,
-            options,
-            source
-          ].flatten
+          timeout = Libis::Format::Config[:timeouts][:pdf_merge]
+          result = Libis::Tools::Command.run(
+              Libis::Format::Config[:java_cmd],
+              '-cp', Libis::Format::Config[:pdf_tool],
+              'MergePdf',
+              '--file_output', target,
+              *options,
+              *source,
+              timeout: timeout,
+              kill_after: timeout * 2
+          )
 
-          result = Libis::Tools::Command.run(*args, timeout: , kill_after: timeout * 2)
+          raise RuntimeError, "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
+          raise RuntimeError, "#{self.class} errors: #{result[:err].join("\n")}" unless result[:status] == 0 && result[:err].empty?
 
-          result[:err] << "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
-
           result
         end
       end
+
     end
   end
 end