image_optim 0.27.1 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8d7c83b1d36f1cb0c41866cf421a8477632c43137749f2011b2520854de859d
-  data.tar.gz: 3030f2377d510cc964025e3497dfb2bc860bd560fa88e33acc97e3caaa56614c
+  metadata.gz: e80e82d67e3434476f0bdf332b14b6369601010aaeef7ab7b901515d0c03565c
+  data.tar.gz: 16f304385c879cf1afc0073d7d037fb548d6c260f57e2b94cdcdd974f3cd4b4e
 SHA512:
-  metadata.gz: 3df3a7cd3606e03dc16fd7aed023e40f61e5c4b688707a39240cc67b5432b9705fbb2c33df9ec8a1da96e4408d7a5270b6a181415647e53c686565f45b5c2bd4
-  data.tar.gz: b19684e4d13d29e6ac52e3ba5cddb38a6716f9acfae9946962ab45582a38e49c6c42018387d66e75a5f52d7153e12cf4a9e9dc10388f6d36bd4834d5a5e78ee0
+  metadata.gz: b0395980a804453e3273f779c1217d5dd5b9b7c522e74964070b43f2b3ac433f9f39d5f997a3e9c6594f22d244752910eea1697ac2e570de34e6b0641555b9e8
+  data.tar.gz: 9de0bebe89071d3aa7bd506b02dc684b53d998dcfccab1debad72bdc244e6fbae6eb0ac2d5871359fe2ffa5cb9e7c5ae8a7dc98829e00e8abef49c017ac3b00c

data/.appveyor.yml

@@ -6,6 +6,8 @@ install:
   - gem --version
   - bundle package --all
 
+  - ps: Install-Product node
+
   - ps: git --work-tree=tmp\bin checkout origin/windows-binaries -- '*.exe'
 
   - ps: | # svgo

data/.github/workflows/check.yml

@@ -0,0 +1,59 @@
+name: check
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: 45 4 * * 2
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+        - '2.0'
+        - '2.1'
+        - '2.2'
+        - '2.3'
+        - '2.4'
+        - '2.5'
+        - '2.6'
+        - '2.7'
+        - '3.0'
+        - jruby-9.2
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+        bundler-cache: true
+    - run: sudo npm install -g svgo
+    - run: curl -L "https://www.jonof.id.au/files/kenutils/pngout-20200115-linux.tar.gz" | sudo tar -xz -C /usr/local/bin --strip-components 2 --wildcards '*/amd64/pngout'
+    - run: curl -L "https://github.com/shssoichiro/oxipng/releases/download/v4.0.3/oxipng-4.0.3-x86_64-unknown-linux-musl.tar.gz" | tar -xz -C /usr/local/bin --strip-components 1 --wildcards '*oxipng'
+    - run: bundle exec image_optim --info
+    - run: bundle exec rspec
+  coverage:
+    runs-on: ubuntu-latest
+    env:
+      CC_TEST_REPORTER_ID: b433c6540d220a2da0663670c9b260806bafdb3a43c6f22b2e81bfb1f87b12fe
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.0'
+        bundler-cache: true
+    - run: sudo npm install -g svgo
+    - run: curl -L "https://www.jonof.id.au/files/kenutils/pngout-20200115-linux.tar.gz" | sudo tar -xz -C /usr/local/bin --strip-components 2 --wildcards '*/amd64/pngout'
+    - run: curl -L "https://github.com/shssoichiro/oxipng/releases/download/v4.0.3/oxipng-4.0.3-x86_64-unknown-linux-musl.tar.gz" | tar -xz -C /usr/local/bin --strip-components 1 --wildcards '*oxipng'
+    - uses: paambaati/codeclimate-action@v2.7.5
+      with:
+        coverageCommand: bundle exec rspec
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.0'
+        bundler-cache: true
+    - run: bundle exec rubocop

data/.pre-commit-hooks.yaml

@@ -0,0 +1,9 @@
+- id: image_optim
+  name: image_optim
+  entry: image_optim
+  language: ruby
+  types:
+  - image
+  args: []
+  additional_dependencies:
+  - image_optim_pack

data/.rubocop.yml

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

data/CHANGELOG.markdown

@@ -2,6 +2,28 @@
 
 ## unreleased
 
+## v0.31.0 (2021-10-03)
+
+* Add support for Oxipng [#167](https://github.com/toy/image_optim/issues/167) [#190](https://github.com/toy/image_optim/pull/190) [@oblakeerickson](https://github.com/oblakeerickson)
+* Fix `TypeError: can't convert ImageOptim::Timer into Float` with Ruby 3 [#194](https://github.com/toy/image_optim/pull/194) [@yahonda](https://github.com/yahonda)
+
+## 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)
+* Add support for use as [pre-commit](https://pre-commit.com/) hook [#192](https://github.com/toy/image_optim/pull/192) [@proinsias](https://github.com/proinsias)
+* Fix `Path#copy_metadata` by rescuing also `Errno::EACCES` as it is done in `fileutils` [#187](https://github.com/toy/image_optim/issues/187) [@toy](https://github.com/toy)
+* More precise regular expression for capturing svgo version [@toy](https://github.com/toy)
+
+## v0.28.0 (2020-12-18)
+
+* Fix and update list of markers in jpegoptim worker: allow to pass `com` instead of incorrect `comments` and add missing `xmp` and `none` [#188](https://github.com/toy/image_optim/issues/188) [@toy](https://github.com/toy)
+* Add `--skip-if-larger` flag to pngquant worker. The pngquant worker already does this, but this will make it fail faster. [#125](https://github.com/toy/image_optim/pull/125) [#181](https://github.com/toy/image_optim/pull/181) [@iggant](https://github.com/iggant) [@oblakeerickson](https://github.com/oblakeerickson)
+* Add `method` option for jpegrecompress, default to `ssim` [#102](https://github.com/toy/image_optim/issues/102) [#103](https://github.com/toy/image_optim/pull/103) [#182](https://github.com/toy/image_optim/pull/182) [@ramiroaraujo](https://github.com/ramiroaraujo) [@oblakeerickson](https://github.com/oblakeerickson)
+
 ## v0.27.1 (2020-09-30)
 
 * Fixed atomic replacement for case when equal `File::Stat#dev` doesn't mean that file can be linked [#180](https://github.com/toy/image_optim/issues/180) [@toy](https://github.com/toy)

data/CONTRIBUTING.markdown

@@ -2,10 +2,13 @@
 
 * Create topic/feature branch: `git checkout -b awesome-changes`
 * Commit…
-* Add entry at the top of [ChangeLog](CHANGELOG.markdown)
+* Add an entry at the top (after ## unreleased) of [ChangeLog](CHANGELOG.markdown), include:
+  * Issues (`[#123](https://github.com/toy/image_optim/issues/123)`)
+  * Pull requests (`[#123](https://github.com/toy/image_optim/pull/123)`)
+  * Authors (`[@octocat](https://github.com/octocat)`)
 * Run tests: `bundle exec rspec`
 * Check code style: `bundle exec rubocop`
 * Rebase on master and squash commits to logical units
 * Push your branch: `git push origin awesome-changes`
 * Create pull request
-* Check if [travis is happy](https://travis-ci.org/toy/image_optim/pull_requests)
+* Check if [github actions workflow is happy](https://github.com/toy/image_optim_pack/actions/workflows/check.yml)

data/Gemfile

@@ -4,14 +4,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-if ENV['CODECLIMATE']
+if ENV['CC_TEST_REPORTER_ID']
   group :test do
     gem 'simplecov'
-
-    gem 'codeclimate-test-reporter'
   end
 end
-
-if ENV['CHECK_RUBIES']
-  gem 'travis_check_rubies', '~> 0.2'
-end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2020 Ivan Kuchin
+Copyright (c) 2012-2021 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,10 +1,10 @@
-[![Gem Version](https://img.shields.io/gem/v/image_optim.svg?style=flat)](https://rubygems.org/gems/image_optim)
-[![Build Status](https://img.shields.io/travis/toy/image_optim/master.svg?style=flat)](https://travis-ci.org/toy/image_optim)
-[![AppVeyor Status](https://img.shields.io/appveyor/ci/toy/image-optim/master.svg?style=flat&label=windows)](https://ci.appveyor.com/project/toy/image-optim)
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/toy/image_optim.svg?style=flat)](https://codeclimate.com/github/toy/image_optim)
-[![Code Climate Coverage](https://img.shields.io/codeclimate/c/toy/image_optim.svg?style=flat)](https://codeclimate.com/github/toy/image_optim)
-[![Depfu](https://badges.depfu.com/badges/221b4832fa96f613aa5401f7cb4030ac/overview.svg)](https://depfu.com/github/toy/image_optim)
-[![Inch CI](https://inch-ci.org/github/toy/image_optim.svg?branch=master&style=flat)](https://inch-ci.org/github/toy/image_optim)
+[![Gem Version](https://img.shields.io/gem/v/image_optim?logo=rubygems)](https://rubygems.org/gems/image_optim)
+[![Build Status](https://img.shields.io/github/workflow/status/toy/image_optim/check/master?logo=github)](https://github.com/toy/image_optim/actions/workflows/check.yml)
+[![AppVeyor Status](https://img.shields.io/appveyor/build/toy/image-optim/master?label=windows&logo=appveyor)](https://ci.appveyor.com/project/toy/image-optim)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/toy/image_optim?logo=codeclimate)](https://codeclimate.com/github/toy/image_optim)
+[![Code Climate Coverage](https://img.shields.io/codeclimate/coverage/toy/image_optim?logo=codeclimate)](https://codeclimate.com/github/toy/image_optim)
+[![Depfu](https://img.shields.io/depfu/toy/image_optim)](https://depfu.com/github/toy/image_optim)
+[![Inch CI](https://inch-ci.org/github/toy/image_optim.svg?branch=master)](https://inch-ci.org/github/toy/image_optim)
 
 # image_optim
 
@@ -18,6 +18,7 @@ Command line tool and ruby interface to optimize (lossless compress, optionally
 * [jpeg-recompress](https://github.com/danielgtaylor/jpeg-archive#jpeg-recompress)
 * jpegtran from [Independent JPEG Group's JPEG library](http://www.ijg.org/)
 * [optipng](http://optipng.sourceforge.net/)
+* [oxipng](https://github.com/shssoichiro/oxipng)
 * [pngcrush](http://pmt.sourceforge.net/pngcrush/)
 * [pngout](http://www.advsys.net/ken/util/pngout.htm)
 * [pngquant](http://pngquant.org/)
@@ -60,7 +61,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.27'
+gem 'image_optim', '~> 0.31'
 ```
 <!---</update-version>-->
 
@@ -166,6 +167,14 @@ sudo port install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush png
 brew install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush pngquant jonof/kenutils/pngout
 ```
 
+### oxipng installation (optional)
+
+Unless it is available in your chosen package manager, can be installed using cargo:
+
+```bash
+cargo install oxipng
+```
+
 ### pngout installation (optional)
 
 If you installed the dependencies via brew, pngout should be installed already. Otherwise, you can install `pngout` by downloading and installing the [binary versions](http://www.jonof.id.au/kenutils).
@@ -291,6 +300,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`.
 
@@ -310,12 +320,13 @@ Worker has no options
 
 ### jpegoptim:
 * `:allow_lossy` — Allow limiting maximum quality *(defaults to `false`)*
-* `:strip` — List of extra markers to strip: `:comments`, `:exif`, `:iptc`, `:icc` or `:all` *(defaults to `:all`)*
+* `:strip` — List of markers to strip: `:com`, `:exif`, `:iptc`, `:icc`, `:xmp`, `:none` or `:all` *(defaults to `:all`)*
 * `:max_quality` — Maximum image quality factor `0`..`100`, ignored in default/lossless mode *(defaults to `100`)*
 
 ### jpegrecompress:
 * `:allow_lossy` — Allow worker, it is always lossy *(defaults to `false`)*
 * `:quality` — JPEG quality preset: `0` - low, `1` - medium, `2` - high, `3` - veryhigh *(defaults to `3`)*
+* `:method` — Comparison Metric: `mpe` - Mean pixel error, `ssim` - Structural similarity, `ms-ssim` - Multi-scale structural similarity (slow!), `smallfry` - Linear-weighted BBCQ-like (may be patented) *(defaults to ssim)*
 
 ### jpegtran:
 * `:copy_chunks` — Copy all chunks *(defaults to `false`)*
@@ -361,4 +372,4 @@ In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 
-Copyright (c) 2012-2020 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2012-2021 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

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,12 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.27.1'
-  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.version     = '0.31.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, oxipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
+  s.required_ruby_version = '>= 1.9.3'
+
   s.metadata = {
     'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
     'changelog_uri'     => "https://github.com/toy/#{s.name}/blob/master/CHANGELOG.markdown",
@@ -33,7 +35,8 @@ EOF
 
   s.add_development_dependency 'image_optim_pack', '~> 0.2', '>= 0.2.2'
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.2' && !Gem.win_platform? && !defined?(JRUBY_VERSION)
-    s.add_development_dependency 'rubocop', '~> 0.59', '!= 0.78.0'
+  if RUBY_VERSION >= '2.4' && !Gem.win_platform? && !defined?(JRUBY_VERSION)
+    s.add_development_dependency 'rubocop', '~> 1.0'
+    s.add_development_dependency 'rubocop-rspec', '~> 2.0'
   end
 end

data/lib/image_optim/bin_resolver/bin.rb

@@ -14,6 +14,7 @@ class ImageOptim
     # Holds bin name and path, gets version
     class Bin
       class UnknownVersion < Error; end
+
       class BadVersion < Error; end
 
       attr_reader :name, :path, :version
@@ -37,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
@@ -108,10 +109,10 @@ class ImageOptim
         case name
         when :advpng
           capture("#{escaped_path} --version 2> #{Path::NULL}")[/\bv(\d+(\.\d+)+|none)/, 1]
-        when :gifsicle, :jpegoptim, :optipng
+        when :gifsicle, :jpegoptim, :optipng, :oxipng
           capture("#{escaped_path} --version 2> #{Path::NULL}")[/\d+(\.\d+)+/]
         when :svgo, :pngquant
-          capture("#{escaped_path} --version 2>&1")[/\d+(\.\d+)+/]
+          capture("#{escaped_path} --version 2>&1")[/\A\d+(\.\d+)+/]
         when :jhead, :'jpeg-recompress'
           capture("#{escaped_path} -V 2> #{Path::NULL}")[/\d+(\.\d+)+/]
         when :jpegtran

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.to_f)
+            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

@@ -15,9 +15,7 @@ class ImageOptim
 
     # Global config path at `$XDG_CONFIG_HOME/image_optim.yml` (by default
     # `~/.config/image_optim.yml`)
-    GLOBAL_PATH = begin
-      File.join(ENV['XDG_CONFIG_HOME'] || '~/.config', 'image_optim.yml')
-    end
+    GLOBAL_PATH = File.join(ENV['XDG_CONFIG_HOME'] || '~/.config', 'image_optim.yml')
 
     # Local config path at `./.image_optim.yml`
     LOCAL_PATH = './.image_optim.yml'
@@ -119,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)
@@ -177,10 +183,10 @@ class ImageOptim
       when true, nil
         {}
       when false
-        {:disable => true}
+        {disable: true}
       else
         fail ConfigurationError, "Got #{worker_options.inspect} for "\
-            "#{klass.name} options"
+                                 "#{klass.name} options"
       end
     end
 
@@ -197,10 +203,10 @@ class ImageOptim
       when /darwin9/
         Cmd.capture 'hwprefs cpu_count'
       when /darwin/
-        if (Cmd.capture 'which hwprefs') != ''
-          Cmd.capture 'hwprefs thread_count'
-        else
+        if (Cmd.capture 'which hwprefs') == ''
           Cmd.capture 'sysctl -n hw.ncpu'
+        else
+          Cmd.capture 'hwprefs thread_count'
         end
       when /linux/
         Cmd.capture 'grep -c processor /proc/cpuinfo'

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/path.rb

@@ -41,7 +41,7 @@ class ImageOptim
       dst.utime(stat.atime, stat.mtime) if time
       begin
         dst.chown(stat.uid, stat.gid)
-      rescue Errno::EPERM
+      rescue Errno::EPERM, Errno::EACCES
         dst.chmod(stat.mode & 0o1777)
       else
         dst.chmod(stat.mode)