image_optim 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb8179d2e5c5236278611842ad5dbb3ab39fc1ff92bbd50ed9dae6ccd931bf5
-  data.tar.gz: 83ab00c10f205a164ea66f51b6964d3fb4fa7d019c30e472496a0e21879242c0
+  metadata.gz: e80e82d67e3434476f0bdf332b14b6369601010aaeef7ab7b901515d0c03565c
+  data.tar.gz: 16f304385c879cf1afc0073d7d037fb548d6c260f57e2b94cdcdd974f3cd4b4e
 SHA512:
-  metadata.gz: 901e787f11a9829b96dd40f0d8aff14d4f2ac691ff3eaa8486d2915fd020b2f6e0d7425b360cf3bdbc52018afd69508078b69dd4e7846a138d9d5e9ea3b613d7
-  data.tar.gz: 8a21b871165184221bf9af9b9647f144a21e5da1ebe03680ac54b09edf955068f0364da1ee0d6d8dd9976bb96c76ff0cdcf49cb005f43fd5c5cdfe3f51cde39f
+  metadata.gz: b0395980a804453e3273f779c1217d5dd5b9b7c522e74964070b43f2b3ac433f9f39d5f997a3e9c6594f22d244752910eea1697ac2e570de34e6b0641555b9e8
+  data.tar.gz: 9de0bebe89071d3aa7bd506b02dc684b53d998dcfccab1debad72bdc244e6fbae6eb0ac2d5871359fe2ffa5cb9e7c5ae8a7dc98829e00e8abef49c017ac3b00c

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/CHANGELOG.markdown

@@ -2,6 +2,11 @@
 
 ## 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)

data/CONTRIBUTING.markdown

@@ -11,4 +11,4 @@
 * 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/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.30'
+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).

data/image_optim.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  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.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'

data/lib/image_optim/bin_resolver/bin.rb

@@ -109,7 +109,7 @@ 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")[/\A\d+(\.\d+)+/]

data/lib/image_optim/cmd.rb

@@ -17,7 +17,7 @@ class ImageOptim
           pid = Process.spawn(*args)
 
           waiter = Process.detach(pid)
-          if waiter.join(timeout)
+          if waiter.join(timeout.to_f)
             status = waiter.value
 
             check_status!(status)

data/lib/image_optim/config.rb

@@ -186,7 +186,7 @@ class ImageOptim
         {disable: true}
       else
         fail ConfigurationError, "Got #{worker_options.inspect} for "\
-            "#{klass.name} options"
+                                 "#{klass.name} options"
       end
     end
 

data/lib/image_optim/runner/option_parser.rb

@@ -38,7 +38,7 @@ class ImageOptim
         columns = terminal_columns - 1
         # 1 for distance between summary and description
         # 2 for additional indent
-        wrapped_indent = summary_indent + ' ' * (summary_width + 1 + 2)
+        wrapped_indent = summary_indent + (' ' * (summary_width + 1 + 2))
         wrapped_width = columns - wrapped_indent.length
         # don't try to wrap if there is too little space for description
         return text if wrapped_width < 20
@@ -84,7 +84,7 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   ImageOptim::TrueFalseNil.add_to_option_parser(op)
   ImageOptim::NonNegativeIntegerRange.add_to_option_parser(op)
 
-  op.banner = <<-TEXT.gsub(/^\s*\|/, '')
+  op.banner = <<-TEXT.gsub(/^\s*\|/, '') # rubocop:disable Layout/DotPosition
     |#{ImageOptim.full_version}
     |
     |Usage:
@@ -97,29 +97,29 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   TEXT
 
   op.on('--config-paths PATH1,PATH2', Array, 'Config paths to use instead of '\
-      'default ones') do |paths|
+                                             'default ones') do |paths|
     options[:config_paths] = paths
   end
 
   op.separator nil
 
   op.on('-r', '-R', '--recursive', 'Recursively scan directories '\
-      'for images') do |recursive|
+                                   'for images') do |recursive|
     options[:recursive] = recursive
   end
 
   op.on("--exclude-dir 'GLOB'", 'Glob for excluding directories '\
-      '(defaults to .*)') do |glob|
+                                '(defaults to .*)') do |glob|
     options[:exclude_dir_glob] = glob
   end
 
   op.on("--exclude-file 'GLOB'", 'Glob for excluding files '\
-      '(defaults to .*)') do |glob|
+                                 '(defaults to .*)') do |glob|
     options[:exclude_file_glob] = glob
   end
 
   op.on("--exclude 'GLOB'", 'Set glob for excluding both directories and '\
-      'files') do |glob|
+                            'files') do |glob|
     options[:exclude_file_glob] = options[:exclude_dir_glob] = glob
   end
 
@@ -130,19 +130,19 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   end
 
   op.on('--[no-]threads N', Integer, 'Number of threads or disable '\
-      '(defaults to number of processors)') do |threads|
+                                     '(defaults to number of processors)') do |threads|
     options[:threads] = threads
   end
 
   op.on('--[no-]nice N', Integer, 'Nice level, priority of all used tools '\
-      'with higher value meaning lower priority, in range -20..19, negative '\
-      'values can be set only if run by root user (defaults to 10)') do |nice|
+                                  'with higher value meaning lower priority, in range -20..19, negative '\
+                                  'values can be set only if run by root user (defaults to 10)') do |nice|
     options[:nice] = nice
   end
 
   op.on('--[no-]pack', 'Require image_optim_pack or disable it, '\
-      'by default image_optim_pack will be used if available, '\
-      'will turn on skip-missing-workers unless explicitly disabled') do |pack|
+                       'by default image_optim_pack will be used if available, '\
+                       'will turn on skip-missing-workers unless explicitly disabled') do |pack|
     options[:pack] = pack
   end
 
@@ -150,12 +150,12 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator '  Caching:'
 
   op.on('--cache-dir DIR', 'Cache optimized images '\
-        'into the specified directory') do |cache_dir|
+                           'into the specified directory') do |cache_dir|
     options[:cache_dir] = cache_dir
   end
 
   op.on('--cache-worker-digests', 'Cache worker digests '\
-        '(updating workers invalidates cache)') do |cache_worker_digests|
+                                  '(updating workers invalidates cache)') do |cache_worker_digests|
     options[:cache_worker_digests] = cache_worker_digests
   end
 
@@ -163,7 +163,7 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator '  Disabling workers:'
 
   op.on('--[no-]skip-missing-workers', 'Skip workers with missing or '\
-      'problematic binaries') do |skip|
+                                       'problematic binaries') do |skip|
     options[:skip_missing_workers] = skip
   end
 
@@ -178,7 +178,7 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator '  Worker options:'
 
   op.on('--allow-lossy', 'Allow lossy workers and '\
-      'optimizations') do |allow_lossy|
+                         'optimizations') do |allow_lossy|
     options[:allow_lossy] = allow_lossy
   end
 
@@ -230,8 +230,8 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator '  Common options:'
 
   op.on_tail('-v', '--verbose', 'Verbose output (show global and worker '\
-      'config, binary resolution log, information about each tool invocation, '\
-      'backtrace of exception)') do
+                                'config, binary resolution log, information about each tool invocation, '\
+                                'backtrace of exception)') do
     options[:verbose] = true
   end
 

data/lib/image_optim/runner.rb

@@ -38,7 +38,7 @@ class ImageOptim
         if size_a == size_b
           "------ #{Space::EMPTY_SPACE}"
         else
-          percent = 100 - 100.0 * size_b / size_a
+          percent = 100 - (100.0 * size_b / size_a)
           space = Space.space(size_a - size_b)
           format('%5.2f%% %s', percent, space)
         end

data/lib/image_optim/worker/advpng.rb

@@ -9,11 +9,11 @@ class ImageOptim
     class Advpng < Worker
       LEVEL_OPTION =
       option(:level, 4, 'Compression level: '\
-          '`0` - don\'t compress, '\
-          '`1` - fast, '\
-          '`2` - normal, '\
-          '`3` - extra, '\
-          '`4` - extreme') do |v|
+                        '`0` - don\'t compress, '\
+                        '`1` - fast, '\
+                        '`2` - normal, '\
+                        '`3` - extra, '\
+                        '`4` - extreme') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..4)
       end
 

data/lib/image_optim/worker/gifsicle.rb

@@ -18,19 +18,19 @@ class ImageOptim
 
       INTERLACE_OPTION =
       option(:interlace, false, TrueFalseNil, 'Interlace: '\
-          '`true` - interlace on, '\
-          '`false` - interlace off, '\
-          '`nil` - as is in original image '\
-          '(defaults to running two instances, one with interlace off and '\
-          'one with on)') do |v|
+                                              '`true` - interlace on, '\
+                                              '`false` - interlace off, '\
+                                              '`nil` - as is in original image '\
+                                              '(defaults to running two instances, one with interlace off and '\
+                                              'one with on)') do |v|
         TrueFalseNil.convert(v)
       end
 
       LEVEL_OPTION =
       option(:level, 3, 'Compression level: '\
-          '`1` - light and fast, '\
-          '`2` - normal, '\
-          '`3` - heavy (slower)') do |v|
+                        '`1` - light and fast, '\
+                        '`2` - normal, '\
+                        '`3` - heavy (slower)') do |v|
         OptionHelpers.limit_with_range(v.to_i, 1..3)
       end
 

data/lib/image_optim/worker/jpegoptim.rb

@@ -12,13 +12,13 @@ class ImageOptim
 
       STRIP_OPTION =
       option(:strip, :all, Array, 'List of markers to strip: '\
-          '`:com`, '\
-          '`:exif`, '\
-          '`:iptc`, '\
-          '`:icc`, '\
-          '`:xmp`, '\
-          '`:none` or '\
-          '`:all`') do |v|
+                                  '`:com`, '\
+                                  '`:exif`, '\
+                                  '`:iptc`, '\
+                                  '`:icc`, '\
+                                  '`:xmp`, '\
+                                  '`:none` or '\
+                                  '`:all`') do |v|
         values = Array(v).map(&:to_s)
         known_values = %w[com exif iptc icc xmp none all]
         unknown_values = values - known_values
@@ -30,13 +30,13 @@ class ImageOptim
 
       MAX_QUALITY_OPTION =
       option(:max_quality, 100, 'Maximum image quality factor '\
-          '`0`..`100`, ignored in default/lossless mode') do |v, opt_def|
+                                '`0`..`100`, ignored in default/lossless mode') do |v, opt_def|
         if allow_lossy
           OptionHelpers.limit_with_range(v.to_i, 0..100)
         else
           if v != opt_def.default
             warn "#{self.class.bin_sym} #{opt_def.name} #{v} ignored " \
-                'in lossless mode'
+                 'in lossless mode'
           end
           opt_def.default
         end

data/lib/image_optim/worker/jpegrecompress.rb

@@ -28,10 +28,10 @@ class ImageOptim
 
       METHOD_OPTION =
       option(:method, 'ssim', 'Comparison Metric: '\
-          '`mpe` - Mean pixel error, '\
-          '`ssim` - Structural similarity, '\
-          '`ms-ssim` - Multi-scale structural similarity (slow!), '\
-          '`smallfry` - Linear-weighted BBCQ-like (may be patented)') do |v, opt_def|
+                              '`mpe` - Mean pixel error, '\
+                              '`ssim` - Structural similarity, '\
+                              '`ms-ssim` - Multi-scale structural similarity (slow!), '\
+                              '`smallfry` - Linear-weighted BBCQ-like (may be patented)') do |v, opt_def|
         if %w[mpe ssim ms-ssim smallfry].include? v
           v
         else

data/lib/image_optim/worker/jpegtran.rb

@@ -17,7 +17,7 @@ class ImageOptim
 
       JPEGRESCAN_OPTION =
       option(:jpegrescan, true, 'Use jpegtran through jpegrescan, '\
-          'ignore progressive option'){ |v| !!v }
+                                'ignore progressive option'){ |v| !!v }
 
       def used_bins
         jpegrescan ? [:jpegtran, :jpegrescan] : [:jpegtran]

data/lib/image_optim/worker/optipng.rb

@@ -10,16 +10,16 @@ class ImageOptim
     class Optipng < Worker
       LEVEL_OPTION =
       option(:level, 6, 'Optimization level preset: '\
-          '`0` is least, '\
-          '`7` is best') do |v|
+                        '`0` is least, '\
+                        '`7` is best') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..7)
       end
 
       INTERLACE_OPTION =
       option(:interlace, false, TrueFalseNil, 'Interlace: '\
-          '`true` - interlace on, '\
-          '`false` - interlace off, '\
-          '`nil` - as is in original image') do |v|
+                                              '`true` - interlace on, '\
+                                              '`false` - interlace off, '\
+                                              '`nil` - as is in original image') do |v|
         TrueFalseNil.convert(v)
       end
 

data/lib/image_optim/worker/oxipng.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'image_optim/worker'
+require 'image_optim/option_helpers'
+require 'image_optim/true_false_nil'
+
+class ImageOptim
+  class Worker
+    # https://github.com/shssoichiro/oxipng
+    class Oxipng < Worker
+      LEVEL_OPTION =
+      option(:level, 3, 'Optimization level preset: '\
+                        '`0` is least, '\
+                        '`6` is best') do |v|
+        OptionHelpers.limit_with_range(v.to_i, 0..6)
+      end
+
+      INTERLACE_OPTION =
+      option(:interlace, false, TrueFalseNil, 'Interlace: '\
+                                              '`true` - interlace on, '\
+                                              '`false` - interlace off, '\
+                                              '`nil` - as is in original image') do |v|
+        TrueFalseNil.convert(v)
+      end
+
+      STRIP_OPTION =
+      option(:strip, true, 'Remove all auxiliary chunks'){ |v| !!v }
+
+      def run_order
+        -4
+      end
+
+      def optimize(src, dst, options = {})
+        src.copy(dst)
+        args = %W[
+          -o #{level}
+          --quiet
+          --
+          #{dst}
+        ]
+        args.unshift "-i#{interlace ? 1 : 0}" unless interlace.nil?
+        if strip
+          args.unshift '--strip', 'all'
+        end
+        execute(:oxipng, args, options) && optimized?(src, dst)
+      end
+
+      def optimized?(src, dst)
+        interlace ? dst.size? : super
+      end
+    end
+  end
+end

data/lib/image_optim/worker/pngcrush.rb

@@ -8,18 +8,18 @@ class ImageOptim
     class Pngcrush < Worker
       CHUNKS_OPTION =
       option(:chunks, :alla, Array, 'List of chunks to remove or '\
-          '`:alla` - all except tRNS/transparency or '\
-          '`:allb` - all except tRNS and gAMA/gamma') do |v|
+                                    '`:alla` - all except tRNS/transparency or '\
+                                    '`:allb` - all except tRNS and gAMA/gamma') do |v|
         Array(v).map(&:to_s)
       end
 
       FIX_OPTION =
       option(:fix, false, 'Fix otherwise fatal conditions '\
-          'such as bad CRCs'){ |v| !!v }
+                          'such as bad CRCs'){ |v| !!v }
 
       BRUTE_OPTION =
       option(:brute, false, 'Brute force try all methods, '\
-          'very time-consuming and generally not worthwhile'){ |v| !!v }
+                            'very time-consuming and generally not worthwhile'){ |v| !!v }
 
       BLACKEN_OPTION =
       option(:blacken, true, 'Blacken fully transparent pixels'){ |v| !!v }

data/lib/image_optim/worker/pngout.rb

@@ -12,11 +12,11 @@ class ImageOptim
 
       STRATEGY_OPTION =
       option(:strategy, 0, 'Strategy: '\
-          '`0` - xtreme, '\
-          '`1` - intense, '\
-          '`2` - longest Match, '\
-          '`3` - huffman Only, '\
-          '`4` - uncompressed') do |v|
+                           '`0` - xtreme, '\
+                           '`1` - intense, '\
+                           '`2` - longest Match, '\
+                           '`3` - huffman Only, '\
+                           '`4` - uncompressed') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..4)
       end
 

data/lib/image_optim/worker/pngquant.rb

@@ -19,9 +19,9 @@ class ImageOptim
       QUALITY_OPTION =
       option(:quality, '`100..100`, `0..100` in lossy mode',
              NonNegativeIntegerRange, 'min..max - don\'t '\
-         'save below min, use less colors below max (both in range `0..100`; '\
-         'in yaml - `!ruby/range 0..100`), ignored in default/lossless '\
-         'mode') do |v, opt_def|
+                                      'save below min, use less colors below max (both in range `0..100`; '\
+                                      'in yaml - `!ruby/range 0..100`), ignored in default/lossless '\
+                                      'mode') do |v, opt_def|
         if allow_lossy
           if v == opt_def.default
             0..100
@@ -32,7 +32,7 @@ class ImageOptim
         else
           if v != opt_def.default
             warn "#{self.class.bin_sym} #{opt_def.name} #{v} ignored " \
-                'in lossless mode'
+                 'in lossless mode'
           end
           100..100
         end
@@ -40,9 +40,9 @@ class ImageOptim
 
       SPEED_OPTION =
       option(:speed, 3, 'speed/quality trade-off: '\
-          '`1` - slow, '\
-          '`3` - default, '\
-          '`11` - fast & rough') do |v|
+                        '`1` - slow, '\
+                        '`3` - default, '\
+                        '`11` - fast & rough') do |v|
         OptionHelpers.limit_with_range(v.to_i, 1..11)
       end
 

data/lib/image_optim/worker.rb

@@ -105,7 +105,7 @@ class ImageOptim
       return if unknown_options.empty?
 
       fail ConfigurationError, "unknown options #{unknown_options.inspect} "\
-          "for #{self}"
+                               "for #{self}"
     end
 
     # Forward bin resolving to image_optim
@@ -118,8 +118,8 @@ class ImageOptim
     def wrap_resolver_error_message(message)
       name = self.class.bin_sym
       "#{name} worker: #{message}; please provide proper binary or "\
-          "disable this worker (--no-#{name} argument or "\
-          "`:#{name} => false` through options)"
+        "disable this worker (--no-#{name} argument or "\
+        "`:#{name} => false` through options)"
     end
 
     # Run command setting priority and hiding output

data/lib/image_optim.rb

@@ -14,7 +14,7 @@ require 'in_threads'
 require 'shellwords'
 
 %w[
-  pngcrush pngout advpng optipng pngquant
+  pngcrush pngout advpng optipng pngquant oxipng
   jhead jpegoptim jpegrecompress jpegtran
   gifsicle
   svgo

data/script/update_worker_options_in_readme

@@ -29,7 +29,7 @@ end
 def write_marked(io)
   io.puts BEGIN_MARKER
   io.puts '<!-- markdown for worker options is generated by '\
-    "`#{Pathname($PROGRAM_NAME).cleanpath}` -->"
+          "`#{Pathname($PROGRAM_NAME).cleanpath}` -->"
   io.puts
 
   ImageOptim::Worker.klasses.sort_by(&:name).each do |klass|

data/spec/image_optim/cache_path_spec.rb

@@ -42,13 +42,14 @@ describe ImageOptim::CachePath do
       end
 
       it 'does not preserve mtime of destination file' do
-        time = src.mtime
+        time = src.mtime - 1000
+        dst.utime(time, time)
 
-        dst.utime(time - 1000, time - 1000)
+        time = dst.mtime
 
         src.replace(dst)
 
-        expect(dst.mtime).to be >= time
+        expect(dst.mtime).to_not eq(time)
       end
 
       it 'changes inode of destination', skip: SkipConditions[:inodes_support] do

data/spec/image_optim/cmd_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require 'image_optim/cmd'
+require 'image_optim/timer'
 
 describe ImageOptim::Cmd do
   before do
@@ -48,6 +49,11 @@ describe ImageOptim::Cmd do
         expect(Cmd.run('sh -c "exit 66"', timeout: 1)).to eq(false)
       end
 
+      it 'returns process success status when timeout is instance of ImageOptim::Timer' do
+        timeout = ImageOptim::Timer.new(1.0)
+        expect(Cmd.run('sh -c "exit 0"', timeout: timeout)).to eq(true)
+      end
+
       it 'raises SignalException if process terminates after signal', skip: SkipConditions[:signals_support] do
         expect_int_exception do
           Cmd.run('kill -s INT $$', timeout: 1)

data/spec/image_optim/handler_spec.rb

@@ -9,7 +9,7 @@ describe ImageOptim::Handler do
   end
 
   it 'uses original as source for first conversion '\
-      'and two temp files for further conversions' do
+     'and two temp files for further conversions' do
     original = double(:original)
     allow(original).to receive(:respond_to?).with(:temp_path).and_return(true)
 

data/spec/image_optim/path_spec.rb

@@ -86,13 +86,14 @@ describe ImageOptim::Path do
       end
 
       it 'does not preserve mtime of destination file' do
-        time = src.mtime
+        time = src.mtime - 1000
+        dst.utime(time, time)
 
-        dst.utime(time - 1000, time - 1000)
+        time = dst.mtime
 
         src.replace(dst)
 
-        expect(dst.mtime).to be >= time
+        expect(dst.mtime).to_not eq(time)
       end
 
       it 'changes inode of destination', skip: SkipConditions[:inodes_support] do

data/spec/image_optim/worker/oxipng_spec.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'image_optim/worker/oxipng'
+require 'image_optim/path'
+
+describe ImageOptim::Worker::Oxipng do
+  describe 'strip option' do
+    subject{ described_class.new(ImageOptim.new, options) }
+
+    let(:options){ {} }
+    let(:src){ instance_double(ImageOptim::Path, copy: nil) }
+    let(:dst){ instance_double(ImageOptim::Path) }
+
+    before do
+      oxipng_bin = instance_double(ImageOptim::BinResolver::Bin)
+      allow(subject).to receive(:resolve_bin!).
+        with(:oxipng).and_return(oxipng_bin)
+
+      allow(subject).to receive(:optimized?)
+    end
+
+    context 'by default' do
+      it 'should add --strip all to arguments' do
+        expect(subject).to receive(:execute) do |_bin, *args|
+          expect(args.join(' ')).to match(/(^| )--strip all($| )/)
+        end
+
+        subject.optimize(src, dst)
+      end
+    end
+
+    context 'when strip is disabled' do
+      let(:options){ {strip: false} }
+
+      it 'should not add --strip all to arguments' do
+        expect(subject).to receive(:execute) do |_bin, *args|
+          expect(args.join(' ')).not_to match(/(^| )--strip all($| )/)
+        end
+
+        subject.optimize(src, dst)
+      end
+    end
+  end
+
+  describe '#optimized?' do
+    let(:src){ instance_double(ImageOptim::Path, src_options) }
+    let(:dst){ instance_double(ImageOptim::Path, dst_options) }
+    let(:src_options){ {size: 10} }
+    let(:dst_options){ {size?: 9} }
+    let(:instance){ described_class.new(ImageOptim.new, instance_options) }
+    let(:instance_options){ {} }
+
+    subject{ instance.optimized?(src, dst) }
+
+    context 'when interlace option is enabled' do
+      let(:instance_options){ {interlace: true} }
+
+      context 'when dst is empty' do
+        let(:dst_options){ {size?: nil} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is not empty' do
+        let(:dst_options){ {size?: 20} }
+        it{ is_expected.to be_truthy }
+      end
+    end
+
+    context 'when interlace option is disabled' do
+      let(:instance_options){ {interlace: false} }
+
+      context 'when dst is empty' do
+        let(:dst_options){ {size?: nil} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is greater than or equal to src' do
+        let(:dst_options){ {size?: 10} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is less than src' do
+        let(:dst_options){ {size?: 9} }
+        it{ is_expected.to be_truthy }
+      end
+    end
+  end
+end

data/spec/image_optim_spec.rb

@@ -253,7 +253,7 @@ describe ImageOptim do
 
       describe 'given block' do
         it 'optimizes images, yields path and result for each and '\
-            'returns array of yield results' do
+           'returns array of yield results' do
           image_optim = ImageOptim.new
           results = test_images.map do |src|
             dst = double

data/spec/images/invisiblepixels/generate

@@ -17,7 +17,7 @@ IO.popen(%W[
 ].shelljoin, 'w') do |f|
   side.times do |a|
     side.times do |b|
-      alpha = [0, 1, 0x7f, 0xff][(a / 8 + b / 8) % 4]
+      alpha = [0, 1, 0x7f, 0xff][((a / 8) + (b / 8)) % 4]
       f << [rand(256), rand(256), rand(256), alpha].pack('C*')
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if ENV['CODECLIMATE']
+if ENV['CC_TEST_REPORTER_ID']
   require 'simplecov'
   SimpleCov.start
 end
@@ -71,7 +71,7 @@ RSpec::Matchers.define :be_similar_to do |expected, max_difference|
   end
   failure_message do |actual|
     "expected #{actual} to have at most #{max_difference} difference from "\
-        "#{expected}, got normalized root-mean-square error of #{@diff}"
+      "#{expected}, got normalized root-mean-square error of #{@diff}"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -168,10 +168,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".appveyor.yml"
+- ".github/workflows/check.yml"
 - ".gitignore"
 - ".pre-commit-hooks.yaml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.markdown
 - CONTRIBUTING.markdown
 - Gemfile
@@ -216,6 +216,7 @@ files:
 - lib/image_optim/worker/jpegrecompress.rb
 - lib/image_optim/worker/jpegtran.rb
 - lib/image_optim/worker/optipng.rb
+- lib/image_optim/worker/oxipng.rb
 - lib/image_optim/worker/pngcrush.rb
 - lib/image_optim/worker/pngout.rb
 - lib/image_optim/worker/pngquant.rb
@@ -246,6 +247,7 @@ files:
 - spec/image_optim/timer_spec.rb
 - spec/image_optim/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
+- spec/image_optim/worker/oxipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb
@@ -284,7 +286,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim/issues
   changelog_uri: https://github.com/toy/image_optim/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.30.0
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.31.0
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem
@@ -303,13 +305,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: 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)
+  jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, oxipng, pngcrush,
+  pngout, pngquant, svgo)
 test_files:
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
 - spec/image_optim/bin_resolver/simple_version_spec.rb
@@ -332,6 +334,7 @@ test_files:
 - spec/image_optim/timer_spec.rb
 - spec/image_optim/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
+- spec/image_optim/worker/oxipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb

data/.travis.yml

@@ -1,48 +0,0 @@
-dist: xenial
-language: ruby
-cache:
-  bundler: true
-  directories:
-    - $(npm root)
-    - ~/bin
-rvm:
-  - '1.9.3-p551'
-  - '2.0.0-p648'
-  - '2.1.10'
-  - '2.2.10'
-  - '2.3.8'
-  - '2.4.10'
-  - '2.5.9'
-  - '2.6.7'
-  - '2.7.3'
-  - '3.0.1'
-  - 'jruby-9.2.14.0'
-script:
-  - bundle exec image_optim --info
-  - bundle exec rspec
-before_install:
-  - 'echo "gem: --no-ri --no-rdoc --no-document" > ~/.gemrc'
-  - gem install rubygems-update || gem install rubygems-update --version '< 3'
-  - update_rubygems
-  - gem install bundler || gem install bundler --version '< 2'
-  - nvm install stable
-  - command -v svgo || npm install -g svgo
-  - mkdir -p ~/bin
-  - command -v pngout || curl -L "https://www.jonof.id.au/files/kenutils/pngout-20200115-linux.tar.gz" | tar -xz -C ~/bin --strip-components 2 --wildcards '*/amd64/pngout'
-matrix:
-  include:
-    - env: CODECLIMATE=1
-      rvm: '2.4.10'
-      after_success: bundle exec codeclimate-test-reporter
-    - env: RUBOCOP=1
-      rvm: '2.4.10'
-      script: bundle exec rubocop
-      before_install: gem update --system && gem install bundler
-    - env: CHECK_RUBIES=1
-      rvm: '2.4.10'
-      script: bundle exec travis_check_rubies
-      before_install: gem update --system && gem install bundler
-addons:
-  code_climate:
-    repo_token:
-      secure: FDikT3JnOJHOAFSaKwVPB1VOphU0sSzAnzQ+YjSt9XFE+9uFQHth/j4rFoVoqALhCj+47trv6spwkbcSjGCVzm+87OI80GkLCCzNjDOz2W4sP9JWItVgS1VoWW+ioPxpLgpguTb3wutwKOUMEAf+40EX657ZiHumM7nNHrF+RCU=