discourse_image_optim 0.24.5 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cc2adf558f317725968c909a3006b225510f968a
-  data.tar.gz: ffc333b3c383ae0a524368fd9d1b5d9b6c2429ce
+SHA256:
+  metadata.gz: d4cc5e84e0c8dff3c8fd0af654608b8ee958b3283463f7f945076964ae9d3eae
+  data.tar.gz: ca77fd28eac0fb79493ed19600eaae18fdb7ea244f9025fdc909e7791a32133e
 SHA512:
-  metadata.gz: 9a31691f92f66fd43600947b371622d0e462e1d4ded44531a80b2bfda930a7b71dabd8bf879afb2d04f466e247a08a14189afe945ddef15e52b58ded2b1f3d51
-  data.tar.gz: fb3740f4088ec4a90c4b7f85d61762f2d6d702eda56bb7b692965a18b723d120690e900a9880b75557bec6ceab317041cc50c461df21db4212f9faf2eb984b5a
+  metadata.gz: fcbd37ef3c8899889ebcf1912f0200f7bab98399779e32658b39d55af99da87f452dfec263e91d15a177e1700d566705891f455191758ebc23f9c68d47b96cfa
+  data.tar.gz: 0b1379b801324ee93c546c4672abec97385cd7e5c50624e8657c9049d4f4e06135d167783d46901385209aab8b0ae364dfaf40887a67f8931c8a3b6f36255352

data/.gitignore

@@ -5,7 +5,6 @@
 /rdoc/
 /.yardoc/
 /coverage/
-/vendor/
 
 /Gemfile.lock
 Makefile

data/.rubocop.yml

@@ -6,6 +6,33 @@ AllCops:
 Bundler/OrderedGems:
   Enabled: false
 
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/IndentAssignment:
+  Enabled: false
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Layout/IndentHeredoc:
+  Enabled: false
+
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - spec/**/*_spec.rb
@@ -13,6 +40,9 @@ Lint/AmbiguousBlockAssociation:
 Lint/EndAlignment:
   EnforcedStyleAlignWith: variable
 
+Lint/NestedPercentLiteral:
+  Enabled: false
+
 Lint/UnneededSplatExpansion:
   Enabled: false
 
@@ -41,18 +71,9 @@ Security/MarshalLoad:
   Exclude:
     - 'script/worker_analysis'
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
-Style/CaseIndentation:
-  EnforcedStyle: end
-
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
@@ -60,33 +81,22 @@ Style/EmptyCaseCondition:
   Enabled: false
 
 Style/Encoding:
-  EnforcedStyle: when_needed
+  Enabled: false
+
+Style/FormatStringToken:
+  Enabled: false
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
 Style/IfUnlessModifier:
-  MaxLineLength: 40
-
-Style/IndentArray:
-  EnforcedStyle: consistent
-
-Style/IndentAssignment:
-  Enabled: false
-
-Style/IndentHash:
-  EnforcedStyle: consistent
-
-Style/IndentHeredoc:
   Enabled: false
 
 Style/ParallelAssignment:
   Enabled: false
 
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%w': '[]'
-    '%W': '[]'
+Style/RescueStandardError:
+  EnforcedStyle: implicit
 
 Style/Semicolon:
   AllowAsExpressionSeparator: true
@@ -94,17 +104,11 @@ Style/Semicolon:
 Style/SignalException:
   EnforcedStyle: semantic
 
-Style/SpaceBeforeBlockBraces:
-  EnforcedStyle: no_space
-
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+Style/SymbolArray:
+  Enabled: false
 
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: no_comma
 
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
-
-Style/SymbolArray:
-  Enabled: false

data/.travis.yml

@@ -10,30 +10,32 @@ rvm:
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'
-  - '2.2.7'
-  - '2.3.4'
-  - '2.4.1'
-  - 'jruby-1.7.26'
+  - '2.2.8'
+  - '2.3.5'
+  - '2.4.2'
   - 'jruby-9.0.5.0'
-  - 'jruby-9.1.5.0'
+  - 'jruby-9.1.9.0'
 script:
   - bundle exec image_optim --info
   - bundle exec rspec
 before_install:
+  - gem update --system
+  - gem update bundler
+  - nvm install stable
   - mkdir -p ~/bin
-  - command -v svgo || npm install svgo
+  - 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'
 matrix:
   include:
     - env: CODECLIMATE=✓
-      rvm: '2.4.1'
+      rvm: '2.4.2'
       after_success: bundle exec codeclimate-test-reporter
     - env: RUBOCOP=✓
-      rvm: '2.4.1'
+      rvm: '2.4.2'
       script: bundle exec rubocop
       before_install:
     - env: CHECK_RUBIES=✓
-      rvm: '2.4.1'
+      rvm: '2.4.2'
       script: bundle exec travis_check_rubies
       before_install:
 addons:

data/CHANGELOG.markdown

@@ -2,8 +2,26 @@
 
 ## unreleased
 
+## 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)
+
 * Add `timeout` option to workers [#21](https://github.com/toy/image_optim/issues/21)
-[@tgxworld](http://github.com/tgxworld)
+  [@tgxworld](http://github.com/tgxworld)
+
+## v0.26.0 (2017-11-13)
+
+* Enable `jpegrescan` by default after removing its dependency on `File::Slurp` and fixing for windows [#153](https://github.com/toy/image_optim/issues/153) [@toy](https://github.com/toy)
+* Extend description of `--verbose` flag [#152](https://github.com/toy/image_optim/issues/152) [@toy](https://github.com/toy)
+
+## v0.25.0 (2017-07-06)
+
+* Fix error `uninitialized constant EXIFR::JPEG` (breaking change in [exifr v1.3.0](https://github.com/remvee/exifr/commit/e073a22d06c39f2c1c0e77f5b5fe71545b25e967)) [#150](https://github.com/toy/image_optim/pull/150) [@abemedia](https://github.com/abemedia)
+* Add option to `pngquant` worker to limit maximum number of colors to use [#144](https://github.com/toy/image_optim/issues/144) [@toy](https://github.com/toy)
+
+## v0.24.3 (2017-05-04)
+
+* Set mode of cache files to `0666 & ~umask`, related to [#147](https://github.com/toy/image_optim/issues/147) [@toy](https://github.com/toy)
 
 ## v0.24.2 (2017-02-18)
 
@@ -18,7 +36,7 @@
 
 ## v0.24.0 (2016-08-14)
 
-* Rails image assets optimization is extracted into [image\_optim\_rails gem](https://github.com/toy/image_optim_rails) [#127](https://github.com/toy/image_optim/issues/127) [@toy](https://github.com/toy)
+* Rails image assets optimization is extracted into [image_optim_rails gem](https://github.com/toy/image_optim_rails) [#127](https://github.com/toy/image_optim/issues/127) [@toy](https://github.com/toy)
 * Add proper handling of `ImageOptim.respond_to?` [@toy](https://github.com/toy)
 * Fix an issue not working OptiPNG `interlace` option [#136](https://github.com/toy/image_optim/pull/136) [@mrk21](https://github.com/mrk21)
 * Minimize number of file system calls in default implementation of `optimized?` [#137](https://github.com/toy/image_optim/issues/137) [@toy](https://github.com/toy)
@@ -265,7 +283,7 @@
 
 * Warn if directly added files are not images or are not optimizable [@toy](https://github.com/toy)
 * Recursively scan directories for images [#4](https://github.com/toy/image_optim/issues/4) [@toy](https://github.com/toy)
-* Typo in bin/image_optim  [#3](https://github.com/toy/image_optim/issues/3) [@fabiomcosta](https://github.com/fabiomcosta)
+* Typo in bin/image_optim [#3](https://github.com/toy/image_optim/issues/3) [@fabiomcosta](https://github.com/fabiomcosta)
 
 ## v0.5.1 (2012-08-07)
 

data/Gemfile

@@ -12,5 +12,4 @@ end
 
 if RUBY_VERSION >= '2.0'
   gem 'travis_check_rubies', '~> 0.2'
-  gem 'rainbow', '!= 2.2.1' # TODO: remove when sickill/rainbow#44 is resolved
 end

data/README.markdown

@@ -11,7 +11,7 @@
 Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg) 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)
+  (will use [zopfli](https://code.google.com/p/zopfli/) on default/maximum level 4)
 * [gifsicle](http://www.lcdf.org/gifsicle/)
 * [jhead](http://www.sentex.net/~mwandel/jhead/)
 * [jpegoptim](http://www.kokkonen.net/tjko/projects.html)
@@ -57,9 +57,11 @@ gem 'image_optim_pack'
 With version:
 
 <!---<update-version>-->
+
 ```ruby
-gem 'image_optim', '~> 0.24'
+gem 'image_optim', '~> 0.26'
 ```
+
 <!---</update-version>-->
 
 If you want to check latest changes:
@@ -241,7 +243,7 @@ image_optim.optimize_images_data(datas)
 
 ### From rails
 
-Rails image assets optimization is extracted into [image\_optim\_rails gem](https://github.com/toy/image_optim_rails).
+Rails image assets optimization is extracted into [image_optim_rails gem](https://github.com/toy/image_optim_rails).
 
 ## Configuration
 
@@ -263,79 +265,92 @@ optipng:
 
 ## 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`)*
-* `:threads` — Number of threads or disable *(defaults to number of processors)*
-* `:verbose` — Verbose output *(defaults to `false`)*
-* `: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 *(defaults to `nil`)*
-* `:skip_missing_workers` — Skip workers with missing or problematic binaries *(defaults to `false`)*
-* `:allow_lossy` — Allow lossy workers and optimizations *(defaults to `false`)*
+* `: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`)_
+* `:threads` — Number of threads or disable _(defaults to number of processors)_
+* `:verbose` — Verbose output _(defaults to `false`)_
+* `: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 _(defaults to `nil`)_
+* `:skip_missing_workers` — Skip workers with missing or problematic binaries _(defaults to `false`)_
+* `:allow_lossy` — Allow lossy workers and optimizations _(defaults to `false`)_
 * `:cache_dir` — Configure cache directory
 * `:cache_worker_digests` - Also cache worker digests along with original file digest and worker options: updating workers invalidates cache
-* `:timeout` — Number of seconds before workers are timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+* `:timeout` — Number of seconds before workers are timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 Worker can be disabled by passing `false` instead of options hash or by setting option `:disable` to `true`.
 
 <!---<worker-options>-->
+
 <!-- markdown for worker options is generated by `script/update_worker_options_in_readme` -->
 
 ### advpng:
-* `:level` — Compression level: `0` - don't compress, `1` - fast, `2` - normal, `3` - extra, `4` - extreme *(defaults to `4`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `:level` — Compression level: `0` - don't compress, `1` - fast, `2` - normal, `3` - extra, `4` - extreme _(defaults to `4`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### gifsicle:
+
 * `:interlace` — 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)
-* `:level` — Compression level: `1` - light and fast, `2` - normal, `3` - heavy (slower) *(defaults to `3`)*
-* `:careful` — Avoid bugs with some software *(defaults to `false`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+* `:level` — Compression level: `1` - light and fast, `2` - normal, `3` - heavy (slower) _(defaults to `3`)_
+* `:careful` — Avoid bugs with some software _(defaults to `false`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### jhead:
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### 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`)*
-* `:max_quality` — Maximum image quality factor `0`..`100`, ignored in default/lossless mode *(defaults to `100`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `: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`)_
+* `:max_quality` — Maximum image quality factor `0`..`100`, ignored in default/lossless mode _(defaults to `100`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### 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`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `: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`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### jpegtran:
-* `:copy_chunks` — Copy all chunks *(defaults to `false`)*
-* `:progressive` — Create progressive JPEG file *(defaults to `true`)*
-* `:jpegrescan` — Use jpegtran through jpegrescan, ignore progressive option *(defaults to `false`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `:copy_chunks` — Copy all chunks _(defaults to `false`)_
+* `:progressive` — Create progressive JPEG file _(defaults to `true`)_
+* `:jpegrescan` — Use jpegtran through jpegrescan, ignore progressive option _(defaults to `false`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### optipng:
-* `:level` — Optimization level preset: `0` is least, `7` is best *(defaults to `6`)*
-* `:interlace` — Interlace: `true` - interlace on, `false` - interlace off, `nil` - as is in original image *(defaults to `false`)*
-* `:strip` — Remove all auxiliary chunks *(defaults to `true`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `:level` — Optimization level preset: `0` is least, `7` is best _(defaults to `6`)_
+* `:interlace` — Interlace: `true` - interlace on, `false` - interlace off, `nil` - as is in original image _(defaults to `false`)_
+* `:strip` — Remove all auxiliary chunks _(defaults to `true`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### pngcrush:
-* `:chunks` — List of chunks to remove or `:alla` - all except tRNS/transparency or `:allb` - all except tRNS and gAMA/gamma *(defaults to `:alla`)*
-* `:fix` — Fix otherwise fatal conditions such as bad CRCs *(defaults to `false`)*
-* `:brute` — Brute force try all methods, very time-consuming and generally not worthwhile *(defaults to `false`)*
-* `:blacken` — Blacken fully transparent pixels *(defaults to `true`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `:chunks` — List of chunks to remove or `:alla` - all except tRNS/transparency or `:allb` - all except tRNS and gAMA/gamma _(defaults to `:alla`)_
+* `:fix` — Fix otherwise fatal conditions such as bad CRCs _(defaults to `false`)_
+* `:brute` — Brute force try all methods, very time-consuming and generally not worthwhile _(defaults to `false`)_
+* `:blacken` — Blacken fully transparent pixels _(defaults to `true`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### pngout:
-* `:copy_chunks` — Copy optional chunks *(defaults to `false`)*
-* `:strategy` — Strategy: `0` - xtreme, `1` - intense, `2` - longest Match, `3` - huffman Only, `4` - uncompressed *(defaults to `0`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `:copy_chunks` — Copy optional chunks _(defaults to `false`)_
+* `:strategy` — Strategy: `0` - xtreme, `1` - intense, `2` - longest Match, `3` - huffman Only, `4` - uncompressed _(defaults to `0`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### pngquant:
-* `:allow_lossy` — Allow quality option *(defaults to `false`)*
-* `:quality` — 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 *(defaults to `100..100`, `0..100` in lossy mode)*
-* `:speed` — speed/quality trade-off: `1` - slow, `3` - default, `11` - fast & rough *(defaults to `3`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `:allow_lossy` — Allow quality option _(defaults to `false`)_
+* `:max_colors` — Maximum number of colors to use _(defaults to `256`)_
+* `:quality` — 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 _(defaults to `100..100`, `0..100` in lossy mode)_
+* `:speed` — speed/quality trade-off: `1` - slow, `3` - default, `11` - fast & rough _(defaults to `3`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 ### svgo:
-* `:disable_plugins` — List of plugins to disable *(defaults to `[]`)*
-* `:enable_plugins` — List of plugins to enable *(defaults to `[]`)*
-* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. *(defaults to `0`)*
+
+* `:disable_plugins` — List of plugins to disable _(defaults to `[]`)_
+* `:enable_plugins` — List of plugins to enable _(defaults to `[]`)_
+* `:timeout` — Number of seconds before worker is timed out. Must be greater than 0 to enable timeout. _(defaults to `0`)_
 
 <!---</worker-options>-->
 
@@ -345,10 +360,6 @@ Worker can be disabled by passing `false` instead of options hash or by setting
 
 If you would like to contribute - that is great and you are very welcome. Please check few notes in file [CONTRIBUTING.markdown](CONTRIBUTING.markdown).
 
-Financial contributions can be made via [gratipay](https://gratipay.com/toy/).
-
-[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.2/dist/gratipay.png)](https://gratipay.com/toy/)
-
 ## ChangeLog
 
 In separate file [CHANGELOG.markdown](CHANGELOG.markdown).

data/bin/image_optim

@@ -10,7 +10,7 @@ options = ImageOptim::Runner::OptionParser.parse!(args)
 
 begin
   if options[:verbose]
-    $stderr.puts ImageOptim.full_version
+    $stderr << "#{ImageOptim.full_version}\n"
   end
 
   only_info = options.delete(:only_info)

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'discourse_image_optim'
-  s.version     = '0.24.5'
+  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.authors     = ['Ivan Kuchin']
@@ -28,7 +28,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.0'
-    s.add_development_dependency 'rubocop', '~> 0.47'
+  if RUBY_VERSION >= '2.1'
+    s.add_development_dependency 'rubocop', '~> 0.52'
   end
 end

data/lib/image_optim/bin_resolver/bin.rb

@@ -5,6 +5,7 @@ require 'image_optim/cmd'
 require 'image_optim/path'
 require 'shellwords'
 require 'digest/sha1'
+require 'date'
 
 class ImageOptim
   class BinResolver

data/lib/image_optim/runner/option_parser.rb

@@ -225,7 +225,9 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator nil
   op.separator '  Common options:'
 
-  op.on_tail('-v', '--verbose', 'Verbose output') do
+  op.on_tail('-v', '--verbose', 'Verbose output (show global and worker '\
+      'config, binary resolution log, information about each tool invocation, '\
+      'backtrace of exception)') do
     options[:verbose] = true
   end
 

data/lib/image_optim/worker/jhead.rb

@@ -1,5 +1,5 @@
 require 'image_optim/worker'
-require 'exifr'
+require 'exifr/jpeg'
 
 class ImageOptim
   class Worker

data/lib/image_optim/worker/jpegtran.rb

@@ -14,7 +14,7 @@ class ImageOptim
       option(:progressive, true, 'Create progressive JPEG file'){ |v| !!v }
 
       JPEGRESCAN_OPTION =
-      option(:jpegrescan, false, 'Use jpegtran through jpegrescan, '\
+      option(:jpegrescan, true, 'Use jpegtran through jpegrescan, '\
           'ignore progressive option'){ |v| !!v }
 
       TIMEOUT_OPTION = timeout_option

data/lib/image_optim/worker/pngquant.rb

@@ -9,6 +9,11 @@ class ImageOptim
       ALLOW_LOSSY_OPTION =
       option(:allow_lossy, false, 'Allow quality option'){ |v| !!v }
 
+      MAX_COLORS_OPTION =
+      option(:max_colors, 256, 'Maximum number of colors to use') do |v|
+        OptionHelpers.limit_with_range(v.to_i, 2..256)
+      end
+
       QUALITY_OPTION =
       option(:quality, '`100..100`, `0..100` in lossy mode',
              NonNegativeIntegerRange, 'min..max - don\'t '\
@@ -51,6 +56,7 @@ class ImageOptim
           --speed=#{speed}
           --output=#{dst}
           --force
+          #{max_colors}
           --
           #{src}
         ]

data/lib/image_optim/worker.rb

@@ -143,7 +143,8 @@ class ImageOptim
         %W[
           env PATH=#{@image_optim.env_path.shellescape}
           nice -n #{@image_optim.nice}
-          #{cmd_args.shelljoin} > #{Path::NULL} 2>&1
+          #{cmd_args.shelljoin}
+          > #{Path::NULL} 2>&1
         ].join(' ')
       else
         [

data/script/worker_analysis

@@ -133,8 +133,10 @@ class Analyser
 
   # Delegate to worker with short id
   class WorkerVariant < DelegateClass(ImageOptim::Worker)
-    attr_reader :name, :id, :cons_id
+    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)
@@ -143,6 +145,10 @@ class Analyser
       @cons_id = [klass, allow_consecutive_on.map{ |key| [key, send(key)] }]
     end
 
+    def run_order
+      @run_order || super
+    end
+
     def etag
       [
         id,
@@ -155,7 +161,8 @@ class Analyser
 
     def bin_versions
       @bin_versions ||= used_bins.map do |name|
-        @image_optim.resolve_bin!(name).to_s
+        bin = @image_optim.resolve_bin!(name)
+        "#{bin.name} #{bin.version}"
       end
     end
 
@@ -189,7 +196,7 @@ class Analyser
 
       dst_size = success ? dst.size : nil
       digest = (success ? dst : src).digest
-      cache = digest.sub(/../, '\0/') + ".#{src.image_format}"
+      cache = digest.sub(/../, '\0/')
       result = new(worker.id, success, time, src.size, dst_size, cache)
       if success
         path = result.path
@@ -274,7 +281,9 @@ class Analyser
     end
 
     def run_workers(src, workers, last_result = nil, &block)
+      required_workers = workers.select(&:required)
       with_progress(workers, last_result) do |worker|
+        next if required_workers.any?{ |w| w.run_order < worker.run_order }
         worker_result, result_image = run_worker(src, worker)
 
         steps = (last_result ? last_result.steps : []) + [worker_result]
@@ -306,19 +315,12 @@ class Analyser
     def difference_with(other)
       run_cache[:difference][other.digest] ||=
       Cache.get(:difference, [@path.digest, other.digest].sort, nil) do
-        images = [flatten_animation(@path), flatten_animation(other)]
-
-        alpha_presence = images.map do |image|
-          Cmd.capture("identify -format '%A' #{image.to_s.shellescape}")
-        end
-        if alpha_presence.uniq.length == 2
-          images.map!{ |image| underlay_noise(image) }
-        end
+        images = for_compare(@path, other)
 
         nrmse = Cmd.capture(%W[
           convert
-          #{images[0]} -auto-orient
-          #{images[1]} -auto-orient
+          #{images[0].image_format}:#{images[0]} -auto-orient
+          #{images[1].image_format}:#{images[1]} -auto-orient
           -metric RMSE
           -compare
           -format %[distortion]
@@ -331,16 +333,33 @@ class Analyser
       end
     end
 
+    def for_compare(*images)
+      images.map!{ |image| flatten_animation(image) }
+
+      alpha_presence = images.map do |image|
+        !!Cmd.capture(%W[
+          identify
+          -format %A
+          #{image.image_format}:#{image.to_s.shellescape}
+        ].shelljoin)[/true/i]
+      end
+      if alpha_presence.uniq.length != 1
+        images.map!{ |image| underlay_noise(image) }
+      end
+
+      images
+    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.image_format}:#{image}
             -coalesce
             -append
-            #{flattened}
+            #{image.image_format}:#{flattened}
           ]) || fail("failed flattening of #{image}")
           flattened
         else
@@ -354,12 +373,12 @@ class Analyser
         with_noise = image.temp_path
         Cmd.run(*%W[
           convert
-          #{image}
+          #{image.image_format}:#{image}
           +noise Random
-          #{image}
+          #{image.image_format}:#{image}
           -flatten
           -alpha off
-          #{with_noise}
+          #{image.image_format}:#{with_noise}
         ]) || fail("failed underlaying noise to #{image}")
         with_noise
       end
@@ -455,25 +474,24 @@ class Analyser
     end
   end
 
-  def initialize(option_variants)
-    option_variants = HashHelpers.deep_symbolise_keys(option_variants)
+  def initialize(config)
+    config = HashHelpers.deep_symbolise_keys(config)
     image_optim = ImageOptim.new
 
     @workers_by_format = Hash.new{ |h, k| h[k] = [] }
     ImageOptim::Worker.klasses.each do |klass|
-      worker_options_config = option_variants.delete(klass.bin_sym) || {}
-      allow_consecutive_on = worker_options_config.delete(:allow_consecutive_on)
-      worker_option_variants = case worker_options_config
-      when Array
-        worker_options_config
-      when Hash
-        worker_options_config.variants
-      else
-        fail "Array or Hash expected, got #{worker_options_config}"
+      worker_config = config.delete(klass.bin_sym)
+      next if worker_config == false
+      worker_config ||= {}
+
+      option_variants = worker_config.delete(:variants) || [{}]
+      option_variants = case option_variants
+      when Array then option_variants
+      when Hash then option_variants.variants
+      else fail "Array or Hash expected, got #{option_variants}"
       end
-      worker_option_variants.each do |options|
-        options = HashHelpers.deep_symbolise_keys(options)
-        options[:allow_consecutive_on] = allow_consecutive_on
+      option_variants.each do |options|
+        options = HashHelpers.deep_symbolise_keys(options).merge(worker_config)
         worker = WorkerVariant.new(klass, image_optim, options)
         worker.image_formats.each do |format|
           @workers_by_format[format] << worker
@@ -483,7 +501,7 @@ class Analyser
 
     log_workers_by_format
 
-    fail "unknown variants: #{option_variants}" unless option_variants.empty?
+    fail "unknown variants: #{config}" unless config.empty?
   end
 
   def analyse(paths)
@@ -553,7 +571,30 @@ private
   end
 end
 
-def option_variants
+abort <<-HELP if ARGV.empty?
+Specify paths for analysis.
+
+Example of `.analysis_variants.yml`:
+  jhead:
+    required: true # don't skip this worker
+  jpegtran: # 3 worker variants
+    variants:
+      - jpegrescan: true
+      - progressive: true
+      - progressive: false
+  optipng: # 6 worker variants by combining options
+    variants:
+      level: [6, 7]
+      interlace: [true, false, nil]
+  gifsicle: # allow variants with different interlace to run consecutively
+    variants:
+      allow_consecutive_on: interlace
+      interlace: [true, false]
+      careful: [true, false]
+  # other workers will be used with default options
+HELP
+
+Analyser.new(begin
   path = '.analysis_variants.yml'
   case h = YAML.load_file(path)
   when Hash then h
@@ -563,27 +604,4 @@ def option_variants
 rescue Errno::ENOENT => e
   warn e
   {}
-end
-
-analyser = Analyser.new(option_variants)
-
-if ARGV.empty?
-  abort <<-HELP
-Specify paths for analysis.
-
-Example of `.analysis_variants.yml`:
-  jpegtran: # 3 worker variants
-    - jpegrescan: true
-    - progressive: true
-    - progressive: false
-  optipng: # 6 worker variants by combining options
-    level: [6, 7]
-    interlace: [true, false, nil]
-  gifsicle: # allow variants with different interlace to run consecutively
-    allow_consecutive_on: interlace
-    interlace: [true, false]
-    careful: [true, false]
-  # other workers will be used with default options
-  HELP
-end
-analyser.analyse(ARGV)
+end).analyse(ARGV)

data/vendor/jpegrescan

@@ -1,11 +1,19 @@
-#!/usr/bin/perl -ws
+#!/usr/bin/env perl
 # jpegrescan by Loren Merritt
 # Last updated: 2008-11-29 / 2013-03-19
 # This code is public domain.
 
-use File::Slurp;
+use warnings;
 use File::Temp qw/ tempfile /;
 
+%switches = ();
+while (@ARGV && $ARGV[0] =~ /^-.+/) {
+    for (shift @ARGV) {
+        m/^--$/ && last;
+        m/^-([svq])$/ && do { $switches{$1} = 1; next; };
+        die "Unknown switch: $_";
+    }
+}
 @ARGV==2 or die "usage: jpegrescan in.jpg out.jpg
 tries various progressive scan orders
 switches:
@@ -15,26 +23,49 @@ switches:
 ";
 $fin = $ARGV[0];
 $fout = $ARGV[1];
-(undef, $ftmp) = tempfile(SUFFIX => ".scan");
-$jtmp = $fout;
-$verbose = $v;
-$quiet = $q;
-@strip = $s ? ("-copy","none") : ("-copy","all");
-undef $_ for $v,$q,$s;
+(undef, $meta_tmp) = tempfile(SUFFIX => ".scan");
+(undef, $baseline_tmp) = tempfile(SUFFIX => ".jpg");
+$output_tmp = $fout;
+$verbose = $switches{'v'};
+$quiet = $switches{'q'};
+@strip = $switches{'s'} ? ("-copy","none") : ("-copy","all");
 undef $/;
 $|=1;
 
+sub read_file {
+    my ($path) = @_;
+    my $data;
+
+    open my $fh, '<', $path
+        or die "Could not open file $path: $!\n";
+    binmode $fh;
+    $data = <$fh>;
+    close $fh
+        or die "Could not close $path: $!\n";
+
+    return $data;
+}
+
+sub write_file {
+    my ($path, $data) = @_;
+
+    open my $fh, '>', $path
+        or die "Could not open file $path: $!\n";
+    binmode $fh;
+    print $fh $data;
+    close $fh
+        or die "Could not close $path: $!\n";
+}
+
 # convert the input to baseline, just to make all the other conversions faster
 # FIXME there's still a bunch of redundant computation in separate calls to jpegtran
 open $OLDERR, ">&", STDERR;
-open STDERR, ">", $ftmp;
-open TRAN, "-|", "jpegtran", "-v", @strip, "-optimize", $fin or die;
-write_file($jtmp, <TRAN>);
-close TRAN;
+open STDERR, ">", $meta_tmp;
+system("jpegtran", "-v", @strip, "-optimize", "-outfile", $baseline_tmp, $fin) == 0 or die;
 open STDERR, ">&", $OLDERR;
 
-$type = read_file($ftmp);
-$type =~ /components=(\d+)/ or die;
+$type = read_file($meta_tmp);
+$type =~ /components=(\d+)/ or die "Could not find components=\d+ in $type";
 $rgb = $1==3 ? 1 : $1==1 ? 0 : die "not RGB nor gray\n";
 
 # FIXME optimize order for either progressive transfer or decoding speed
@@ -55,10 +86,9 @@ sub canonize {
 sub try {
     my $txt = canonize(shift);
     return $memo{$txt} if $memo{$txt};
-    write_file($ftmp, $txt);
-    open TRAN, "-|", "jpegtran", @strip, "-scans", $ftmp, $jtmp or die;
-    $data = <TRAN>;
-    close TRAN;
+    write_file($meta_tmp, $txt);
+    system("jpegtran", @strip, "-scans", $meta_tmp, "-outfile", $output_tmp, $baseline_tmp) == 0 or die;
+    $data = read_file($output_tmp);
     my $s = length $data;
     $s or die;
     $memo{$txt} = $s;
@@ -140,4 +170,4 @@ $old_size = -s $fin;
 if($size < $old_size) {
     write_file($fout, $data);
 }
-unlink $ftmp;
+unlink $meta_tmp, $baseline_tmp;

data/vendor/jpegrescan.bat

@@ -0,0 +1,6 @@
+@ECHO OFF
+IF NOT "%~f0" == "~f0" GOTO :WinNT
+@"perl" %1 %2 %3 %4 %5 %6 %7 %8 %9
+GOTO :EOF
+:WinNT
+@"%~dpn0.exe" %*

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_image_optim
 version: !ruby/object:Gem::Version
-  version: 0.24.5
+  version: 0.26.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.52'
 description: 
 email: 
 executables:
@@ -250,6 +250,7 @@ files:
 - spec/images/vergroessert.jpg
 - spec/spec_helper.rb
 - vendor/jpegrescan
+- vendor/jpegrescan.bat
 homepage: http://github.com/toy/discourse_image_optim
 licenses:
 - MIT
@@ -272,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: discourse_image_optim
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg)