image_optim 0.26.2 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b7d1d96cc0bc6f16e0a2b6a512c4ad06015eea55359dcc9c32c2b19714c786
-  data.tar.gz: be1136efd362c8f13f8a286728fc3c49f62af439cdea90d60c68e4093c1be72a
+  metadata.gz: b8d7c83b1d36f1cb0c41866cf421a8477632c43137749f2011b2520854de859d
+  data.tar.gz: 3030f2377d510cc964025e3497dfb2bc860bd560fa88e33acc97e3caaa56614c
 SHA512:
-  metadata.gz: 82ac7498fa95948f7e6a6380695be2da56436245d4fd595d704b4a8e78d59bb4c483690e8a8ac992ea5bf34fc0f37180ea1e103d76c8ac523975bd8a7690b1e5
-  data.tar.gz: cb3d17d491ec5accbf9d94caac4725b849e5e42f212b464b1a08b1f0545f0844193154c8c2c141377193a5234e45b70a207fb4a642f2625e0668e08e8821f046
+  metadata.gz: 3df3a7cd3606e03dc16fd7aed023e40f61e5c4b688707a39240cc67b5432b9705fbb2c33df9ec8a1da96e4408d7a5270b6a181415647e53c686565f45b5c2bd4
+  data.tar.gz: b19684e4d13d29e6ac52e3ba5cddb38a6716f9acfae9946962ab45582a38e49c6c42018387d66e75a5f52d7153e12cf4a9e9dc10388f6d36bd4834d5a5e78ee0

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,16 +22,19 @@ Layout/DotPosition:
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentAssignment:
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/HeredocIndentation:
   Enabled: false
 
-Layout/IndentHash:
-  EnforcedStyle: consistent
+Layout/LineLength:
+  Max: 120
 
-Layout/IndentHeredoc:
+Layout/RescueEnsureAlignment:
   Enabled: false
 
 Layout/SpaceBeforeBlockBraces:
@@ -44,14 +51,14 @@ Lint/AmbiguousBlockAssociation:
 Lint/NestedPercentLiteral:
   Enabled: false
 
-Lint/UnneededRequireStatement:
+Lint/RedundantRequireStatement:
   Enabled: false
 
-Lint/UnneededSplatExpansion:
+Lint/RedundantSplatExpansion:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 30
+  Max: 33
 
 Metrics/BlockLength:
   Exclude:
@@ -63,18 +70,21 @@ Metrics/ClassLength:
   Max: 150
 
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 11
 
 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
 
@@ -93,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,40 @@ cache:
     - $(npm root)
     - ~/bin
 rvm:
-  - '1.8.7-p371'
+  - '1.8.7-p374'
   - '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.1'
+  - '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,27 @@
 
 ## unreleased
 
+## 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)
+
 ## v0.26.2 (2018-08-15)
 
 * Ignore segmentation fault for `pngout` <= `20150920` [#158](https://github.com/toy/image_optim/issues/158) [@toy](https://github.com/toy)

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

@@ -3,7 +3,7 @@
 [![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)
-[![Dependency Status](https://img.shields.io/gemnasium/toy/image_optim.svg?style=flat)](https://gemnasium.com/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)
 
 # image_optim
@@ -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.27'
 ```
 <!---</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`)*
@@ -355,4 +361,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.2'
+  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.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.58'
+  if RUBY_VERSION >= '2.2' && !Gem.win_platform? && !defined?(JRUBY_VERSION)
+    s.add_development_dependency 'rubocop', '~> 0.59', '!= 0.78.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'
@@ -118,6 +120,7 @@ class ImageOptim
     end
 
     return unless optimized
+
     OptimizedPath.new(optimized, original)
   end
 
@@ -126,6 +129,7 @@ class ImageOptim
   def optimize_image!(original)
     original = Path.convert(original)
     return unless (result = optimize_image(original))
+
     result.replace(original)
     OptimizedPath.new(original, result.original_size)
   end
@@ -134,6 +138,7 @@ class ImageOptim
   def optimize_image_data(original_data)
     format = ImageMeta.format_for_data(original_data)
     return unless format
+
     Path.temp_file %W[image_optim .#{format}] do |temp|
       temp.binmode
       temp.write(original_data)

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'
@@ -97,6 +99,7 @@ class ImageOptim
     # Double-checked locking
     def resolving(name)
       return if @bins.include?(name)
+
       @lock.synchronize do
         yield unless @bins.include?(name)
       end
@@ -108,11 +111,13 @@ class ImageOptim
       env_name = "#{name}_bin".upcase
       path = ENV[env_name]
       return unless path
+
       path = File.expand_path(path)
       desc = "`#{path}` specified in #{env_name}"
       fail "#{desc} doesn\'t exist" unless File.exist?(path)
       fail "#{desc} is not a file" unless File.file?(path)
       fail "#{desc} is not executable" unless File.executable?(path)
+
       if @image_optim.verbose
         $stderr << "Custom path for #{name} specified in #{env_name}: #{path}\n"
       end

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'
@@ -15,6 +17,7 @@ class ImageOptim
       class BadVersion < Error; end
 
       attr_reader :name, :path, :version
+
       def initialize(name, path)
         @name = name.to_sym
         @path = path.to_s
@@ -23,6 +26,7 @@ class ImageOptim
 
       def digest
         return @digest if defined?(@digest)
+
         @digest = File.exist?(@path) && Digest::SHA1.file(@path).hexdigest
       end
 
@@ -32,20 +36,34 @@ class ImageOptim
 
       is = ComparableCondition.is
 
-      FAIL_CHECKS = [
-        [:pngcrush, is.between?('1.7.60', '1.7.65'), 'is known to produce '\
-              'broken pngs'],
-        [:pngcrush, is == '1.7.80', 'loses one color in indexed images'],
-        [:pngquant, is < '2.0', 'is not supported'],
-      ].freeze
-
-      WARN_CHECKS = [
-        [:advpng, is < '1.17', 'does not use zopfli'],
-        [:gifsicle, is < '1.85', 'does not support removing extension blocks'],
-        [:pngcrush, is < '1.7.38', 'does not have blacken flag'],
-        [:pngquant, is < '2.1', 'may be lossy even with quality `100-`'],
-        [:optipng, is < '0.7', 'does not support -strip option'],
-      ].freeze
+      FAIL_CHECKS = {
+        :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 => [
+          [is < '2.0', 'is not supported'],
+        ],
+      }.freeze
+
+      WARN_CHECKS = {
+        :advpng => [
+          [is == 'none', 'is of unknown version'],
+          [is < '1.17', 'does not use zopfli'],
+        ],
+        :gifsicle => [
+          [is < '1.85', 'does not support removing extension blocks'],
+        ],
+        :pngcrush => [
+          [is < '1.7.38', 'does not have blacken flag'],
+        ],
+        :pngquant => [
+          [is < '2.1', 'may be lossy even with quality `100-`'],
+        ],
+        :optipng => [
+          [is < '0.7', 'does not support -strip option'],
+        ],
+      }.freeze
 
       # Fail if version will not work properly
       def check_fail!
@@ -53,9 +71,11 @@ class ImageOptim
           fail UnknownVersion, "could not get version of #{name} at #{path}"
         end
 
-        FAIL_CHECKS.each do |bin_name, matcher, message|
-          next unless bin_name == name
+        return unless FAIL_CHECKS[name]
+
+        FAIL_CHECKS[name].each do |matcher, message|
           next unless matcher.match(version)
+
           fail BadVersion, "#{self} (#{matcher}) #{message}"
         end
       end
@@ -64,10 +84,14 @@ class ImageOptim
       def check!
         check_fail!
 
-        WARN_CHECKS.each do |bin_name, matcher, message|
-          next unless bin_name == name
+        return unless WARN_CHECKS[name]
+
+        WARN_CHECKS[name].each do |matcher, message|
           next unless matcher.match(version)
+
           warn "WARN: #{self} (#{matcher}) #{message}"
+
+          break
         end
       end
 
@@ -82,7 +106,9 @@ class ImageOptim
       # Getting version of bin, will fail for an unknown name
       def version_string
         case name
-        when :advpng, :gifsicle, :jpegoptim, :optipng
+        when :advpng
+          capture("#{escaped_path} --version 2> #{Path::NULL}")[/\bv(\d+(\.\d+)+|none)/, 1]
+        when :gifsicle, :jpegoptim, :optipng
           capture("#{escaped_path} --version 2> #{Path::NULL}")[/\d+(\.\d+)+/]
         when :svgo, :pngquant
           capture("#{escaped_path} --version 2>&1")[/\d+(\.\d+)+/]