libis-format 0.9.46 → 0.9.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c702defaa0d1e02ec76075f37ef75296420f25d7
-  data.tar.gz: 388175008ed119a9245a66bf3f325c561f63251b
+  metadata.gz: 60f01408433c394b0e0826fb5c5934c64f165d2b
+  data.tar.gz: 62c72ba1644f42e9fcb2aa4b0be30ceb8b8b9c1f
 SHA512:
-  metadata.gz: 4bdbc44e8424e749d22a34acfe1d94138708cc4e5df3fe3795bd2531a0ae89bec1c52fd911f12544fe5319ca55f212f885939721c6d317773837d8ec3f749a71
-  data.tar.gz: 0fd44ec84de3896163df19f69bd2eef5f5910f358794a83698355c530d8f35f8d6e377f7135c9d970674269628e6a01a1c315ebb6101798ee02ed866e075060d
+  metadata.gz: 8a2323fa374678ae0768951818ac5e6ac5ce4a5f90dafc2ba837b5ce67c0ee4ad7b4b1c5e42e8d7a6d8eed902cfb75bde475c8d9861dc1b15c8f47eb4f5818c2
+  data.tar.gz: fe587083feec9372ba709e76ca7707cf7801a5737f305209967101196715cf61a4b7770ce7f709391bf4e3b34c168946a494e444420239e7f593883d1589a4e8

data/.travis.yml

@@ -3,21 +3,32 @@ sudo: false
 dist: trusty
 cache: bundler
 rvm:
-  - 2.1.0
-  - 2.2.0
+  - 2.1.10
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - ruby-head
-  - jruby-9.0.1.0
+  - jruby-9.0.5.0
+  - jruby-9.1.9.0
+  - jruby-head
 jdk:
   - openjdk8
   - oraclejdk8
 matrix:
   exclude:
-    - rvm: 2.1.0
+    - rvm: 2.1.10
       jdk: oraclejdk8
-    - rvm: 2.2.0
+    - rvm: 2.2.8
+      jdk: oraclejdk8
+    - rvm: 2.3.5
+      jdk: oraclejdk8
+    - rvm: 2.4.2
       jdk: oraclejdk8
     - rvm: ruby-head
       jdk: oraclejdk8
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
 branches:
   only:
       - master

data/lib/libis/format/config.rb

@@ -16,11 +16,11 @@ module Libis
     Config[:droid_path] = '/opt/droid/droid.sh'
     Config[:fido_path] = '/usr/local/bin/fido'
     Config[:ffmpeg_path] = 'ffmpeg'
-    data_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'data'))
-    Config[:fido_formats] = [(File.join(data_dir, 'lias_formats.xml'))]
+    Config[:fido_formats] = [(File.join(Libis::Format::DATA_DIR, 'lias_formats.xml'))]
+    Config[:pdf_tool] = [(File.join(Libis::Format::TOOL_DIR, 'PdfTool.jar'))]
     # noinspection RubyStringKeysInHashInspection
-    Config[:xml_validations] = [['archive/ead', File.join(data_dir, 'ead.xsd')]]
-    Config[:type_database] = File.join(data_dir, 'types.yml')
+    Config[:xml_validations] = [['archive/ead', File.join(Libis::Format::DATA_DIR, 'ead.xsd')]]
+    Config[:type_database] = File.join(Libis::Format::DATA_DIR, 'types.yml')
     Config[:raw_audio_convert_cmd] = 'sox %s -e signed -b 16 -t wav %s rate %d channels %d'
     Config[:watermark_font] = '/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf'
 

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

@@ -18,8 +18,6 @@ module Libis
         end
 
         def run(source, target, options = [])
-          tool_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'tools'))
-          jar_file = File.join(tool_dir, 'PdfTool.jar')
 
           if OS.java?
             # TODO: import library and execute in current VM. For now do exactly as in MRI.
@@ -27,7 +25,7 @@ module Libis
 
           Libis::Tools::Command.run(
               Libis::Format::Config[:java_path],
-              '-cp', jar_file,
+              '-cp', Libis::Format::Config[:pdf_tool],
               'CopyPdf',
               '--file_input', source,
               '--file_output', target,

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

@@ -18,8 +18,6 @@ module Libis
         end
 
         def run(source, target, options = [])
-          tool_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'tools'))
-          jar_file = File.join(tool_dir, 'PdfTool.jar')
           source = [source] unless source.is_a?(Array)
 
           if OS.java?
@@ -28,7 +26,7 @@ module Libis
 
           Libis::Tools::Command.run(
               Libis::Format::Config[:java_path],
-              '-cp', jar_file,
+              '-cp', Libis::Format::Config[:pdf_tool],
               'MergePdf',
               '--file_output', target,
               *options,

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

@@ -18,15 +18,14 @@ module Libis
         end
 
         def run(source, target, options = [])
-          tool_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'tools'))
-          jar_file = File.join(tool_dir, 'PdfTool.jar')
+
           if OS.java?
             # TODO: import library and execute in current VM. For now do exactly as in MRI.
           end
 
           Libis::Tools::Command.run(
               Libis::Format::Config[:java_path],
-              '-cp', jar_file,
+              '-cp', Libis::Format::Config[:pdf_tool],
               'SplitPdf',
               '--file_input', source,
               '--file_output', target,

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

@@ -42,7 +42,7 @@ module Libis
               return false
             end
           else
-            jar = File.join(Libis::Format::ROOT_DIR, 'tools', 'pdfbox', 'preflight-app-1.8.10.jar')
+            jar = File.join(Libis::Format::TOOL_DIR, 'pdfbox', 'preflight-app-1.8.10.jar')
             result = Libis::Tools::Command.run(
                 Libis::Format::Config[:java_path],
                 '-jar', jar,

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.46'
+    VERSION = '0.9.47'
   end
 end

data/lib/libis/format.rb

@@ -11,6 +11,7 @@ module Libis
 
     ROOT_DIR = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..'))
     DATA_DIR = File.join(ROOT_DIR, 'data')
+    TOOL_DIR = File.join(ROOT_DIR, 'tools')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.46
+  version: 0.9.47
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler