poleica 0.9.10 → 0.9.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjQ0ODk3YzY0NWUwY2U4NjBjYTY2NjI1MDY2NTRkMzg5NDQ2YmM3Ng==
+    YzM2ZTViOTU5Zjk5OWZkNDM5MjAwZGNmYzc5YTJkYTg5MjY1ZTZmMw==
   data.tar.gz: !binary |-
-    ZTUwZTQ1NjExODY0ZTc4YTk1Y2RhM2I4YWY5ZjU5MGE2NTk3MTBjYw==
+    ZjY1YmMzYzUyYWNkNDYyYmZkYzhkYTA5OTU0OWIzMjI2Mjk2ZTc0Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWJjYjMzMGY5ZTk4NDZhYTZjNjY1ZDU0ZjkzZTUxNjI2MzY3NjkyODJkMzQy
-    MWFkOTQwNjQ1YTg0MjNhNmFkNjIwMTMwMmFjNjBkMjU1YzlhMDUwMTRiNWI4
-    NjZlNDA1NTNkMjMxZWNlMDdmYWU2OWZhYzI0YmJkOGVlYTM4NTY=
+    ZmJlNmNlZjAxOWZlNDVlYTg5ZWYxZTRiZWQ1NDVjNzllMzBiYTg2MTcyY2Q4
+    ZjczZWEwMWY3YzhjZDE0NDk2OTg3NzNiYmQ2YmRjNzVkOGRlMDUzNjU5ZTgz
+    YzIwZWNhNTlkNzkzZjE0MWZlZDQwNjUzZTA5NWQ2ZmI0NWJhNjQ=
   data.tar.gz: !binary |-
-    MjAwMTdhOTg2NTk5ODY2NjQ0NDgwMGI1M2VlODIzNWM4NTQ2YTQxNDVkZDdm
-    OWUwNmQyMTZiYjc4OTkxZDZhZTZjYmM0Y2RhODY3YWIxZGVkODNjNmEyYzA5
-    NjU2NTQ4MzNkNDk4NDVjMWYwMWI5ZmViZjI3NTViZjU0YTJlODA=
+    OTQxMzg5NDBlNWI1YzUxM2NmMDM4MDg1MTVmN2ExZmViMTE4YmVkOTYzZDcy
+    MTQyYjY2NzM5NmM4NWJiNmNkMjgzNzAwMzJjNjIwMDAwYzk0OGI2N2ZiOThi
+    NDBmNmU5Y2UyOWYxMjA0NTg4ZWI0MGM3YzY5YWYxZGExMTdjY2M=

data/.travis.yml

@@ -14,7 +14,7 @@ before_script:
   - ./configure
   - make
   - sudo make install
-  - sudo ln -s /usr/local/bin/gm /usr/bin/gm
+  - /usr/lib/libreoffice/program/soffice.bin --nologo --headless --invisible --norestore --nolockcheck --convert-to pdf test/support/files/example.doc || true
 script:
   - rake
 matrix:

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 
 group :test do
   gem 'minitest'
-  gem 'rubocop', :github => 'bbatsov/rubocop'
+  gem 'rubocop',   github:  'bbatsov/rubocop'
   gem 'coveralls', require: false
 end
 
@@ -15,5 +15,5 @@ group :development do
 
   # Guards
   gem 'guard-rubocop'
-  gem 'guard-minitest', :github => 'guard/guard-minitest'
+  gem 'guard-minitest', github: 'guard/guard-minitest'
 end

data/Gemfile.lock

@@ -17,7 +17,8 @@ GIT
 PATH
   remote: .
   specs:
-    poleica (0.9.10)
+    poleica (0.9.11)
+      childprocess
 
 GEM
   remote: https://rubygems.org/

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs.push ['lib', 'test']
   t.test_files = FileList['test/**/*_test.rb']
-  t.verbose = true
+  t.verbose    = true
 end
 
 task :rubocop do |t|

data/lib/poleica/converters/graphics_magick.rb

@@ -7,7 +7,7 @@ module Poleica
       include Poleica::Converters::Utils
 
       BIN_PATHS = {
-        linux:  '/usr/bin/gm',
+        linux:  '/usr/local/bin/gm',
         osx:    '/usr/local/bin/gm'
       }
 
@@ -26,9 +26,7 @@ module Poleica
 
       def to_png(options = {})
         opts_gen = OptionsGenerator.new(polei, options)
-        cmd = "#{bin_path} convert "
-        cmd << "#{Utils.escape(polei.path)}#{opts_gen.generate}"
-        exec_with_timeout(cmd)
+        exec_with_timeout(bin_path, opts_gen.generate)
         expected_file_path = opts_gen[:path]
         File.exists?(expected_file_path) ? expected_file_path : nil
       end
@@ -46,9 +44,13 @@ module Poleica
         end
 
         def generate
-          "#{page_options} #{orient_options}"   +
-            " #{thumbnail_or_resize_options}"   +
-            " #{Utils.escape(output_options)}"
+          [
+            'convert',
+            "#{polei.path}#{page_options}",
+            orient_options,
+            thumbnail_or_resize_options,
+            output_options
+          ].flatten
         end
 
         def [](key)
@@ -84,18 +86,23 @@ module Poleica
 
         def thumbnail_options
           @thumbnail_options ||=
-            "-thumbnail #{options[:width]}x"  +
-                       "#{options[:height]}^" +
-                       ' -gravity center'     +
-              " -extent #{options[:width]}x"  +
-                       "#{options[:height]}"
+            [
+              '-thumbnail',
+              "#{options[:width]}x#{options[:height]}^",
+              '-gravity',
+              'center',
+              '-extent',
+              "#{options[:width]}x#{options[:height]}"
+            ]
         end
 
         def resize_options
           @resize_options ||=
-            "-resize #{options[:width]}x" +
-                    "#{options[:height]}" +
-                    "#{'!' if options[:force_resize]}"
+            [
+              '-resize',
+              "#{options[:width]}x#{options[:height]}" +
+                "#{'!' if options[:force_resize]}"
+            ]
         end
 
         def output_options

data/lib/poleica/converters/libre_office.rb

@@ -24,8 +24,7 @@ module Poleica
 
       def to_pdf(options = {})
         opts_gen = OptionsGenerator.new(polei, options, :pdf)
-        cmd      = "#{bin_path} #{opts_gen.generate}"
-        exec_with_timeout(cmd)
+        exec_with_timeout(bin_path, opts_gen.generate)
         expected_file_path = opts_gen[:path] || polei.path_with_md5(:pdf)
         File.exists?(expected_file_path) ? expected_file_path : nil
       ensure
@@ -47,7 +46,11 @@ module Poleica
         end
 
         def generate
-          "#{default_options} #{format} #{output_options}"
+          [
+            default_options,
+            format,
+            output_options
+          ].flatten
         end
 
         def [](key)
@@ -85,18 +88,19 @@ module Poleica
         end
 
         def default_options
-          '--nologo --headless --invisible' +
-            ' --norestore --nolockcheck --convert-to'
+          %w{
+             --nologo
+             --headless
+             --invisible
+             --norestore
+             --nolockcheck
+             --convert-to
+          }
         end
 
         def output_options
           dir_path = File.dirname(temp_path)
-          "--outdir #{Utils.escape(dir_path)} #{Utils.escape(temp_path)}"
-        end
-
-        def pages_options
-          @pages_options ||= Array(options[:page]).
-            flatten.compact.uniq.sort.to_s
+          ['--outdir', dir_path, temp_path]
         end
       end # class OptionsGenerator
     end # class LibreOffice

data/lib/poleica/converters/utils.rb

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'digest/md5'
-require 'shellwords'
-require 'timeout'
+require 'childprocess'
 
 module Poleica
   module Converters
@@ -42,19 +41,17 @@ module Poleica
         [extension, options]
       end
 
-      def escape(string)
-        Shellwords.shellescape(string)
-      end
-
-      def exec_with_timeout(cmd,
-                            timeout   = Poleica.configuration.timeout,
-                            no_stdout = true)
-        cmd << ' >/dev/null' if no_stdout
-        pid = Process.spawn(cmd)
-        Timeout.timeout(timeout) { Process.wait(pid) }
-      rescue Timeout::Error => e
-        Process.kill('KILL', pid)
-        raise e
+      def exec_with_timeout(bin, args = [], timeout = nil, is_stdout = true)
+        args      = Array(args).map(&:to_s)
+        timeout ||= Poleica.configuration.timeout
+        null      = IO.new(IO.sysopen('/dev/null', 'w'), 'w')
+        process   = ChildProcess.build(bin, *args).start
+        process.io.stdout = process.io.stderr = null
+        process.poll_for_exit(timeout)
+      rescue ChildProcess::TimeoutError => e
+        process.stop && raise(e)
+      ensure
+        null && null.close
       end
     end # module Utils
   end # module Converters

data/lib/poleica/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Poleica
-  VERSION ||= '0.9.10'
+  VERSION ||= '0.9.11'
 end # module Poleica

data/poleica.gemspec

@@ -13,6 +13,10 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  s.add_runtime_dependency     'childprocess'
+# s.add_runtime_dependency     'posix-spawn' ONLY MRI
+
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake'
 end

data/test/poleica/converters/coercive_test.rb

@@ -19,7 +19,6 @@ class CoerciveTest < Minitest::Test
   def test_try_convert_intermediary_file_creation
     coercive_conv.send(:coerce, :to_png, {})
     assert(File.exists?(expected_pdf_path))
-    clean_png_file
     clean_pdf_file
   end
 

data/test/poleica/converters/libre_office_test.rb

@@ -41,29 +41,8 @@ class LibreOfficeTest < Minitest::Test
     assert_equal(returned_path, path_option)
   end
 
-#  FIXME fail on Ubuntu
-#  def test_multithreading
-#    threads = multithreaded_conversion
-#    threads.each_with_index do |t, n|
-#      t.join
-#      assert_equal(t[:expected_path], t[:returned_path])
-#      assert(File.exists?(t[:expected_path]))
-#      File.delete(t[:expected_path]) if File.exists?(t[:expected_path])
-#    end
-#  end
-
   private
 
-  def multithreaded_conversion(threads_number = 5)
-    (0..threads_number - 1).map do |n|
-      Thread.new do
-        path_option = "#{Support.support_path}/files/path_test#{n}.pdf"
-        Thread.current[:expected_path] = path_option
-        Thread.current[:returned_path] = doc_polei.to_pdf(path: path_option)
-      end
-    end
-  end
-
   def clean_pdf_file
     if File.exists?(Support.expected_converted_path(DOC_PATH, :pdf))
       File.delete(Support.expected_converted_path(DOC_PATH, :pdf))

data/test/poleica/converters/utils_test.rb

@@ -4,14 +4,17 @@ require 'test_helper'
 class UtilsTest < Minitest::Test
   def test_exec_with_timeout
     start_time = Time.now
-    Poleica::Converters::Utils.exec_with_timeout('sleep 2', 0.1) rescue nil
+    Poleica::Converters::Utils.exec_with_timeout('sleep', 2, 0.1) rescue nil
     duration = Time.now - start_time
     assert(duration < 2)
   end
 
-  def test_exec_with_timeout_exception
-    assert_raises(Timeout::Error) do
-      Poleica::Converters::Utils.exec_with_timeout('sleep 2', 0.1)
-    end
+  def test_exec_with_timeout_kill
+    assert(`ps -a | grep soffice.bin | grep -v grep`.empty?)
+    Poleica.configure { |conf| conf.timeout = 0.001 }
+    Poleica.new("#{Support.support_path}/files/example.doc").to_png rescue nil
+    assert(`ps -a | grep example.doc | grep -v grep`.empty?)
+  ensure
+    Poleica.configure { |config| config.timeout = 120 }
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: poleica
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Antoine Lyset
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  name: childprocess
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: