image_optim 0.26.1 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ee767f813631dc2d9c8e6fa29215c7a03fc27c47
-  data.tar.gz: 1e6475763f0e1f2966d9f6eef4ae5b39e1daa700
+SHA256:
+  metadata.gz: 2761c4a4a3488017b46d04acf157daa592537169ea05fcbeaf865928b0457618
+  data.tar.gz: 89c7fbe11f6b99cf3f1e8c4f3336fd122c1b16afd71fd56b1d0cbd6ab88c52c1
 SHA512:
-  metadata.gz: 059eb206df2283758e5e937728b57a0e9aa558b791a2b07a01eb6087b3fdd268dfb9520b9b9f35b63e6fd604f7f26e2c3f53589818ef6c887a1e1d178282b758
-  data.tar.gz: 6fc6ac440fdb1661372d038c1bdb50eed3a782b04846a22de2757cb2e8c770de665ca6d5ab1d90f91025c078a44ff684177522469c6af733ea216c13ec179280
+  metadata.gz: facf38c901cbbd1ba0b8222637845b2e96dc8491e4a55b20a779be53e9ff6e14e561b2ab056aa9182205dd96df20ed0b25c8d8b5a1b3ebe721344ef5384bc7fc
+  data.tar.gz: f2d2f1d4179cce616a1024445d8a30b15367a4a156a0a085fa0d8b177f38e44aaff930788b90de6e8226e7b4c022eb1877794aceee5e62cd7e7c1153554238e3

data/.appveyor.yml

@@ -1,8 +1,9 @@
 version: '{build}-{branch}'
 install:
   - mkdir tmp\bin || exit 0
-  - set PATH=%cd%\tmp\bin;%PATH%
+  - 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,26 +10,36 @@ Bundler/OrderedGems:
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Layout/AssignmentIndentation:
+  Enabled: false
+
 Layout/CaseIndentation:
   EnforcedStyle: end
 
 Layout/DotPosition:
   EnforcedStyle: trailing
 
-Layout/IndentArray:
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+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:
   EnforcedStyle: no_space
+  EnforcedStyleForEmptyBraces: no_space
 
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
@@ -37,17 +48,17 @@ Lint/AmbiguousBlockAssociation:
   Exclude:
     - spec/**/*_spec.rb
 
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
 Lint/NestedPercentLiteral:
   Enabled: false
 
-Lint/UnneededSplatExpansion:
+Lint/RedundantRequireStatement:
+  Enabled: false
+
+Lint/RedundantSplatExpansion:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 30
+  Max: 33
 
 Metrics/BlockLength:
   Exclude:
@@ -59,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
 
@@ -83,21 +97,42 @@ Style/EmptyCaseCondition:
 Style/Encoding:
   Enabled: false
 
+Style/ExpandPathArguments:
+  Enabled: false
+
 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
 
@@ -110,5 +145,8 @@ Style/SymbolArray:
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: no_comma
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,4 +1,5 @@
 sudo: false
+dist: trusty
 language: ruby
 cache:
   bundler: true
@@ -6,38 +7,42 @@ 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.8'
-  - '2.3.5'
-  - '2.4.2'
-  - 'jruby-9.0.5.0'
-  - 'jruby-9.1.9.0'
+  - '2.2.10'
+  - '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 update 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-20130221-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.2'
+    - env: CODECLIMATE=1
+      rvm: '2.4.10'
       after_success: bundle exec codeclimate-test-reporter
-    - env: RUBOCOP=✓
-      rvm: '2.4.2'
+    - env: RUBOCOP=1
+      rvm: '2.4.10'
       script: bundle exec rubocop
-      before_install:
-    - env: CHECK_RUBIES=✓
-      rvm: '2.4.2'
+      before_install: gem update --system && gem install bundler
+    - env: CHECK_RUBIES=1
+      rvm: '2.4.10'
       script: bundle exec travis_check_rubies
-      before_install:
+      before_install: gem update --system && gem install bundler
 addons:
   code_climate:
     repo_token:

data/CHANGELOG.markdown

@@ -2,6 +2,30 @@
 
 ## unreleased
 
+## 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)
+* Allow `image_size` 2.x [@toy](https://github.com/toy)
+* Add instructions for installing `svgo` in project folder [#156](https://github.com/toy/image_optim/issues/156) [@brian-kephart](https://github.com/brian-kephart)
+* Show full bin search path in verbose output [@toy](https://github.com/toy)
+
 ## v0.26.1 (2017-12-14)
 
 * Require `'date'` which is used in parsing pngout version [toy/image_optim_pack#14](https://github.com/toy/image_optim_pack/issues/14) [@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-2017 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

@@ -1,14 +1,14 @@
 [![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/github/toy/image_optim.svg?style=flat)](https://codeclimate.com/github/toy/image_optim)
-[![Code Climate Coverage](https://img.shields.io/codeclimate/coverage/github/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)
+[![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)
 
 # image_optim
 
-Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg) using external utilities:
+Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities:
 
 * [advpng](http://advancemame.sourceforge.net/doc-advpng.html) from [AdvanceCOMP](http://advancemame.sourceforge.net/comp-readme.html)
 (will use [zopfli](https://code.google.com/p/zopfli/) on default/maximum level 4)
@@ -25,7 +25,9 @@ Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg) usin
 
 Based on [ImageOptim.app](http://imageoptim.com/).
 
-Documentation for [latest version](http://rubydoc.info/gems/image_optim/frames) and [master](http://rubydoc.info/github/toy/image_optim/master/frames).
+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
 
@@ -58,7 +60,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.26'
+gem 'image_optim', '~> 0.27'
 ```
 <!---</update-version>-->
 
@@ -178,6 +180,20 @@ _Note: pngout is free to use even in commercial soft, but you can not redistribu
 npm install -g svgo
 ```
 
+If you prefer to install `svgo` to your project directory, use one of the following commands instead:
+
+```bash
+npm install svgo
+
+yarn add svgo
+```
+
+When installing `svgo` to the project directory, you must add the following to your environment:
+
+```
+SVGO_BIN='node_modules/svgo/bin/svgo'
+```
+
 ### jpeg-recompress installation (optional)
 
 Download and install the `jpeg-recompress` binary from the [JPEG-Archive Releases](https://github.com/danielgtaylor/jpeg-archive/releases) page,
@@ -261,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`)*
@@ -341,4 +361,4 @@ In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 
-Copyright (c) 2012-2017 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,13 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.26.1'
-  s.summary     = %q{Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg) 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.version     = '0.27.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    = "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}/blob/master/CHANGELOG.markdown",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
+    'source_code_uri'   => "https://github.com/toy/#{s.name}",
+  }
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -21,14 +26,14 @@ You can safely remove `config.assets.image_optim = false` if you are not going t
 EOF
 
   s.add_dependency 'fspath', '~> 3.0'
-  s.add_dependency 'image_size', '~> 1.5'
+  s.add_dependency 'image_size', '>= 1.5', '< 3'
   s.add_dependency 'exifr', '~> 1.2', '>= 1.2.2'
   s.add_dependency 'progress', '~> 3.0', '>= 3.0.1'
   s.add_dependency 'in_threads', '~> 1.3'
 
   s.add_development_dependency 'image_optim_pack', '~> 0.2', '>= 0.2.2'
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.1'
-    s.add_development_dependency 'rubocop', '~> 0.52'
+  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'
@@ -83,6 +85,8 @@ class ImageOptim
 
     @bin_resolver = BinResolver.new(self)
 
+    $stderr << "PATH: #{@bin_resolver.env_path}\n" if verbose
+
     @workers_by_format = Worker.create_all_by_format(self) do |klass|
       config.for_worker(klass)
     end
@@ -116,6 +120,7 @@ class ImageOptim
     end
 
     return unless optimized
+
     OptimizedPath.new(optimized, original)
   end
 
@@ -124,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
@@ -132,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)