chupa-text 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a96f66fb14ab05d80ef7d53494ee20d2aae298397d3b787591efd3ebfb30d5ab
-  data.tar.gz: 7dcaeb98ff526ea31b52871b492211d624b607957146aa6986eb5b6d41eba2e4
+  metadata.gz: 05b8ad4429bce26f6214f56945421c081f45749cda69af7183f6fb22cdac84b3
+  data.tar.gz: 1206a3c78638409189df999c9f935706460775be7512d99708fa4c193f05ab78
 SHA512:
-  metadata.gz: 8c07878c8308483eebecc3e683c74dbc4ce00ee1841ac588c82ba173bd1644bde026703934e34f66ebaf8ca369091cbff3940025953992bf572d5c038718b746
-  data.tar.gz: b8989bb876e8cafe5097bf5667a9e8fd796c7a8e9331254b4f5afef54774584a21ea0de20ea892745a9227275c21577f94d7399a76fb27963e3f0a09ca53e58f
+  metadata.gz: 9e7431e9bdc817caa55f7bcd78b775d7ccd22918817def1f0904123e29b14a9d3709a51e6e2b7a25a829ff463159468e521fee058511b985874fccbeb6e356aa
+  data.tar.gz: 7d02f3dff8cf7de87ea637783d8c4b25e4ef8c227ed42773d39cc2496902c884ee2f05f130493faf897c799698800bfa853af25282988618a5078fb2a81fcd55

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.3.0: 2019-06-14
+
+### Fixes
+
+  * Added support for timeout as string again.
+
 ## 1.2.9: 2019-06-13
 
 ### Improvements

data/lib/chupa-text.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,8 @@ require "chupa-text/logger"
 require "chupa-text/loggable"
 require "chupa-text/unzippable"
 
+require "chupa-text/timeout-value"
+
 require "chupa-text/configuration"
 require "chupa-text/configuration-loader"
 require "chupa-text/mime-type"

data/lib/chupa-text/external-command.rb

@@ -255,20 +255,21 @@ module ChupaText
     end
 
     def log_invalid_value(tag, value, type)
-      warn("#{log_tag}#{tag}[invalid] <#{value}>(#{type})")
+      super("#{log_tag}#{tag}", value, type)
     end
 
     def wait_process(pid, timeout, soft_timeout)
       tag = "[timeout]"
-      timeout = parse_time(tag, timeout || self.class.default_timeout)
-      soft_timeout = parse_time(tag, soft_timeout)
+      timeout = TimeoutValue.new(tag, timeout || self.class.default_timeout).raw
+      soft_timeout = TimeoutValue.new(tag, soft_timeout).raw
       if timeout
         timeout = soft_timeout if soft_timeout and soft_timeout < timeout
       else
         timeout = soft_timeout
       end
       if timeout
-        info("#{log_tag}#{tag}[use] <#{timeout}s>: <#{pid}>")
+        info("#{log_tag}#{tag}[use] " +
+             "<#{TimeoutValue.new(tag, timeout)}>: <#{pid}>")
         status = wait_process_timeout(pid, timeout)
         return status if status
         info("#{log_tag}#{tag}[terminate] <#{pid}>")

data/lib/chupa-text/extractor.rb

@@ -123,7 +123,7 @@ module ChupaText
     end
 
     def with_timeout(data, &block)
-      timeout = data.timeout
+      timeout = TimeoutValue.new("#{log_tag}[timeout]", data.timeout).raw
       if timeout
         begin
           Timeout.timeout(timeout, &block)

data/lib/chupa-text/loggable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -45,5 +45,9 @@ module ChupaText
     def unknown(*arguments, &block)
       logger.unknown(*arguments, &block)
     end
+
+    def log_invalid_value(tag, value, type)
+      warn("#{tag}[invalid] <#{value}>(#{type})")
+    end
   end
 end

data/lib/chupa-text/timeout-value.rb

@@ -0,0 +1,76 @@
+# Copyright (C) 2019  Sutou Kouhei <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "English"
+
+module ChupaText
+  class TimeoutValue
+    include Comparable
+    include Loggable
+
+    attr_reader :raw
+    def initialize(tag, value)
+      value = parse(value) if value.is_a?(String)
+      @raw = value
+    end
+
+    def to_s
+      return "" if @raw.nil?
+
+      if @raw < 1
+        "%.2fms" % (@raw * 1000.0)
+      elsif @raw < 60
+        "%.2fs" % @raw
+      elsif @raw < (60 * 60)
+        "%.2fm" % (@raw / 60.0)
+      else
+        "%.2fh" % (@raw / 60.0 / 60.0)
+      end
+    end
+
+    private
+    def parse(value)
+      case value
+      when nil
+        nil
+      when Numeric
+        value
+      else
+        return nil if value.empty?
+        scale = 1
+        case value
+        when /h\z/i
+          scale = 60 * 60
+          number = $PREMATCH
+        when /m\z/i
+          scale = 60
+          number = $PREMATCH
+        when /s\z/i
+          number = $PREMATCH
+        else
+          number = value
+        end
+        begin
+          number = Float(number)
+        rescue ArgumentError
+          log_invalid_value(@tag, value, "time")
+          return nil
+        end
+        (number * scale).to_f
+      end
+    end
+  end
+end

data/lib/chupa-text/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module ChupaText
-  VERSION = "1.2.9"
+  VERSION = "1.3.0"
 end

data/test/test-external-command.rb

@@ -102,7 +102,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <60.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <1.00m>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -117,7 +117,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <60.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <1.00m>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -132,7 +132,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <30.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <30.00s>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -147,7 +147,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <30.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <30.00s>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -162,7 +162,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <60.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <1.00m>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -178,7 +178,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <60.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <1.00m>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -194,7 +194,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <30.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <30.00s>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -209,7 +209,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <30.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <30.00s>: <#{pid}>",
                      ]
                    ],
                    messages)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -191,6 +191,7 @@ files:
 - lib/chupa-text/screenshot.rb
 - lib/chupa-text/size-parser.rb
 - lib/chupa-text/text-data.rb
+- lib/chupa-text/timeout-value.rb
 - lib/chupa-text/unzippable.rb
 - lib/chupa-text/utf8-converter.rb
 - lib/chupa-text/version.rb