image_optim 0.26.3 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec91f27b4e53d23a3516908c5714011fb47bbc251e95ef9952acc62948d123af
-  data.tar.gz: 8b5a675e29709e03bf5ca0567ae742f8d4d7f3d7e90f89ac5ef8c1935c594555
+  metadata.gz: 818160db3036f1fd4305077d943e59991aebe5fb1023b3c7e46db02e63c5fb37
+  data.tar.gz: 76c76ec43a5c05b9e35de21757928ec8793709a3db27e8a982cc46612f8d491e
 SHA512:
-  metadata.gz: 847ee0b721a90d761ccfa4948c979e532dfd53d52f2e4c82e9df1e3301bcaba6a4217f98ae5cd5be2bcd7407339614710bd95ef381e9d422e778a4674ddeb81b
-  data.tar.gz: 7f5b009a16df3c671ebc9a8c934cb499fd7ac47a0a464d33130ab1197ffa4b9c1f2767467226124dbd78281bcffd7864c058d8f3ff9fe7b58addfd3b6411ace7
+  metadata.gz: f30e6f493be6ff4e98407bb611d8fd868733af14da078b225b6708c7f6aabaa41d00b08e82c3801c788bd70c4d7278ee91a186a3dc54bc7bdcc16e685d27c7a8
+  data.tar.gz: b3402efe19eeb298518cfeb117f38c7aca1e0bbabe68313663107269d3ab87f8900f238db182042377adb5ebc12f69dd133ee5c922fcbde54c4b647bc9efa836

data/.appveyor.yml

@@ -3,6 +3,7 @@ install:
   - mkdir tmp\bin || exit 0
   - set PATH=C:\Ruby25-x64\bin;%cd%\tmp\bin;%PATH%
   - ruby --version
+  - gem --version
   - bundle package --all
 
   - ps: git --work-tree=tmp\bin checkout origin/windows-binaries -- '*.exe'
@@ -26,10 +27,16 @@ test_script:
   - ps: |
       $path = $env:Path
       $rubypaths = ls -Path C:\Ruby*\bin
-      foreach ($rubypath in $rubypaths[-2, -1]) {
-        echo "################################################################################"
+      foreach ($rubypath in $rubypaths) {
         $env:Path = "$rubypath;" + $path
+        ruby -e "abort unless RUBY_VERSION > '2.3'"
+        if ($LASTEXITCODE -gt 0) {
+          continue
+        }
+
+        echo "################################ $rubypath ################################"
         ruby --version
+        gem --version
         bundle package --all
         bundle install --local -j4
         bundle exec rspec

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/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentAssignment:
-  Enabled: false
-
-Layout/IndentHash:
+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,18 +103,36 @@ Style/ExpandPathArguments:
 Style/FormatStringToken:
   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
 
 Style/RescueStandardError:
   EnforcedStyle: implicit
 
+Style/SafeNavigation:
+  Enabled: false
+
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 

data/.travis.yml

@@ -1,4 +1,5 @@
 sudo: false
+dist: trusty
 language: ruby
 cache:
   bundler: true
@@ -6,37 +7,39 @@ 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.7'
-  - '2.4.4'
-  - '2.5.1'
-  - 'jruby-9.0.5.0'
-  - 'jruby-9.1.9.0'
+  - '2.3.8'
+  - '2.4.10'
+  - '2.5.8'
+  - '2.6.6'
+  - '2.7.2'
+  - 'jruby-9.2.11.1'
 script:
   - bundle exec image_optim --info
   - bundle exec rspec
 before_install:
-  - gem update --system
-  - gem install bundler
+  - '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
   - 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'
+  - 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.4'
+    - env: CODECLIMATE=1
+      rvm: '2.4.10'
       after_success: bundle exec codeclimate-test-reporter
-    - env: RUBOCOP=✓
-      rvm: '2.4.4'
+    - 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.4'
+    - 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,29 @@
 
 ## unreleased
 
+## 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)
+
 ## v0.26.3 (2018-10-13)
 
 * Handle `vnone` version of `advpng` that was erroneously produced for `ubuntu` and `homebrew` [#165](https://github.com/toy/image_optim/issues/165) [@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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
@@ -10,6 +12,6 @@ if ENV['CODECLIMATE']
   end
 end
 
-if RUBY_VERSION >= '2.0'
+if ENV['CHECK_RUBIES']
   gem 'travis_check_rubies', '~> 0.2'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2018 Ivan Kuchin
+Copyright (c) 2012-2020 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

@@ -27,6 +27,8 @@ Based on [ImageOptim.app](http://imageoptim.com/).
 
 Documentation for [latest gem version](http://rubydoc.info/gems/image_optim/frames) and [master branch](http://rubydoc.info/github/toy/image_optim/master/frames).
 
+A test application with latest `image_optim` and `image_optim_pack` is available on heroku: https://iopack.herokuapp.com/.
+
 ## Gem installation
 
 ```sh
@@ -58,7 +60,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.26'
+gem 'image_optim', '~> 0.28'
 ```
 <!---</update-version>-->
 
@@ -275,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`)*
@@ -304,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`)*
@@ -355,4 +362,4 @@ In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 
-Copyright (c) 2012-2018 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2012-2020 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/Vagrantfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Vagrant.configure('2') do |config|
   config.vm.box = 'ubuntu/precise64'
 

data/bin/image_optim

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'image_optim/runner'
 require 'image_optim/runner/option_parser'

data/image_optim.gemspec

@@ -2,17 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.26.3'
+  s.version     = '0.28.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.metadata = {
     'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
-    'changelog_uri'     => "https://github.com/toy/#{s.name}/CHANGELOG.markdown",
+    'changelog_uri'     => "https://github.com/toy/#{s.name}/blob/master/CHANGELOG.markdown",
     'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
     'source_code_uri'   => "https://github.com/toy/#{s.name}",
   }
@@ -35,7 +33,7 @@ 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'
-    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'
   end
 end

data/lib/image_optim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/bin_resolver'
 require 'image_optim/cache'
 require 'image_optim/config'

data/lib/image_optim/bin_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'fspath'
 require 'image_optim/bin_resolver/error'

data/lib/image_optim/bin_resolver/bin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/bin_resolver/error'
 require 'image_optim/bin_resolver/simple_version'
 require 'image_optim/bin_resolver/comparable_condition'
@@ -12,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

data/lib/image_optim/bin_resolver/comparable_condition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   class BinResolver
     # Allows to externalize conditions for an instance of Comparable to use in
@@ -24,6 +26,7 @@ class ImageOptim
       end
 
       attr_reader :method, :args
+
       def initialize(method, *args)
         @method, @args = method.to_sym, args
 

data/lib/image_optim/bin_resolver/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   class BinResolver
     # Base error during bin resolving

data/lib/image_optim/bin_resolver/simple_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   class BinResolver
     # Allows comparision of simple versions, only numbers separated by dots are

data/lib/image_optim/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest/sha1'
 require 'fspath'
 require 'image_optim/cache_path'

data/lib/image_optim/cache_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/path'
 
 class ImageOptim
@@ -5,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)