image_optim 0.24.0 → 0.24.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmNjZjBjNmNkYzRmNjQxMmZkMDg3ZGYzYjY5MTQ3MjllYmVjOTQ1MQ==
-  data.tar.gz: !binary |-
-    YmZlNWUxYzFmZmU4NDFmZjgxZDYwOTNlNzBlZTA0NTc0YzQ4NzJkNA==
+SHA1:
+  metadata.gz: bb7d895e52e7a9630b4c7d6970b8619a6d121fa1
+  data.tar.gz: 5a806c1499ef299274fcc427c2718262a4e94ee3
 SHA512:
-  metadata.gz: !binary |-
-    NGYzMjA1MTMxMTJhMzM1ODg1NTc4MGIyNzk5ZWNiMzFkMGRlMjQ5OTZjNTFm
-    YjJiZTdkZjgxYmQ3Y2U2MmNhMmRhYzE0YjkxZmJlY2EwMTg1MDNiMjUyMGNk
-    NjFhYWM3ZGVlOWY4MTRjYjg4ZDUwZmUyMzI1OTBhYTM4ZDI4ZGY=
-  data.tar.gz: !binary |-
-    MjQ0MjZkN2RhYjYyMWU2ZWJhYTVhMDkyMjI3YWY0NTM1ZTgxN2U5YjY2NTM3
-    YmQ3OWNkNzNjZmI4NjFjM2I0YTYxZWE1ODQ5ZjU0ODYyNTVkOGZjMmE1MDE4
-    YjIyODM5OTI3YzQ5N2Y4MmYxMDFkYTc0OGQ2MmNkMjQ4MGZmMGQ=
+  metadata.gz: 9c3745cbf55f2b9bcd4a3f9cf64c680790a13cfc3da4fadad950f5f7a997199768442b6fc8d781cbc7d5ed22ddcdc314717b78104168564d4bc13b006b170d4d
+  data.tar.gz: 4e4873812c576ee9428a8dfa20b69b4977f349ee9692fd36740b2266934b310ef96abec8d7f78531d2dddeef243d308e8ee444ca56c236f372e58bf594fca519

data/.rubocop.yml

@@ -6,9 +6,18 @@ AllCops:
 Lint/EndAlignment:
   AlignWith: variable
 
+Lint/UnneededSplatExpansion:
+  Enabled: false
+
 Metrics/AbcSize:
   Max: 30
 
+Metrics/BlockLength:
+  Exclude:
+    - 'lib/image_optim/runner/option_parser.rb'
+    - 'script/worker_analysis'
+    - 'spec/**/*.rb'
+
 Metrics/ClassLength:
   Max: 150
 

data/.travis.yml

@@ -34,6 +34,8 @@ before_install: |
       }
     fi
   )
+after_success:
+  - if [ -n "$CODECLIMATE" ]; then bundle exec codeclimate-test-reporter; fi
 matrix:
   fast_finish: true
   include:

data/CHANGELOG.markdown

@@ -2,6 +2,12 @@
 
 ## unreleased
 
+## v0.24.1 (2016-11-20)
+
+* Use `image_size ~> 1.5` with `apng` detection, so apng images are not optimised to one frame version [#142](https://github.com/toy/image_optim/issues/142) [@toy](https://github.com/toy)
+* Don't show `?` for unknown bin version in message about inability to determine version [@toy](https://github.com/toy)
+* Deduplicate bin resolving error messages [@toy](https://github.com/toy)
+
 ## 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)
@@ -237,7 +243,7 @@
 
 ## v0.7.1 (2013-01-17)
 
-* Use more compatible redirect syntax `>&` [#9](https://github.com/toy/image_optim/issues/9) @"Chris Thompson"
+* Use more compatible redirect syntax `>&` [#9](https://github.com/toy/image_optim/issues/9) [@teaforthecat](https://github.com/teaforthecat)
 
 ## v0.7.0 (2013-01-17)
 

data/Gemfile

@@ -3,5 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['CODECLIMATE']
-  gem 'codeclimate-test-reporter', :group => :test, :require => nil
+  group :test do
+    gem 'simplecov'
+    gem 'codeclimate-test-reporter'
+  end
 end

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.24.0'
+  s.version     = '0.24.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']
@@ -21,7 +21,7 @@ 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.3'
+  s.add_dependency 'image_size', '~> 1.5'
   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'

data/lib/image_optim/bin_resolver/bin.rb

@@ -48,7 +48,9 @@ class ImageOptim
 
       # Fail if version will not work properly
       def check_fail!
-        fail UnknownVersion, "didn't get version of #{self}" unless version
+        unless version
+          fail UnknownVersion, "could not get version of #{name} at #{path}"
+        end
 
         FAIL_CHECKS.each do |bin_name, matcher, message|
           next unless bin_name == name

data/lib/image_optim/worker/class_methods.rb

@@ -65,11 +65,12 @@ class ImageOptim
         end
 
         unless errors.empty?
+          messages = errors.map(&:to_s).uniq
           if image_optim.skip_missing_workers
-            errors.each{ |error| warn error }
+            messages.each{ |message| warn message }
           else
-            message = ['Bin resolving errors:', *errors].join("\n")
-            fail BinResolver::Error, message
+            joint_message = ['Bin resolving errors:', *messages].join("\n")
+            fail BinResolver::Error, joint_message
           end
         end
 

data/script/worker_analysis

@@ -81,10 +81,6 @@ Process.times.class.class_eval do
 end
 
 ImageOptim::Path.class_eval do
-  def shellescape
-    to_s.shellescape
-  end
-
   def digest
     @digest ||= Digest::SHA256.file(to_s).hexdigest
   end
@@ -313,13 +309,13 @@ class Analyser
         images = [flatten_animation(@path), flatten_animation(other)]
 
         alpha_presence = images.map do |image|
-          Cmd.capture("identify -format '%A' #{image.shellescape}")
+          Cmd.capture("identify -format '%A' #{image.to_s.shellescape}")
         end
         if alpha_presence.uniq.length == 2
           images.map!{ |image| underlay_noise(image) }
         end
 
-        nrmse_command = %W[
+        nrmse = Cmd.capture(%W[
           convert
           #{images[0]} -auto-orient
           #{images[1]} -auto-orient
@@ -327,8 +323,7 @@ class Analyser
           -compare
           -format %[distortion]
           info:
-        ].shelljoin
-        nrmse = Cmd.capture(nrmse_command).to_f
+        ].shelljoin).to_f
         unless $CHILD_STATUS.success?
           fail "failed comparison of #{@path} with #{other}"
         end
@@ -342,14 +337,11 @@ class Analyser
           flattened = image.temp_path
           Cmd.run(*%W[
             convert
-            #{image.shellescape}
+            #{image}
             -coalesce
             -append
-            #{flattened.shellescape}
-          ])
-          unless $CHILD_STATUS.success?
-            fail "failed flattening of #{image}"
-          end
+            #{flattened}
+          ]) || fail("failed flattening of #{image}")
           flattened
         else
           image
@@ -362,16 +354,13 @@ class Analyser
         with_noise = image.temp_path
         Cmd.run(*%W[
           convert
-          #{image.shellescape}
+          #{image}
           +noise Random
-          #{image.shellescape}
+          #{image}
           -flatten
           -alpha off
-          #{with_noise.shellescape}
-        ])
-        unless $CHILD_STATUS.success?
-          fail "failed underlaying noise to #{image}"
-        end
+          #{with_noise}
+        ]) || fail("failed underlaying noise to #{image}")
         with_noise
       end
     end

data/spec/image_optim/bin_resolver_spec.rb

@@ -255,7 +255,7 @@ describe ImageOptim::BinResolver do
       5.times do
         expect do
           resolver.resolve!(:pngcrush)
-        end.to raise_error Bin::UnknownVersion
+        end.to raise_error Bin::UnknownVersion, %r{pngcrush at /bin/pngcrush}
       end
     end
 
@@ -269,7 +269,7 @@ describe ImageOptim::BinResolver do
       5.times do
         expect do
           resolver.resolve!(:pngcrush)
-        end.to raise_error Bin::BadVersion
+        end.to raise_error Bin::BadVersion, /is known to produce broken pngs/
       end
     end
 
@@ -280,7 +280,7 @@ describe ImageOptim::BinResolver do
       expect(Bin).to receive(:new).and_return(bin)
       allow(bin).to receive(:version).and_return(SimpleVersion.new('1.15'))
 
-      expect(bin).to receive(:warn).once
+      expect(bin).to receive(:warn).once.with(match(/does not use zopfli/))
 
       5.times do
         resolver.resolve!(:pngcrush)

data/spec/image_optim/worker_spec.rb

@@ -160,11 +160,11 @@ describe ImageOptim::Worker do
 
     describe 'with missing workers' do
       let(:workers) do
-        Array.new(3) do |i|
+        %w[a b c c].map do |bin|
           worker = worker_double
-          unless i == 1
+          unless bin == 'b'
             allow(worker).to receive(:resolve_used_bins!).
-              and_raise(BinResolver::BinNotFound, "not found #{i}")
+              and_raise(BinResolver::BinNotFound, "not found #{bin}")
           end
           worker
         end
@@ -176,32 +176,27 @@ describe ImageOptim::Worker do
       end
 
       describe 'if skip_missing_workers is true' do
-        define :bin_not_found do |message|
-          match do |error|
-            error.is_a?(BinResolver::BinNotFound) && error.message == message
-          end
-        end
-
-        it 'shows warnings and returns resolved workers ' do
+        it 'shows deduplicated warnings and returns resolved workers ' do
           allow(image_optim).to receive(:skip_missing_workers).and_return(true)
 
-          expect(Worker).to receive(:warn).
-            once.with(bin_not_found('not found 0'))
-          expect(Worker).to receive(:warn).
-            once.with(bin_not_found('not found 2'))
+          expect(Worker).to receive(:warn).once.with('not found a')
+          expect(Worker).to receive(:warn).once.with('not found c')
 
-          expect(Worker.create_all(image_optim){ {} }).
-            to eq([workers[1]])
+          expect(Worker.create_all(image_optim){ {} }).to eq([workers[1]])
         end
       end
 
       describe 'if skip_missing_workers is false' do
-        it 'fails with a joint exception' do
+        it 'fails with a joint exception of deduplicated messages' do
           allow(image_optim).to receive(:skip_missing_workers).and_return(false)
 
           expect do
             Worker.create_all(image_optim){ {} }
-          end.to raise_error(BinResolver::Error, /not found 0\nnot found 2/)
+          end.to raise_error(BinResolver::Error, [
+            'Bin resolving errors:',
+            'not found a',
+            'not found c',
+          ].join("\n"))
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-if ENV['CODECLIMATE'] && ENV['CODECLIMATE_REPO_TOKEN']
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
+if ENV['CODECLIMATE']
+  require 'simplecov'
+  SimpleCov.start
 end
 
 require 'image_optim/pack'
@@ -26,11 +26,11 @@ def flatten_animation(image)
     flattened = image.temp_path
     command = %W[
       convert
-      #{image.to_s.shellescape}
+      #{image}
       -coalesce
       -append
-      #{flattened.to_s.shellescape}
-    ].join(' ')
+      #{flattened}
+    ].shelljoin
     expect(ImageOptim::Cmd.run(command)).to be_truthy
     flattened
   else
@@ -41,7 +41,7 @@ end
 def mepp(image_a, image_b)
   coalesce_a = flatten_animation(image_a)
   coalesce_b = flatten_animation(image_b)
-  command = %W[
+  output = ImageOptim::Cmd.capture(%W[
     compare
     -metric MEPP
     -alpha Background
@@ -49,14 +49,12 @@ def mepp(image_a, image_b)
     #{coalesce_b.to_s.shellescape}
     #{ImageOptim::Path::NULL}
     2>&1
-  ].join(' ')
-  output = ImageOptim::Cmd.capture(command)
-  if [0, 1].include?($CHILD_STATUS.exitstatus)
-    num_r = '\d+(?:\.\d+(?:[eE][-+]?\d+)?)?'
-    output[/\((#{num_r}), #{num_r}\)/, 1].to_f
-  else
+  ].join(' '))
+  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
 
 RSpec::Matchers.define :be_smaller_than do |expected|
@@ -78,7 +76,7 @@ module CapabilityCheckHelpers
   def any_file_modes_allowed?
     Tempfile.open 'posix' do |f|
       File.chmod(0, f.path)
-      (File.stat(f.path).mode & 0o777).zero?
+      return (File.stat(f.path).mode & 0o777).zero?
     end
   end
 

metadata

@@ -1,131 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: progress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: in_threads
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: image_optim_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.37'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.37'
 description: 
 email: 
 executables:
@@ -133,10 +147,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .appveyor.yml
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".appveyor.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.markdown
 - CONTRIBUTING.markdown
 - Gemfile
@@ -240,24 +254,20 @@ homepage: http://github.com/toy/image_optim
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! 'Rails image assets optimization is extracted into image_optim_rails
-  gem
-
-  You can safely remove `config.assets.image_optim = false` if you are not going to
-  use that gem
-
-'
+post_install_message: |
+  Rails image assets optimization is extracted into image_optim_rails gem
+  You can safely remove `config.assets.image_optim = false` if you are not going to use that gem
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -317,4 +327,3 @@ test_files:
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg
 - spec/spec_helper.rb
-has_rdoc: