image_optim 0.26.4 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00401e7aa20de4af81903c0c1ddac9d9cbb9eda7d17377f1fdf69dbe3280e346
-  data.tar.gz: 748fcdbedccbb2bb67082c1fd97b678a9aa1c383d1d91f9089a9a3f84ff1eb3e
+  metadata.gz: 9035f1f635ab728b4622dc5e99d2f5e9f96eab86ea35038c4037587fd3ca90d7
+  data.tar.gz: d24f6305c1461483d9a67a9338c4e9385ef9282070aecdc53cf0b79e7bffb5ed
 SHA512:
-  metadata.gz: 33e4f3be57b23b3752b6992f50b6e8400c43f3273b404c9fe390107ccab85d947e4c69687f12d5e361df6f439568c7233eafa03bd3b7a6d329b068326b16476f
-  data.tar.gz: 19b8dd22e717e0cd06bf32b11fd4a048f6a1543299bb741980ec7c2e06c35b087b1f142570afb07e1471b33aeef5d041a77c4f2b3488e808a848b45673278ed7
+  metadata.gz: 3501154596158ee61209215d7c3a4df1b82d7384d8b54248a16992e5897701eb1e1c10bca9bbbe92312f728e403544dfa6f0dd3c3dfc33918026497550f72ef4
+  data.tar.gz: 72ef8a7dacc6a7cc8850d996a716a5df2098cbe47e91f58a051e95664a83494346c0daa03f61384f4bd0c6674a65e4c383ac931863ef31ffed2cc6a8d57ef4a3

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

@@ -2,6 +2,7 @@ AllCops:
   Exclude:
     - '*.gemspec'
     - 'vendor/**/*'
+  NewCops: enable
 
 Bundler/OrderedGems:
   Enabled: false
@@ -9,6 +10,9 @@ Bundler/OrderedGems:
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Layout/AssignmentIndentation:
+  Enabled: false
+
 Layout/CaseIndentation:
   EnforcedStyle: end
 
@@ -18,18 +22,18 @@ Layout/DotPosition:
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentAssignment:
-  Enabled: false
-
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
+Layout/LineLength:
+  Max: 120
+
 Layout/RescueEnsureAlignment:
   Enabled: false
 
@@ -47,10 +51,10 @@ Lint/AmbiguousBlockAssociation:
 Lint/NestedPercentLiteral:
   Enabled: false
 
-Lint/UnneededRequireStatement:
+Lint/RedundantRequireStatement:
   Enabled: false
 
-Lint/UnneededSplatExpansion:
+Lint/RedundantSplatExpansion:
   Enabled: false
 
 Metrics/AbcSize:
@@ -68,19 +72,19 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 11
 
-Metrics/LineLength:
-  Max: 120
-
 Metrics/MethodLength:
   Max: 25
 
 Metrics/PerceivedComplexity:
-  Max: 8
+  Max: 10
 
 Security/MarshalLoad:
   Exclude:
     - 'script/worker_analysis'
 
+Style/AccessorGrouping:
+  Enabled: false
+
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
@@ -99,15 +103,30 @@ Style/ExpandPathArguments:
 Style/FormatStringToken:
   Enabled: false
 
+Style/HashConversion:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: true
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false
 
 Style/NumericPredicate:
   EnforcedStyle: comparison
 
+Style/OptionalBooleanParameter:
+  Enabled: false
+
 Style/ParallelAssignment:
   Enabled: false
 

data/.travis.yml

@@ -1,4 +1,4 @@
-sudo: false
+dist: xenial
 language: ruby
 cache:
   bundler: true
@@ -6,38 +6,40 @@ cache:
     - $(npm root)
     - ~/bin
 rvm:
-  - '1.8.7-p371'
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'
   - '2.2.10'
   - '2.3.8'
-  - '2.4.6'
-  - '2.5.5'
-  - '2.6.3'
-  - 'jruby-9.1.9.0'
+  - '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'
-  - gem update --system
+  - update_rubygems
   - gem install bundler || gem install bundler --version '< 2'
   - nvm install stable
-  - mkdir -p ~/bin
   - command -v svgo || npm install -g svgo
-  - command -v pngout || curl -L "http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz" | tar -xz -C ~/bin --strip-components 2 --wildcards '*/x86_64/pngout'
+  - 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=✓
-      rvm: '2.4.6'
+    - env: CODECLIMATE=1
+      rvm: '2.4.10'
       after_success: bundle exec codeclimate-test-reporter
-    - env: RUBOCOP=✓
-      rvm: '2.4.6'
+    - env: RUBOCOP=1
+      rvm: '2.4.10'
       script: bundle exec rubocop
       before_install: gem update --system && gem install bundler
-    - env: CHECK_RUBIES=✓
-      rvm: '2.4.6'
+    - env: CHECK_RUBIES=1
+      rvm: '2.4.10'
       script: bundle exec travis_check_rubies
       before_install: gem update --system && gem install bundler
 addons:

data/CHANGELOG.markdown

@@ -2,6 +2,32 @@
 
 ## unreleased
 
+## 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)
+
+## v0.27.0 (2020-08-27)
+
+* Use `.tmp` as the extension for temporary file if it needs to be created for atomic replacement [#178](https://github.com/toy/image_optim/issues/178) [@toy](https://github.com/toy)
+* Don't create a temporary file in destination directory for atomic replacement if temporary directory is on same device as destination [#178](https://github.com/toy/image_optim/issues/178) [@toy](https://github.com/toy)
+
+## v0.26.5 (2019-07-14)
+
+* Remove deprecated `rubyforge_project` attribute from gemspec [rubygems/rubygems#2436](https://github.com/rubygems/rubygems/pull/2436) [@toy](https://github.com/toy)
+
 ## v0.26.4 (2019-05-23)
 
 * Enable frozen string literals [@toy](https://github.com/toy)

data/CONTRIBUTING.markdown

@@ -2,7 +2,10 @@
 
 * 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

data/Gemfile

@@ -15,5 +15,3 @@ end
 if ENV['CHECK_RUBIES']
   gem 'travis_check_rubies', '~> 0.2'
 end
-
-gem 'rspec-expectations', '!= 3.8.3' # https://github.com/rspec/rspec-expectations/issues/1113

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2019 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

@@ -60,7 +60,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.26'
+gem 'image_optim', '~> 0.29'
 ```
 <!---</update-version>-->
 
@@ -277,6 +277,10 @@ optipng:
   level: 5
 ```
 
+### Temporary directory
+
+`image_optim` uses standard ruby library for creating temporary files. Temporary directory can be changed using one of `TMPDIR`, `TMP` or `TEMP` environment variables.
+
 ## Options
 
 * `:nice` — 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`)*
@@ -306,12 +310,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`)*
@@ -357,4 +362,4 @@ In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 
-Copyright (c) 2012-2019 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2012-2021 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/image_optim.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.26.4'
+  s.version     = '0.29.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    = "http://github.com/toy/#{s.name}"
+  s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
-  s.rubyforge_project = s.name
+  s.required_ruby_version = '>= 1.9.3'
 
   s.metadata = {
     'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
@@ -35,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'
+  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.rb

@@ -188,12 +188,6 @@ class ImageOptim
       optimize_image_method?(method) || super
     end
 
-    if RUBY_VERSION < '1.9'
-      def respond_to?(method, include_private = false)
-        optimize_image_method?(method) || super
-      end
-    end
-
     # Version of image_optim gem spec loaded
     def version
       Gem.loaded_specs['image_optim'].version.to_s

data/lib/image_optim/bin_resolver/bin.rb

@@ -14,9 +14,11 @@ class ImageOptim
     # Holds bin name and path, gets version
     class Bin
       class UnknownVersion < Error; end
+
       class BadVersion < Error; end
 
       attr_reader :name, :path, :version
+
       def initialize(name, path)
         @name = name.to_sym
         @path = path.to_s
@@ -110,7 +112,7 @@ class ImageOptim
         when :gifsicle, :jpegoptim, :optipng
           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/bin_resolver/comparable_condition.rb

@@ -26,6 +26,7 @@ class ImageOptim
       end
 
       attr_reader :method, :args
+
       def initialize(method, *args)
         @method, @args = method.to_sym, args
 

data/lib/image_optim/cache_path.rb

@@ -7,8 +7,25 @@ class ImageOptim
   class CachePath < Path
     # Atomic replace dst with self
     def replace(dst)
-      dst = self.class.new(dst)
-      dst.temp_path(dst.dirname) do |temp|
+      dst = self.class.convert(dst)
+      tmpdir = [dirname, Path.new(Dir.tmpdir)].find do |dir|
+        dir.same_dev?(dst.dirname)
+      end
+      if tmpdir
+        begin
+          replace_using_tmp_file(dst, tmpdir)
+        rescue Errno::EXDEV
+          replace_using_tmp_file(dst, dst.dirname)
+        end
+      else
+        replace_using_tmp_file(dst, dst.dirname)
+      end
+    end
+
+  private
+
+    def replace_using_tmp_file(dst, tmpdir)
+      dst.temp_path_with_tmp_ext(tmpdir) do |temp|
         copy(temp)
         dst.copy_metadata(temp)
         temp.rename(dst.to_s)

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'
@@ -197,10 +195,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/optimized_path.rb

@@ -7,7 +7,7 @@ class ImageOptim
   class OptimizedPath < DelegateClass(Path)
     def initialize(path, original_or_size = nil)
       path = Path.convert(path)
-      __setobj__(path)
+      super(path)
       if original_or_size.is_a?(Integer)
         @original = path
         @original_size = original_or_size

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)
@@ -50,11 +50,16 @@ class ImageOptim
 
     # Atomic replace dst with self
     def replace(dst)
-      dst = self.class.new(dst)
-      dst.temp_path(dst.dirname) do |temp|
-        move(temp)
-        dst.copy_metadata(temp)
-        temp.rename(dst.to_s)
+      dst = self.class.convert(dst)
+      if same_dev?(dst.dirname)
+        dst.copy_metadata(self)
+        begin
+          rename(dst.to_s)
+        rescue Errno::EXDEV
+          replace_using_tmp_file(dst)
+        end
+      else
+        replace_using_tmp_file(dst)
       end
     end
 
@@ -68,5 +73,23 @@ class ImageOptim
     def self.convert(path)
       path.is_a?(self) ? path : new(path)
     end
+
+  protected
+
+    def same_dev?(other)
+      stat.dev == other.stat.dev
+    end
+
+    def replace_using_tmp_file(dst)
+      dst.temp_path_with_tmp_ext(dst.dirname) do |temp|
+        move(temp)
+        dst.copy_metadata(temp)
+        temp.rename(dst.to_s)
+      end
+    end
+
+    def temp_path_with_tmp_ext(*args, &block)
+      self.class.temp_file_path([basename.to_s, '.tmp'], *args, &block)
+    end
   end
 end

data/lib/image_optim/runner/option_parser.rb

@@ -202,6 +202,8 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
         [Integer, 'N']
       when Array >= type
         [Array, 'a,b,c']
+      when String >= type
+        [String, 'S']
       when ImageOptim::NonNegativeIntegerRange == type
         [type, 'M-N']
       else

data/lib/image_optim/worker.rb

@@ -142,21 +142,12 @@ class ImageOptim
     # Run command defining environment, setting nice level, removing output and
     # reraising signal exception
     def run_command(cmd_args)
-      args = if RUBY_VERSION < '1.9' || defined?(JRUBY_VERSION)
-        %W[
-          env PATH=#{@image_optim.env_path.shellescape}
-          nice -n #{@image_optim.nice}
-          #{cmd_args.shelljoin}
-          > #{Path::NULL} 2>&1
-        ].join(' ')
-      else
-        [
-          {'PATH' => @image_optim.env_path},
-          %W[nice -n #{@image_optim.nice}],
-          cmd_args,
-          {:out => Path::NULL, :err => Path::NULL},
-        ].flatten
-      end
+      args = [
+        {'PATH' => @image_optim.env_path},
+        *%W[nice -n #{@image_optim.nice}],
+        *cmd_args,
+        {:out => Path::NULL, :err => Path::NULL},
+      ]
       Cmd.run(*args)
     end
   end

data/lib/image_optim/worker/class_methods.rb

@@ -18,6 +18,7 @@ class ImageOptim
 
       # Remember all classes inheriting from this one
       def inherited(base)
+        super
         @klasses << base
       end
 
@@ -36,6 +37,7 @@ class ImageOptim
 
       def option(name, default, type, description = nil, &proc)
         attr_reader name
+
         OptionDefinition.new(name, default, type, description, &proc).
           tap{ |option_definition| option_definitions << option_definition }
       end

data/lib/image_optim/worker/jpegoptim.rb

@@ -11,14 +11,16 @@ class ImageOptim
       option(:allow_lossy, false, 'Allow limiting maximum quality'){ |v| !!v }
 
       STRIP_OPTION =
-      option(:strip, :all, Array, 'List of extra markers to strip: '\
-          '`:comments`, '\
+      option(:strip, :all, Array, 'List of markers to strip: '\
+          '`:com`, '\
           '`:exif`, '\
           '`:iptc`, '\
-          '`:icc` or '\
+          '`:icc`, '\
+          '`:xmp`, '\
+          '`:none` or '\
           '`:all`') do |v|
         values = Array(v).map(&:to_s)
-        known_values = %w[all comments exif iptc icc]
+        known_values = %w[com exif iptc icc xmp none all]
         unknown_values = values - known_values
         unless unknown_values.empty?
           warn "Unknown markers for jpegoptim: #{unknown_values.join(', ')}"

data/lib/image_optim/worker/jpegrecompress.rb

@@ -26,6 +26,20 @@ class ImageOptim
         OptionHelpers.limit_with_range(v.to_i, 0...QUALITY_NAMES.length)
       end
 
+      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|
+        if %w[mpe ssim ms-ssim smallfry].include? v
+          v
+        else
+          warn "Unknown method for jpegrecompress: #{v}"
+          opt_def.default
+        end
+      end
+
       def used_bins
         [:'jpeg-recompress']
       end
@@ -38,6 +52,7 @@ class ImageOptim
       def optimize(src, dst)
         args = %W[
           --quality #{QUALITY_NAMES[quality]}
+          --method #{method}
           --no-copy
           #{src}
           #{dst}

data/lib/image_optim/worker/optipng.rb

@@ -39,8 +39,8 @@ class ImageOptim
           #{dst}
         ]
         args.unshift "-i#{interlace ? 1 : 0}" unless interlace.nil?
-        if resolve_bin!(:optipng).version >= '0.7'
-          args.unshift '-strip', 'all' if strip
+        if strip && resolve_bin!(:optipng).version >= '0.7'
+          args.unshift '-strip', 'all'
         end
         execute(:optipng, *args) && optimized?(src, dst)
       end

data/lib/image_optim/worker/pngcrush.rb

@@ -39,8 +39,8 @@ class ImageOptim
         end
         flags.push '-fix' if fix
         flags.push '-brute' if brute
-        if resolve_bin!(:pngcrush).version >= '1.7.38'
-          flags.push '-blacken' if blacken
+        if blacken && resolve_bin!(:pngcrush).version >= '1.7.38'
+          flags.push '-blacken'
         end
 
         args = flags + %W[

data/lib/image_optim/worker/pngquant.rb

@@ -55,6 +55,7 @@ class ImageOptim
           --quality=#{quality.begin}-#{quality.end}
           --speed=#{speed}
           --output=#{dst}
+          --skip-if-larger
           --force
           #{max_colors}
           --

data/script/update_worker_options_in_readme

@@ -18,7 +18,7 @@ def write_worker_options(io, klass)
     klass.option_definitions.each do |option_definition|
       line = "* `:#{option_definition.name}` — #{option_definition.description}"
       unless line['(defaults']
-        line << " *(defaults to #{option_definition.default_description})*"
+        line += " *(defaults to #{option_definition.default_description})*"
       end
       io.puts line
     end

data/script/worker_analysis

@@ -137,13 +137,14 @@ class Analyser
   # Delegate to worker with short id
   class WorkerVariant < DelegateClass(ImageOptim::Worker)
     attr_reader :name, :id, :cons_id, :required
+
     def initialize(klass, image_optim, options)
       @required = options.delete(:required)
       @run_order = options.delete(:run_order)
       allow_consecutive_on = Array(options.delete(:allow_consecutive_on))
       @image_optim = image_optim
       @name = klass.bin_sym.to_s + options_string(options)
-      __setobj__(klass.new(image_optim, options))
+      super(klass.new(image_optim, options))
       @id = klass.bin_sym.to_s + options_string(self.options)
       @cons_id = [klass, allow_consecutive_on.map{ |key| [key, send(key)] }]
     end
@@ -357,20 +358,18 @@ class Analyser
     end
 
     def flatten_animation(image)
-      run_cache[:flatten][image.digest] ||= begin
-        if image.image_format == :gif
-          flattened = image.temp_path
-          Cmd.run(*%W[
-            convert
-            #{image.image_format}:#{image}
-            -coalesce
-            -append
-            #{image.image_format}:#{flattened}
-          ]) || fail("failed flattening of #{image}")
-          flattened
-        else
-          image
-        end
+      run_cache[:flatten][image.digest] ||= if image.image_format == :gif
+        flattened = image.temp_path
+        Cmd.run(*%W[
+          convert
+          #{image.image_format}:#{image}
+          -coalesce
+          -append
+          #{image.image_format}:#{flattened}
+        ]) || fail("failed flattening of #{image}")
+        flattened
+      else
+        image
       end
     end
 
@@ -452,6 +451,7 @@ class Analyser
       attr_reader :name
       attr_reader :success_count
       attr_reader :time, :avg_time
+
       def initialize(name, steps)
         @name = name
         @success_count = steps.count(&:success)
@@ -465,6 +465,7 @@ class Analyser
     end
 
     attr_reader :name, :results, :ids2names
+
     def initialize(name, results, ids2names)
       @name = name.to_s
       @results = results

data/spec/image_optim/cache_path_spec.rb

@@ -8,52 +8,95 @@ describe ImageOptim::CachePath do
   include CapabilityCheckHelpers
 
   before do
+    stub_const('Path', ImageOptim::Path)
     stub_const('CachePath', ImageOptim::CachePath)
   end
 
   describe '#replace' do
-    let(:src){ CachePath.temp_file_path }
-    let(:dst){ CachePath.temp_file_path }
+    let(:src_dir){ Path.temp_dir }
+    let(:src){ CachePath.temp_file_path(nil, src_dir) }
+    let(:dst){ Path.temp_file_path }
 
-    it 'moves data to destination' do
-      src.write('src')
+    shared_examples 'replaces file' do
+      it 'moves data to destination' do
+        src.write('src')
 
-      src.replace(dst)
+        src.replace(dst)
 
-      expect(dst.read).to eq('src')
-    end
+        expect(dst.read).to eq('src')
+      end
 
-    it 'does not remove original file' do
-      src.replace(dst)
+      it 'does not remove original file' do
+        src.replace(dst)
 
-      expect(src).to exist
-    end
+        expect(src).to exist
+      end
+
+      it 'preserves attributes of destination file' do
+        skip 'full file modes are not support' unless any_file_modes_allowed?
+        mode = 0o666
+
+        dst.chmod(mode)
+
+        src.replace(dst)
 
-    it 'preserves attributes of destination file' do
-      skip 'full file modes are not support' unless any_file_modes_allowed?
-      mode = 0o666
+        got = dst.stat.mode & 0o777
+        expect(got).to eq(mode), format('expected %04o, got %04o', mode, got)
+      end
 
-      dst.chmod(mode)
+      it 'does not preserve mtime of destination file' do
+        time = src.mtime
 
-      src.replace(dst)
+        dst.utime(time - 1000, time - 1000)
 
-      got = dst.stat.mode & 0o777
-      expect(got).to eq(mode), format('expected %04o, got %04o', mode, got)
+        src.replace(dst)
+
+        expect(dst.mtime).to be >= time
+      end
+
+      it 'changes inode of destination' do
+        skip 'inodes are not supported' unless inodes_supported?
+        expect{ src.replace(dst) }.to change{ dst.stat.ino }
+      end
+
+      it 'is using temporary file with .tmp extension' do
+        expect(src).to receive(:copy).with(having_attributes(:extname => '.tmp')).at_least(:once)
+
+        src.replace(dst)
+      end
     end
 
-    it 'does not preserve mtime of destination file' do
-      time = src.mtime
+    context 'when src and dst are on same device' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev).and_return(0)
+      end
 
-      dst.utime(time - 1000, time - 1000)
+      include_examples 'replaces file'
+    end
 
-      src.replace(dst)
+    context 'when src and dst are on different devices' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev, &:__id__)
+      end
 
-      expect(dst.mtime).to be >= time
+      include_examples 'replaces file'
     end
 
-    it 'changes inode of destination' do
-      skip 'inodes are not supported' unless inodes_supported?
-      expect{ src.replace(dst) }.to change{ dst.stat.ino }
+    context 'when src and dst are on same device, but rename causes Errno::EXDEV' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev).and_return(0)
+        allow(described_class).to receive(:temp_file_path).and_call_original
+        expect(described_class).to receive(:temp_file_path).
+          with([dst.basename.to_s, '.tmp'], src.dirname).
+          and_wrap_original do |m, *args, &block|
+            m.call(*args) do |tmp|
+              expect(tmp).to receive(:rename).with(dst.to_s).and_raise(Errno::EXDEV)
+              block.call(tmp)
+            end
+          end
+      end
+
+      include_examples 'replaces file'
     end
   end
 end

data/spec/image_optim/cache_spec.rb

@@ -64,6 +64,7 @@ describe ImageOptim::Cache do
     end
   end
 
+  # rubocop:disable Style/RedundantFetchBlock
   shared_examples 'an enabled cache' do
     context 'when cached file does not exist' do
       describe :fetch do
@@ -101,7 +102,7 @@ describe ImageOptim::Cache do
           expect(FileUtils).not_to receive(:mv)
           expect(File).not_to receive(:rename)
 
-          expect(cache.fetch(original){}).to eq(cached)
+          expect(cache.fetch(original){ nil }).to eq(cached)
         end
 
         it 'returns nil when file is already optimized' do
@@ -116,6 +117,7 @@ describe ImageOptim::Cache do
       end
     end
   end
+  # rubocop:enable Style/RedundantFetchBlock
 
   context 'when cache is enabled (without worker digests)' do
     let(:image_optim) do

data/spec/image_optim/path_spec.rb

@@ -61,45 +61,84 @@ describe ImageOptim::Path do
     let(:src){ Path.temp_file_path }
     let(:dst){ Path.temp_file_path }
 
-    it 'moves data to destination' do
-      src.write('src')
+    shared_examples 'replaces file' do
+      it 'moves data to destination' do
+        src.write('src')
 
-      src.replace(dst)
+        src.replace(dst)
 
-      expect(dst.read).to eq('src')
-    end
+        expect(dst.read).to eq('src')
+      end
 
-    it 'removes original file' do
-      src.replace(dst)
+      it 'removes original file' do
+        src.replace(dst)
 
-      expect(src).to_not exist
-    end
+        expect(src).to_not exist
+      end
+
+      it 'preserves attributes of destination file' do
+        skip 'full file modes are not support' unless any_file_modes_allowed?
+        mode = 0o666
+
+        dst.chmod(mode)
 
-    it 'preserves attributes of destination file' do
-      skip 'full file modes are not support' unless any_file_modes_allowed?
-      mode = 0o666
+        src.replace(dst)
 
-      dst.chmod(mode)
+        got = dst.stat.mode & 0o777
+        expect(got).to eq(mode), format('expected %04o, got %04o', mode, got)
+      end
+
+      it 'does not preserve mtime of destination file' do
+        time = src.mtime
+
+        dst.utime(time - 1000, time - 1000)
 
-      src.replace(dst)
+        src.replace(dst)
 
-      got = dst.stat.mode & 0o777
-      expect(got).to eq(mode), format('expected %04o, got %04o', mode, got)
+        expect(dst.mtime).to be >= time
+      end
+
+      it 'changes inode of destination' do
+        skip 'inodes are not supported' unless inodes_supported?
+        expect{ src.replace(dst) }.to change{ dst.stat.ino }
+      end
     end
 
-    it 'does not preserve mtime of destination file' do
-      time = src.mtime
+    context 'when src and dst are on same device' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev).and_return(0)
+      end
+
+      include_examples 'replaces file'
+    end
 
-      dst.utime(time - 1000, time - 1000)
+    context 'when src and dst are on different devices' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev, &:__id__)
+      end
+
+      include_examples 'replaces file'
 
-      src.replace(dst)
+      it 'is using temporary file with .tmp extension' do
+        expect(src).to receive(:move).with(having_attributes(:extname => '.tmp'))
 
-      expect(dst.mtime).to be >= time
+        src.replace(dst)
+      end
     end
 
-    it 'changes inode of destination' do
-      skip 'inodes are not supported' unless inodes_supported?
-      expect{ src.replace(dst) }.to change{ dst.stat.ino }
+    context 'when src and dst are on same device, but rename causes Errno::EXDEV' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev).and_return(0)
+        expect(src).to receive(:rename).with(dst.to_s).once.and_raise(Errno::EXDEV)
+      end
+
+      include_examples 'replaces file'
+
+      it 'is using temporary file with .tmp extension' do
+        expect(src).to receive(:move).with(having_attributes(:extname => '.tmp'))
+
+        src.replace(dst)
+      end
     end
   end
 end

data/spec/image_optim/worker/jpegrecompress_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'image_optim/worker/jpegrecompress'
+
+describe ImageOptim::Worker::Jpegrecompress do
+  describe 'method value' do
+    let(:subject){ described_class.new(ImageOptim.new, method).method }
+
+    context 'default' do
+      let(:method){ {} }
+
+      it{ is_expected.to eq('ssim') }
+    end
+
+    context 'uses default when invalid' do
+      let(:method){ {:method => 'invalid'} }
+
+      it 'warns and keeps default' do
+        expect_any_instance_of(described_class).
+          to receive(:warn).with('Unknown method for jpegrecompress: invalid')
+        is_expected.to eq('ssim')
+      end
+    end
+
+    context 'can use a valid option' do
+      let(:method){ {:method => 'smallfry'} }
+
+      it{ is_expected.to eq('smallfry') }
+    end
+  end
+end

data/spec/image_optim_spec.rb

@@ -23,10 +23,11 @@ describe ImageOptim do
     stub_const('Cmd', ImageOptim::Cmd)
   end
 
-  isolated_options_base = {:skip_missing_workers => false}
-  ImageOptim::Worker.klasses.each do |klass|
-    isolated_options_base[klass.bin_sym] = false
-  end
+  isolated_options_base = Hash[
+    ImageOptim::Worker.klasses.map do |klass|
+      [klass.bin_sym, false]
+    end
+  ].merge(:skip_missing_workers => false)
 
   ImageOptim::Worker.klasses.each do |worker_klass|
     describe "#{worker_klass.bin_sym} worker" do

data/spec/images/quant/generate

@@ -17,8 +17,8 @@ palettes.each do |palette|
     rgb:-
     PNG24:#{palette}.png
   ].shelljoin, 'w') do |f|
-    (side * side).times do |i|
-      color = i * palette / (side * side) * 0x10000 / palette
+    (side**2).times do |i|
+      color = i * palette / (side**2) * 0x10000 / palette
       f << [color / 0x100, color % 0x100, 0].pack('C*')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.29.0
 platform: ruby
 authors:
 - Ivan Kuchin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -138,16 +138,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
-description: 
-email: 
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+description:
+email:
 executables:
 - image_optim
 extensions: []
@@ -155,6 +169,7 @@ extra_rdoc_files: []
 files:
 - ".appveyor.yml"
 - ".gitignore"
+- ".pre-commit-hooks.yaml"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.markdown
@@ -224,6 +239,7 @@ files:
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
 - spec/image_optim/space_spec.rb
+- spec/image_optim/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
@@ -257,13 +273,13 @@ files:
 - spec/spec_helper.rb
 - vendor/jpegrescan
 - vendor/jpegrescan.bat
-homepage: http://github.com/toy/image_optim
+homepage: https://github.com/toy/image_optim
 licenses:
 - MIT
 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.26.4
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.29.0
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem
@@ -275,15 +291,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.5
+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,
@@ -307,6 +323,7 @@ test_files:
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
 - spec/image_optim/space_spec.rb
+- spec/image_optim/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb