libis-format 2.0.0 → 2.0.5

data/lib/libis/format/tool.rb

@@ -12,10 +12,13 @@ module Libis
       autoload :OfficeToPdf, 'libis/format/tool/office_to_pdf'
       autoload :FFMpeg, 'libis/format/tool/ffmpeg'
       autoload :FopPdf, 'libis/format/tool/fop_pdf'
-      autoload :PdfCopy, 'libis/format/tool/pdf_copy'
       autoload :PdfMerge, 'libis/format/tool/pdf_merge'
+      autoload :PdfMetadata, 'libis/format/tool/pdf_metadata'
       autoload :PdfOptimizer, 'libis/format/tool/pdf_optimizer'
+      autoload :PdfProtect, 'libis/format/tool/pdf_protect'
+      autoload :PdfSelect, 'libis/format/tool/pdf_select'
       autoload :PdfSplit, 'libis/format/tool/pdf_split'
+      autoload :PdfWatermark, 'libis/format/tool/pdf_watermark'
       autoload :PdfToPdfa, 'libis/format/tool/pdf_to_pdfa'
       autoload :PdfaValidator, 'libis/format/tool/pdfa_validator'
 

data/lib/libis/format/tool/pdf_merge.rb

@@ -27,9 +27,9 @@ module Libis
           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,
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'merge',
+              '-o', target,
               *options,
               *source,
               timeout: timeout,

data/lib/libis/format/tool/{pdf_copy.rb → pdf_metadata.rb}

@@ -10,7 +10,7 @@ module Libis
   module Format
     module Tool
 
-      class PdfCopy
+      class PdfMetadata
         include ::Libis::Tools::Logger
 
         def self.run(source, target, options = [])
@@ -26,10 +26,10 @@ module Libis
           timeout = Libis::Format::Config[:timeouts][:pdf_copy]
           result = Libis::Tools::Command.run(
               Libis::Format::Config[:java_cmd],
-              '-cp', Libis::Format::Config[:pdf_tool],
-              'CopyPdf',
-              '--file_input', source,
-              '--file_output', target,
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'metadata',
+              '-i', source,
+              '-o', target,
               *options,
               timeout: timeout,
               kill_after: timeout * 2

data/lib/libis/format/tool/pdf_protect.rb

@@ -0,0 +1,47 @@
+require 'os'
+
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
+
+module Libis
+  module Format
+    module Tool
+
+      class PdfProtect
+        include ::Libis::Tools::Logger
+
+        def self.run(source, target, options = [])
+          self.new.run source, target, options
+        end
+
+        def run(source, target, options = [])
+
+          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_copy]
+          result = Libis::Tools::Command.run(
+              Libis::Format::Config[:java_cmd],
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'protect',
+              '-i', source,
+              '-o', target,
+              *options,
+              timeout: 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
+        end
+      end
+
+    end
+  end
+end

data/lib/libis/format/tool/pdf_select.rb

@@ -0,0 +1,47 @@
+require 'os'
+
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
+
+module Libis
+  module Format
+    module Tool
+
+      class PdfSelect
+        include ::Libis::Tools::Logger
+
+        def self.run(source, target, options = [])
+          self.new.run source, target, options
+        end
+
+        def run(source, target, options = [])
+
+          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_select]
+          result = Libis::Tools::Command.run(
+              Libis::Format::Config[:java_cmd],
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'select',
+              '-i', source,
+              '-o', target,
+              *options,
+              timeout: 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
+        end
+      end
+
+    end
+  end
+end

data/lib/libis/format/tool/pdf_split.rb

@@ -26,10 +26,10 @@ module Libis
           timeout = Libis::Format::Config[:timeouts][:pdf_split]
           result = Libis::Tools::Command.run(
               Libis::Format::Config[:java_cmd],
-              '-cp', Libis::Format::Config[:pdf_tool],
-              'SplitPdf',
-              '--file_input', source,
-              '--file_output', target,
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'split',
+              '-i', source,
+              '-o', target,
               *options,
               timeout: timeout,
               kill_after: timeout * 2

data/lib/libis/format/tool/pdf_watermark.rb

@@ -0,0 +1,47 @@
+require 'os'
+
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
+
+module Libis
+  module Format
+    module Tool
+
+      class PdfWatermark
+        include ::Libis::Tools::Logger
+
+        def self.run(source, target, wm_type, options = [])
+          self.new.run source, target, wm_type, options
+        end
+
+        def run(source, target, wm_type, options = [])
+
+          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_watermark]
+          result = Libis::Tools::Command.run(
+              Libis::Format::Config[:java_cmd],
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'watermark', wm_type,
+              '-i', source,
+              '-o', target,
+              *options,
+              timeout: 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
+        end
+      end
+
+    end
+  end
+end

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '2.0.0'
+    VERSION = '2.0.5'
   end
 end

data/libis-format.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency 'nokogiri'
   end
 
-  spec.add_runtime_dependency 'libis-tools', '~> 1.0'
+  spec.add_runtime_dependency 'libis-tools', '>= 1.0.9'
   spec.add_runtime_dependency 'os', '= 0.9.6'
   spec.add_runtime_dependency 'mini_magick', '~> 4.3'
   spec.add_runtime_dependency 'deep_dive', '~> 0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.5
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,16 +84,16 @@ dependencies:
   name: libis-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -169,11 +169,10 @@ description: Collection of tools and classes that help to identify formats of bi
 email:
 - kris.dekeyser@libis.be
 executables:
-- droid
-- fido
+- droid_tool
+- fido_tool
 - formatinfo
 - libis_format
-- pdf_copy
 extensions: []
 extra_rdoc_files: []
 files:
@@ -188,11 +187,10 @@ files:
 - base/Dockerfile.alpine
 - base/Dockerfile.rvm
 - base/rework_path
-- bin/droid
-- bin/fido
+- bin/droid_tool
+- bin/fido_tool
 - bin/formatinfo
 - bin/libis_format
-- bin/pdf_copy
 - data/ISOcoated_v2_eci.icc
 - data/PDFA_def.ps
 - data/ead.xsd
@@ -222,9 +220,14 @@ files:
 - lib/libis/format/converter/office_converter.rb
 - lib/libis/format/converter/pdf_assembler.rb
 - lib/libis/format/converter/pdf_converter.rb
+- lib/libis/format/converter/pdf_metadata.rb
 - lib/libis/format/converter/pdf_optimizer.rb
+- lib/libis/format/converter/pdf_protecter.rb
+- lib/libis/format/converter/pdf_selecter.rb
 - lib/libis/format/converter/pdf_splitter.rb
-- lib/libis/format/converter/pdf_watermarker.rb
+- lib/libis/format/converter/pdf_watermarker_header.rb
+- lib/libis/format/converter/pdf_watermarker_image.rb
+- lib/libis/format/converter/pdf_watermarker_text.rb
 - lib/libis/format/converter/repository.rb
 - lib/libis/format/converter/spreadsheet_converter.rb
 - lib/libis/format/converter/video_converter.rb
@@ -241,19 +244,22 @@ files:
 - lib/libis/format/tool/fop_pdf.rb
 - lib/libis/format/tool/identification_tool.rb
 - lib/libis/format/tool/office_to_pdf.rb
-- lib/libis/format/tool/pdf_copy.rb
 - lib/libis/format/tool/pdf_merge.rb
+- lib/libis/format/tool/pdf_metadata.rb
 - lib/libis/format/tool/pdf_optimizer.rb
+- lib/libis/format/tool/pdf_protect.rb
+- lib/libis/format/tool/pdf_select.rb
 - lib/libis/format/tool/pdf_split.rb
 - lib/libis/format/tool/pdf_to_pdfa.rb
+- lib/libis/format/tool/pdf_watermark.rb
 - lib/libis/format/tool/pdfa_validator.rb
 - lib/libis/format/tool/spreadsheet_to_ods.rb
 - lib/libis/format/version.rb
 - lib/libis/format/yaml_loader.rb
 - libis-format.gemspec
 - tools/PdfTool.jar
-- tools/bcpkix-jdk15on-1.49.jar
-- tools/bcprov-jdk15on-1.49.jar
+- tools/bcpkix-jdk15on-167.jar
+- tools/bcprov-jdk15on-167.jar
 - tools/fop/build/fop.jar
 - tools/fop/conf/fop.xconf
 - tools/fop/fop
@@ -325,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: LIBIS File format format services.

data/bin/pdf_copy

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'libis-format'
-require 'libis-tools'
-
-::Libis::Tools::Config.logger.level = :WARN
-
-source = ARGV.shift
-target = ARGV.shift
-options = ARGV
-
-::Libis::Format::Tool::PdfCopy.run source, target, options
-