image_optim 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b7d1d96cc0bc6f16e0a2b6a512c4ad06015eea55359dcc9c32c2b19714c786
-  data.tar.gz: be1136efd362c8f13f8a286728fc3c49f62af439cdea90d60c68e4093c1be72a
+  metadata.gz: ec91f27b4e53d23a3516908c5714011fb47bbc251e95ef9952acc62948d123af
+  data.tar.gz: 8b5a675e29709e03bf5ca0567ae742f8d4d7f3d7e90f89ac5ef8c1935c594555
 SHA512:
-  metadata.gz: 82ac7498fa95948f7e6a6380695be2da56436245d4fd595d704b4a8e78d59bb4c483690e8a8ac992ea5bf34fc0f37180ea1e103d76c8ac523975bd8a7690b1e5
-  data.tar.gz: cb3d17d491ec5accbf9d94caac4725b849e5e42f212b464b1a08b1f0545f0844193154c8c2c141377193a5234e45b70a207fb4a642f2625e0668e08e8821f046
+  metadata.gz: 847ee0b721a90d761ccfa4948c979e532dfd53d52f2e4c82e9df1e3301bcaba6a4217f98ae5cd5be2bcd7407339614710bd95ef381e9d422e778a4674ddeb81b
+  data.tar.gz: 7f5b009a16df3c671ebc9a8c934cb499fd7ac47a0a464d33130ab1197ffa4b9c1f2767467226124dbd78281bcffd7864c058d8f3ff9fe7b58addfd3b6411ace7

data/.rubocop.yml

@@ -30,6 +30,9 @@ Layout/IndentHash:
 Layout/IndentHeredoc:
   Enabled: false
 
+Layout/RescueEnsureAlignment:
+  Enabled: false
+
 Layout/SpaceBeforeBlockBraces:
   EnforcedStyle: no_space
   EnforcedStyleForEmptyBraces: no_space
@@ -51,7 +54,7 @@ Lint/UnneededSplatExpansion:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 30
+  Max: 33
 
 Metrics/BlockLength:
   Exclude:
@@ -63,7 +66,10 @@ Metrics/ClassLength:
   Max: 150
 
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 11
+
+Metrics/LineLength:
+  Max: 120
 
 Metrics/MethodLength:
   Max: 25

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## 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/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

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.26.2'
+  s.version     = '0.26.3'
   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.authors     = ['Ivan Kuchin']
@@ -36,6 +36,6 @@ 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'
+    s.add_development_dependency 'rubocop', '~> 0.59'
   end
 end

data/lib/image_optim.rb

@@ -118,6 +118,7 @@ class ImageOptim
     end
 
     return unless optimized
+
     OptimizedPath.new(optimized, original)
   end
 
@@ -126,6 +127,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 +136,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

@@ -97,6 +97,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 +109,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

@@ -23,6 +23,7 @@ class ImageOptim
 
       def digest
         return @digest if defined?(@digest)
+
         @digest = File.exist?(@path) && Digest::SHA1.file(@path).hexdigest
       end
 
@@ -32,20 +33,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 +68,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 +81,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 +103,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+)+/]

data/lib/image_optim/cache.rb

@@ -7,6 +7,7 @@ class ImageOptim
   class Cache
     def initialize(image_optim, workers_by_format)
       return unless image_optim.cache_dir
+
       @cache_dir = FSPath.new(image_optim.cache_dir)
       @cache_worker_digests = image_optim.cache_worker_digests
       @options_by_format = Hash[workers_by_format.map do |format, workers|

data/lib/image_optim/config.rb

@@ -32,10 +32,12 @@ class ImageOptim
           return {}
         end
         return {} unless File.size?(full_path)
+
         config = YAML.load_file(full_path)
         unless config.is_a?(Hash)
           fail "expected hash, got #{config.inspect}"
         end
+
         HashHelpers.deep_symbolise_keys(config)
       rescue => e
         warn "exception when reading #{full_path}: #{e}"
@@ -77,6 +79,7 @@ class ImageOptim
     def assert_no_unused_options!
       unknown_options = @options.reject{ |key, _value| @used.include?(key) }
       return if unknown_options.empty?
+
       fail ConfigurationError, "unknown options #{unknown_options.inspect}"
     end
 
@@ -131,6 +134,7 @@ class ImageOptim
       true
     rescue LoadError => e
       raise "Cannot load image_optim_pack: #{e}" if pack
+
       false
     end
 

data/lib/image_optim/handler.rb

@@ -39,6 +39,7 @@ class ImageOptim
       @dst ||= @original.temp_path
 
       return unless yield @src, @dst
+
       @result = @dst
       if @src == @original
         @src, @dst = @dst, nil
@@ -50,6 +51,7 @@ class ImageOptim
     # Remove extra temp files
     def cleanup
       return unless @dst
+
       @dst.unlink
       @dst = nil
     end

data/lib/image_optim/runner.rb

@@ -104,6 +104,7 @@ class ImageOptim
         if File.file?(path)
           next if exclude_file?(dir, path)
           next unless @image_optim.optimizable?(path)
+
           to_optimize << path
         elsif File.directory?(path)
           Find.prune if dir != path && exclude_dir?(dir, path)

data/lib/image_optim/runner/option_parser.rb

@@ -185,6 +185,7 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
 
   ImageOptim::Worker.klasses.each_with_index do |klass, i|
     next if klass.option_definitions.empty?
+
     op.separator nil unless i.zero?
 
     bin = klass.bin_sym

data/lib/image_optim/worker.rb

@@ -23,6 +23,7 @@ class ImageOptim
       unless image_optim.is_a?(ImageOptim)
         fail ArgumentError, 'first parameter should be an ImageOptim instance'
       end
+
       @image_optim = image_optim
       parse_options(options)
       assert_no_unknown_options!(options)
@@ -49,6 +50,7 @@ class ImageOptim
       unless format_from_name
         fail "#{self.class}: can't guess applicable format from worker name"
       end
+
       [format_from_name.to_sym]
     end
 
@@ -68,6 +70,7 @@ class ImageOptim
         @image_optim.resolve_bin!(bin)
       end
       return if errors.empty?
+
       fail BinResolver::Error, wrap_resolver_error_message(errors.join(', '))
     end
 
@@ -98,6 +101,7 @@ class ImageOptim
       known_keys = self.class.option_definitions.map(&:name)
       unknown_options = options.reject{ |key, _value| known_keys.include?(key) }
       return if unknown_options.empty?
+
       fail ConfigurationError, "unknown options #{unknown_options.inspect} "\
           "for #{self}"
     end

data/lib/image_optim/worker/class_methods.rb

@@ -83,6 +83,7 @@ class ImageOptim
         klasses.map do |klass|
           options = options_proc[klass]
           next if options[:disable]
+
           if !options.key?(:allow_lossy) && klass.method_defined?(:allow_lossy)
             options[:allow_lossy] = image_optim.allow_lossy
           end

data/lib/image_optim/worker/jhead.rb

@@ -25,6 +25,7 @@ class ImageOptim
 
       def optimize(src, dst)
         return false unless oriented?(src)
+
         src.copy(dst)
         args = %W[
           -autorot

data/lib/image_optim/worker/pngout.rb

@@ -35,6 +35,7 @@ class ImageOptim
       rescue SignalException => e
         raise unless Signal.list.key(e.signo) == 'SEGV'
         raise unless resolve_bin!(:pngout).version <= '20150920'
+
         warn "pngout caused Segmentation fault for #{src}"
       end
     end

data/script/worker_analysis

@@ -118,8 +118,10 @@ class Analyser
       def get!(key, etag)
         raw = DB[Marshal.dump(key)]
         return unless raw
+
         entry = Marshal.load(raw)
         return unless entry[1] == etag
+
         entry[0]
       end
 
@@ -175,6 +177,7 @@ class Analyser
 
     def options_string(options)
       return '' if options.empty?
+
       "(#{options.sort.map{ |k, v| "#{k}:#{v.inspect}" }.join(', ')})"
     end
   end
@@ -284,6 +287,7 @@ class Analyser
       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]
@@ -329,6 +333,7 @@ class Analyser
         unless $CHILD_STATUS.success?
           fail "failed comparison of #{@path} with #{other}"
         end
+
         nrmse
       end
     end
@@ -482,6 +487,7 @@ class Analyser
     ImageOptim::Worker.klasses.each do |klass|
       worker_config = config.delete(klass.bin_sym)
       next if worker_config == false
+
       worker_config ||= {}
 
       option_variants = worker_config.delete(:variants) || [{}]

data/spec/image_optim/bin_resolver_spec.rb

@@ -278,9 +278,9 @@ describe ImageOptim::BinResolver do
       bin = Bin.new(:advpng, '/bin/advpng')
 
       expect(Bin).to receive(:new).and_return(bin)
-      allow(bin).to receive(:version).and_return(SimpleVersion.new('1.15'))
+      allow(bin).to receive(:version).and_return(SimpleVersion.new('none'))
 
-      expect(bin).to receive(:warn).once.with(match(/does not use zopfli/))
+      expect(bin).to receive(:warn).once.with(match(/is of unknown version/))
 
       5.times do
         resolver.resolve!(:pngcrush)

data/spec/spec_helper.rb

@@ -53,6 +53,7 @@ def mepp(image_a, image_b)
   unless [0, 1].include?($CHILD_STATUS.exitstatus)
     fail "compare #{image_a} with #{image_b} failed with `#{output}`"
   end
+
   num_r = '\d+(?:\.\d+(?:[eE][-+]?\d+)?)?'
   output[/\((#{num_r}), #{num_r}\)/, 1].to_f
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -138,14 +138,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '0.59'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '0.59'
 description: 
 email: 
 executables:
@@ -263,7 +263,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim/issues
   changelog_uri: https://github.com/toy/image_optim/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.26.2
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.26.3
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem