image_optim 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9035f1f635ab728b4622dc5e99d2f5e9f96eab86ea35038c4037587fd3ca90d7
-  data.tar.gz: d24f6305c1461483d9a67a9338c4e9385ef9282070aecdc53cf0b79e7bffb5ed
+  metadata.gz: 0fb8179d2e5c5236278611842ad5dbb3ab39fc1ff92bbd50ed9dae6ccd931bf5
+  data.tar.gz: 83ab00c10f205a164ea66f51b6964d3fb4fa7d019c30e472496a0e21879242c0
 SHA512:
-  metadata.gz: 3501154596158ee61209215d7c3a4df1b82d7384d8b54248a16992e5897701eb1e1c10bca9bbbe92312f728e403544dfa6f0dd3c3dfc33918026497550f72ef4
-  data.tar.gz: 72ef8a7dacc6a7cc8850d996a716a5df2098cbe47e91f58a051e95664a83494346c0daa03f61384f4bd0c6674a65e4c383ac931863ef31ffed2cc6a8d57ef4a3
+  metadata.gz: 901e787f11a9829b96dd40f0d8aff14d4f2ac691ff3eaa8486d2915fd020b2f6e0d7425b360cf3bdbc52018afd69508078b69dd4e7846a138d9d5e9ea3b613d7
+  data.tar.gz: 8a21b871165184221bf9af9b9647f144a21e5da1ebe03680ac54b09edf955068f0364da1ee0d6d8dd9976bb96c76ff0cdcf49cb005f43fd5c5cdfe3f51cde39f

data/.rubocop.yml

@@ -109,9 +109,6 @@ Style/HashConversion:
 Style/HashEachMethods:
   Enabled: true
 
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
 Style/HashTransformKeys:
   Enabled: false
 
@@ -130,6 +127,9 @@ Style/OptionalBooleanParameter:
 Style/ParallelAssignment:
   Enabled: false
 
+Style/RedundantBegin:
+  Enabled: false
+
 Style/RescueStandardError:
   EnforcedStyle: implicit
 

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.30.0 (2021-05-11)
+
+* Add `timeout` option to restrict maximum time spent on every image [#21](https://github.com/toy/image_optim/issues/21) [#148](https://github.com/toy/image_optim/pull/148) [#149](https://github.com/toy/image_optim/pull/149) [#162](https://github.com/toy/image_optim/pull/162) [#184](https://github.com/toy/image_optim/pull/184) [#189](https://github.com/toy/image_optim/pull/189) [@tgxworld](https://github.com/tgxworld) [@oblakeerickson](https://github.com/oblakeerickson) [@toy](https://github.com/toy)
+
 ## v0.29.0 (2021-04-28)
 
 * Require at least ruby 1.9.3 [@toy](https://github.com/toy)

data/README.markdown

@@ -60,7 +60,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.29'
+gem 'image_optim', '~> 0.30'
 ```
 <!---</update-version>-->
 
@@ -291,6 +291,7 @@ optipng:
 * `:allow_lossy` — Allow lossy workers and optimizations *(defaults to `false`)*
 * `:cache_dir` — Configure cache directory
 * `:cache_worker_digests` - Also cache worker digests along with original file digest and worker options: updating workers invalidates cache
+* `:timeout` — Maximum time in seconds to spend on one image, note multithreading and cache *(defaults to unlimited)*
 
 Worker can be disabled by passing `false` instead of options hash or by setting option `:disable` to `true`.
 

data/Vagrantfile

@@ -3,7 +3,7 @@
 Vagrant.configure('2') do |config|
   config.vm.box = 'ubuntu/precise64'
 
-  config.vm.provision 'shell', :inline => <<-SH
+  config.vm.provision 'shell', inline: <<-SH
     set -e
 
     cd /vagrant

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.29.0'
+  s.version     = '0.30.0'
   s.summary     = %q{Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/image_optim.rb

@@ -3,10 +3,12 @@
 require 'image_optim/bin_resolver'
 require 'image_optim/cache'
 require 'image_optim/config'
+require 'image_optim/errors'
 require 'image_optim/handler'
 require 'image_optim/image_meta'
 require 'image_optim/optimized_path'
 require 'image_optim/path'
+require 'image_optim/timer'
 require 'image_optim/worker'
 require 'in_threads'
 require 'shellwords'
@@ -46,6 +48,9 @@ class ImageOptim
   # Cache worker digests
   attr_reader :cache_worker_digests
 
+  # Timeout in seconds for each image
+  attr_reader :timeout
+
   # Initialize workers, specify options using worker underscored name:
   #
   # pass false to disable worker
@@ -78,6 +83,7 @@ class ImageOptim
       allow_lossy
       cache_dir
       cache_worker_digests
+      timeout
     ].each do |name|
       instance_variable_set(:"@#{name}", config.send(name))
       $stderr << "#{name}: #{send(name)}\n" if verbose
@@ -110,11 +116,17 @@ class ImageOptim
     return unless (workers = workers_for_image(original))
 
     optimized = @cache.fetch(original) do
+      timer = timeout && Timer.new(timeout)
+
       Handler.for(original) do |handler|
-        workers.each do |worker|
-          handler.process do |src, dst|
-            worker.optimize(src, dst)
+        begin
+          workers.each do |worker|
+            handler.process do |src, dst|
+              worker.optimize(src, dst, timeout: timer)
+            end
           end
+        rescue Errors::TimeoutExceeded
+          handler.result
         end
       end
     end

data/lib/image_optim/bin_resolver/bin.rb

@@ -38,30 +38,30 @@ class ImageOptim
       is = ComparableCondition.is
 
       FAIL_CHECKS = {
-        :pngcrush => [
+        pngcrush: [
           [is.between?('1.7.60', '1.7.65'), 'is known to produce broken pngs'],
           [is == '1.7.80', 'loses one color in indexed images'],
         ],
-        :pngquant => [
+        pngquant: [
           [is < '2.0', 'is not supported'],
         ],
       }.freeze
 
       WARN_CHECKS = {
-        :advpng => [
+        advpng: [
           [is == 'none', 'is of unknown version'],
           [is < '1.17', 'does not use zopfli'],
         ],
-        :gifsicle => [
+        gifsicle: [
           [is < '1.85', 'does not support removing extension blocks'],
         ],
-        :pngcrush => [
+        pngcrush: [
           [is < '1.7.38', 'does not have blacken flag'],
         ],
-        :pngquant => [
+        pngquant: [
           [is < '2.1', 'may be lossy even with quality `100-`'],
         ],
-        :optipng => [
+        optipng: [
           [is < '0.7', 'does not support -strip option'],
         ],
       }.freeze

data/lib/image_optim/cache.rb

@@ -21,6 +21,11 @@ class ImageOptim
           "#{bin.name}[#{bin.digest}]"
         end.sort!.uniq.join(', ')]
       end]
+      @global_options = begin
+        options = {}
+        options[:timeout] = image_optim.timeout if image_optim.timeout
+        options.empty? ? '' : options.inspect
+      end
     end
 
     def fetch(original)
@@ -68,6 +73,7 @@ class ImageOptim
       digest = Digest::SHA1.file(path)
       digest.update options_by_format(format)
       digest.update bins_by_format(format) if @cache_worker_digests
+      digest.update @global_options
       s = digest.hexdigest
       "#{s[0..1]}/#{s[2..-1]}"
     end

data/lib/image_optim/cmd.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'image_optim/errors'
 require 'English'
 
 class ImageOptim
@@ -10,11 +11,30 @@ class ImageOptim
       # Return success status
       # Will raise SignalException if process was interrupted
       def run(*args)
-        success = system(*args)
+        if args.last.is_a?(Hash) && (timeout = args.last.delete(:timeout))
+          args.last[Gem.win_platform? ? :new_pgroup : :pgroup] = true
 
-        check_status!
+          pid = Process.spawn(*args)
+
+          waiter = Process.detach(pid)
+          if waiter.join(timeout)
+            status = waiter.value
+
+            check_status!(status)
+
+            status.success?
+          else
+            cleanup(pid, waiter)
 
-        success
+            fail Errors::TimeoutExceeded
+          end
+        else
+          success = system(*args)
+
+          check_status!
+
+          success
+        end
       end
 
       # Run using backtick
@@ -30,9 +50,7 @@ class ImageOptim
 
     private
 
-      def check_status!
-        status = $CHILD_STATUS
-
+      def check_status!(status = $CHILD_STATUS)
         return unless status.signaled?
 
         # jruby incorrectly returns true for `signaled?` if process exits with
@@ -46,6 +64,27 @@ class ImageOptim
 
         fail SignalException, status.termsig
       end
+
+      def cleanup(pid, waiter)
+        if Gem.win_platform?
+          kill('KILL', pid)
+        else
+          kill('-TERM', pid)
+
+          # Allow 10 seconds for the process to exit
+          waiter.join(10)
+
+          kill('-KILL', pid)
+        end
+
+        waiter.join
+      end
+
+      def kill(signal, pid)
+        Process.kill(signal, pid)
+      rescue Errno::ESRCH, Errno::EPERM
+        # expected
+      end
     end
   end
 end

data/lib/image_optim/config.rb

@@ -117,6 +117,14 @@ class ImageOptim
       end
     end
 
+    # Timeout in seconds for each image:
+    # * not set by default and for `nil`
+    # * otherwise converted to float
+    def timeout
+      timeout = get!(:timeout)
+      timeout ? timeout.to_f : nil
+    end
+
     # Verbose mode, converted to boolean
     def verbose
       !!get!(:verbose)
@@ -175,7 +183,7 @@ class ImageOptim
       when true, nil
         {}
       when false
-        {:disable => true}
+        {disable: true}
       else
         fail ConfigurationError, "Got #{worker_options.inspect} for "\
             "#{klass.name} options"

data/lib/image_optim/elapsed_time.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class ImageOptim
+  # Use Process.clock_gettime if available to get time more fitting to calculate elapsed time
+  module ElapsedTime
+    CLOCK_NAME = %w[
+      CLOCK_UPTIME_RAW
+      CLOCK_UPTIME
+      CLOCK_MONOTONIC_RAW
+      CLOCK_MONOTONIC
+      CLOCK_REALTIME
+    ].find{ |name| Process.const_defined?(name) }
+
+    CLOCK_ID = CLOCK_NAME && Process.const_get(CLOCK_NAME)
+
+  module_function
+
+    def now
+      if CLOCK_ID
+        Process.clock_gettime(CLOCK_ID)
+      else
+        Time.now.to_f
+      end
+    end
+  end
+end

data/lib/image_optim/errors.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ImageOptim
+  class Error < StandardError; end
+
+  module Errors
+    class TimeoutExceeded < Error; end
+  end
+end

data/lib/image_optim/runner/option_parser.rb

@@ -182,6 +182,10 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
     options[:allow_lossy] = allow_lossy
   end
 
+  op.on('--timeout N', Float, 'Maximum time in seconds to spend on one image') do |timeout|
+    options[:timeout] = timeout
+  end
+
   op.separator nil
 
   ImageOptim::Worker.klasses.each_with_index do |klass, i|

data/lib/image_optim/timer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'image_optim/elapsed_time'
+
+class ImageOptim
+  # Hold start time and timeout
+  class Timer
+    include ElapsedTime
+
+    def initialize(seconds)
+      @start = now
+      @seconds = seconds
+    end
+
+    def elapsed
+      now - @start
+    end
+
+    def left
+      @seconds - elapsed
+    end
+
+    alias_method :to_f, :left
+  end
+end

data/lib/image_optim/worker.rb

@@ -3,6 +3,7 @@
 
 require 'image_optim/cmd'
 require 'image_optim/configuration_error'
+require 'image_optim/elapsed_time'
 require 'image_optim/path'
 require 'image_optim/worker/class_methods'
 require 'shellwords'
@@ -41,7 +42,7 @@ class ImageOptim
 
     # Optimize image at src, output at dst, must be overriden in subclass
     # return true on success
-    def optimize(_src, _dst)
+    def optimize(_src, _dst, options = {})
       fail NotImplementedError, "implement method optimize in #{self.class}"
     end
 
@@ -122,33 +123,44 @@ class ImageOptim
     end
 
     # Run command setting priority and hiding output
-    def execute(bin, *arguments)
+    def execute(bin, arguments, options)
       resolve_bin!(bin)
 
       cmd_args = [bin, *arguments].map(&:to_s)
 
-      start = Time.now
-
-      success = run_command(cmd_args)
-
       if @image_optim.verbose
-        seconds = Time.now - start
-        $stderr << "#{success ? '✓' : '✗'} #{seconds}s #{cmd_args.shelljoin}\n"
+        run_command_verbose(cmd_args, options)
+      else
+        run_command(cmd_args, options)
       end
-
-      success
     end
 
     # Run command defining environment, setting nice level, removing output and
     # reraising signal exception
-    def run_command(cmd_args)
+    def run_command(cmd_args, options)
       args = [
         {'PATH' => @image_optim.env_path},
         *%W[nice -n #{@image_optim.nice}],
         *cmd_args,
-        {:out => Path::NULL, :err => Path::NULL},
+        options.merge(out: Path::NULL, err: Path::NULL),
       ]
       Cmd.run(*args)
     end
+
+    # Wrap run_command and output status, elapsed time and command
+    def run_command_verbose(cmd_args, options)
+      start = ElapsedTime.now
+
+      begin
+        success = run_command(cmd_args, options)
+        status = success ? '✓' : '✗'
+        success
+      rescue Errors::TimeoutExceeded
+        status = 'timeout'
+        raise
+      ensure
+        $stderr << format("%s %.1fs %s\n", status, ElapsedTime.now - start, cmd_args.shelljoin)
+      end
+    end
   end
 end