poleica 0.9.7 → 0.9.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDE5ZmRlMzY4YjkxOTgzM2M2Nzc2Y2NmZjMxNDRiMGIxMzUxYTg5OA==
+    N2JkOTZiMjQ2MmQ3Y2MyYmI3OTI2N2I2MWUzNDI5ZTM5YTE2MmZhOA==
   data.tar.gz: !binary |-
-    NTJmZGQ2ZThiOTU4ZThiZGJjMGNlYzA3ZTdhMzhjNGU2NmRmYmYxYg==
+    MzdmZDljYWRmMGFiNWJjNDZmMGJlMjE4NWE4YjljY2I5YTJiYjdlMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTZjYTVmNTZiZTQ3ZDQ3ZTdlYjQzYTk0ODcwYzUzYjkwNGYzYjI0NjRkYzEx
-    NzAyNThmZjUxMDRjNjIyODg0Yzc5YmYyMGI4ZjM1YjE2YmM4ZDZhMGE3MWQw
-    NGNjNzE4MzU5ZmRlNTg1OWE4NzgyNTgxMzNmMmEyZjE3ZTVmNzA=
+    MmNhMTE3YjQ3MjE4OTdhMjFlOTBiYjQyN2Y0ZmJhM2Y0YzU1ZDhiMDNlZjA1
+    MjNlZDEwNmFjM2RkMWY4OTRiNmI0OGE2Y2FmZThkMzdhY2ZkMDEzMDNjZGY2
+    MDIzZTNhOTM0NTU5MGYzZDgwNGFiNDQzODA1NjA3YmUzMTFjYjc=
   data.tar.gz: !binary |-
-    NDQ4OWU5ZDAzZGEyNGU1ZTYxYjIyZTRhOWI4Yjc2NWJhMmRiODU4M2Q4N2Y3
-    MTQ2MGZiNjJlM2VkOWVlODIyYTkzMzU4YTIwNzk5MTZkOTJjMmQ5YmIwMzI1
-    NWE3Y2RmYjA2YTcyMDNjNjI5MjU1ZGJkNDhiNTVlZWZhZjEzZTg=
+    YzBkMGJmNjgxMmJiZTNhNDNiMWM0MGQwOTIwYTczODdmMTRiNGFhMjY5ZTZm
+    MDk2ZWMzNDU5Y2E4MjMwMGQ1YjFmM2M0NGUwMjU1N2FiODQ4NmYyMDk0ZWY0
+    OWM0MjYyMjNhNzY3MmQ5MTlkOWMxNWZmMTEyNTNhNWYwMTlmYTM=

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+# Poleica 0.9.8 (5 August 2013)
+* Add timeout (2 mins) on LibreOffice and GraphicsMagick execution 
 # Poleica 0.9.7 (4 August 2013)
 * Add an auto-orient (true by default) to GraphicsMagick
 # Poleica 0.9.6 (30 July 2013)

data/Gemfile.lock

@@ -17,7 +17,7 @@ GIT
 PATH
   remote: .
   specs:
-    poleica (0.9.7)
+    poleica (0.9.8)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -4,6 +4,7 @@
 [![Build Status](https://travis-ci.org/antoinelyset/poleica.png?branch=master)](https://travis-ci.org/antoinelyset/poleica)
 [![Coverage Status](https://coveralls.io/repos/antoinelyset/Poleica/badge.png)](https://coveralls.io/r/antoinelyset/Poleica)
 [![Code Climate](https://codeclimate.com/github/antoinelyset/Poleica.png)](https://codeclimate.com/github/antoinelyset/Poleica)
+[![Gem Version](https://badge.fury.io/rb/poleica.png)](http://badge.fury.io/rb/poleica)
 [![Dependency Status](https://gemnasium.com/antoinelyset/Poleica.png)](https://gemnasium.com/antoinelyset/Poleica)
 
 ## Install
@@ -57,7 +58,7 @@ Poleica.new(file_path).to_png(width: 400, weight: 400)
 
 ## Dependencies
 
-- GraphicsMagick (gm)
+- GraphicsMagick (gm) >= 1.3.11
 - LibreOffice 
 
 ## Requirements

data/lib/poleica/converters/graphics_magick.rb

@@ -28,7 +28,7 @@ module Poleica
         opts_gen = OptionsGenerator.new(polei, options)
         cmd = "#{bin_path} convert "
         cmd << "#{Utils.escape(polei.path)}#{opts_gen.generate}"
-        `#{cmd}`
+        exec_with_timeout(cmd)
         expected_file_path = opts_gen[:path]
         File.exists?(expected_file_path) ? expected_file_path : nil
       end

data/lib/poleica/converters/libre_office.rb

@@ -25,7 +25,7 @@ module Poleica
       def to_pdf(options = {})
         opts_gen = OptionsGenerator.new(polei, options, :pdf)
         cmd      = "#{bin_path} #{opts_gen.generate}"
-        `#{cmd}`
+        exec_with_timeout(cmd)
         expected_file_path = opts_gen[:path] || polei.path_with_md5(:pdf)
         File.exists?(expected_file_path) ? expected_file_path : nil
       ensure

data/lib/poleica/converters/utils.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'digest/md5'
 require 'shellwords'
+require 'timeout'
 
 module Poleica
   module Converters
@@ -8,6 +9,8 @@ module Poleica
     module Utils
       HOST_OS ||= (defined?('RbConfig') ? RbConfig : Config)::CONFIG['host_os']
 
+      DEFAULT_TIMEOUT = 120
+
       def windows?
         !!HOST_OS.match(/mswin|windows|cygwin/i)
       end
@@ -44,6 +47,14 @@ module Poleica
       def escape(string)
         Shellwords.shellescape(string)
       end
-    end
-  end
-end
+
+      def exec_with_timeout(cmd, timeout = DEFAULT_TIMEOUT, no_stdout = true)
+        cmd << ' >/dev/null' if no_stdout
+        pid = Process.spawn(cmd)
+        Timeout.timeout(timeout) { Process.wait(pid) }
+      rescue Timeout::Error
+        Process.kill('TERM', pid)
+      end
+    end # module Utils
+  end # module Converters
+end # module Poleica

data/lib/poleica/version.rb

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

data/test/poleica/converters/utils_test.rb

@@ -2,4 +2,10 @@
 require 'test_helper'
 # Test the Utils Converter Module
 class UtilsTest < Minitest::Test
+  def test_exect_with_timeout
+    start_time = Time.now
+    Poleica::Converters::Utils.exec_with_timeout('sleep 2', 1)
+    duration = Time.now - start_time
+    assert(duration < 2)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poleica
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Antoine Lyset
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement