image_optim 0.27.1 → 0.31.0

data/spec/image_optim_spec.rb

@@ -27,7 +27,7 @@ describe ImageOptim do
     ImageOptim::Worker.klasses.map do |klass|
       [klass.bin_sym, false]
     end
-  ].merge(:skip_missing_workers => false)
+  ].merge(skip_missing_workers: false)
 
   ImageOptim::Worker.klasses.each do |worker_klass|
     describe "#{worker_klass.bin_sym} worker" do
@@ -36,7 +36,7 @@ describe ImageOptim do
 
         image_optim = ImageOptim.new(options)
         if Array(worker_klass.init(image_optim)).empty?
-          image_optim = ImageOptim.new(options.merge(:allow_lossy => true))
+          image_optim = ImageOptim.new(options.merge(allow_lossy: true))
         end
 
         expect(test_images.any? do |original|
@@ -59,10 +59,10 @@ describe ImageOptim do
       rotated = images_dir / 'orient/original.jpg'
       rotate_images = images_dir.glob('orient/?.jpg')
 
-      base_options = {:skip_missing_workers => false}
+      base_options = {skip_missing_workers: false}
       [
         ['lossless', base_options, 0],
-        ['lossy', base_options.merge(:allow_lossy => true), 0.001],
+        ['lossy', base_options.merge(allow_lossy: true), 0.001],
       ].each do |type, options, max_difference|
         it "does it #{type}" do
           image_optim = ImageOptim.new(options)
@@ -95,8 +95,8 @@ describe ImageOptim do
     end
 
     {
-      :png => "\211PNG\r\n\032\n",
-      :jpeg => "\377\330",
+      png: "\211PNG\r\n\032\n",
+      jpeg: "\377\330",
     }.each do |type, data|
       it "ingores broken #{type}" do
         path = FSPath.temp_file_path
@@ -105,12 +105,49 @@ describe ImageOptim do
         expect(ImageOptim.optimize_image(path)).to be_nil
       end
     end
+
+    context 'using timeout' do
+      let(:timeout){ 123 }
+      let(:image_optim){ ImageOptim.new(isolated_options_base.merge(timeout: timeout)) }
+      let(:timer){ instance_double(ImageOptim::Timer) }
+      let(:workers){ Array.new(3){ instance_double(ImageOptim::Worker) } }
+      let(:path){ test_images.first }
+
+      before do
+        allow(ImageOptim::Timer).to receive(:new).with(timeout).and_return(timer)
+        allow(image_optim).to receive(:workers_for_image).and_return(workers)
+      end
+
+      it 'sends timeout to every worker' do
+        some_path = instance_of(ImageOptim::Path)
+
+        expect(workers[0]).to receive(:optimize).with(some_path, some_path, timeout: timer)
+        expect(workers[1]).to receive(:optimize).with(some_path, some_path, timeout: timer)
+        expect(workers[2]).to receive(:optimize).with(some_path, some_path, timeout: timer)
+
+        image_optim.optimize_image(path)
+      end
+
+      it 'returns nil if there was no success before worker times out' do
+        allow(workers[0]).to receive(:optimize).and_return(false)
+        allow(workers[1]).to receive(:optimize).and_raise(ImageOptim::Errors::TimeoutExceeded)
+
+        expect(image_optim.optimize_image(path)).to be_nil
+      end
+
+      it 'returns result if there was success before worker times out' do
+        allow(workers[0]).to receive(:optimize).and_return(true)
+        allow(workers[1]).to receive(:optimize).and_raise(ImageOptim::Errors::TimeoutExceeded)
+
+        expect(image_optim.optimize_image(path)).to be_an(ImageOptim::OptimizedPath)
+      end
+    end
   end
 
   describe '#optimize_image!' do
     it 'optimizes image and replaces original' do
       original = double
-      optimized = double(:original_size => 12_345)
+      optimized = double(original_size: 12_345)
       optimized_wrap = double
       image_optim = ImageOptim.new
 
@@ -144,7 +181,7 @@ describe ImageOptim do
   describe '#optimize_image_data' do
     it 'create temp file, optimizes image and returns data' do
       data = double
-      temp = double(:path => double)
+      temp = double(path: double)
       optimized = double
       optimized_data = double
       image_optim = ImageOptim.new
@@ -165,7 +202,7 @@ describe ImageOptim do
 
     it 'returns nil if optimization fails' do
       data = double
-      temp = double(:path => double)
+      temp = double(path: double)
       image_optim = ImageOptim.new
 
       allow(ImageOptim::ImageMeta).to receive(:format_for_data).
@@ -216,7 +253,7 @@ describe ImageOptim do
 
       describe 'given block' do
         it 'optimizes images, yields path and result for each and '\
-            'returns array of yield results' do
+           'returns array of yield results' do
           image_optim = ImageOptim.new
           results = test_images.map do |src|
             dst = double

data/spec/images/invisiblepixels/generate

@@ -17,7 +17,7 @@ IO.popen(%W[
 ].shelljoin, 'w') do |f|
   side.times do |a|
     side.times do |b|
-      alpha = [0, 1, 0x7f, 0xff][(a / 8 + b / 8) % 4]
+      alpha = [0, 1, 0x7f, 0xff][((a / 8) + (b / 8)) % 4]
       f << [rand(256), rand(256), rand(256), alpha].pack('C*')
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if ENV['CODECLIMATE']
+if ENV['CC_TEST_REPORTER_ID']
   require 'simplecov'
   SimpleCov.start
 end
@@ -71,26 +71,27 @@ RSpec::Matchers.define :be_similar_to do |expected, max_difference|
   end
   failure_message do |actual|
     "expected #{actual} to have at most #{max_difference} difference from "\
-        "#{expected}, got normalized root-mean-square error of #{@diff}"
+      "#{expected}, got normalized root-mean-square error of #{@diff}"
   end
 end
 
-module CapabilityCheckHelpers
-  def any_file_modes_allowed?
-    Tempfile.open 'posix' do |f|
+SkipConditions = Hash.new do |cache, name|
+  cache[name] = case name
+  when :any_file_mode_allowed
+    Tempfile.open('posix') do |f|
       File.chmod(0, f.path)
-      return (File.stat(f.path).mode & 0o777).zero?
+      'full file modes are not support' unless (File.stat(f.path).mode & 0o777).zero?
     end
-  end
-
-  def inodes_supported?
-    !File.stat(__FILE__).ino.zero?
-  end
-
-  def signals_supported?
-    Process.kill(0, 0)
-    true
-  rescue
-    false
+  when :inodes_support
+    'inodes are not supported' if File.stat(__FILE__).ino.zero?
+  when :signals_support
+    begin
+      Process.kill(0, 0)
+      nil
+    rescue
+      'signals are not supported'
+    end
+  else
+    fail "Unknown check #{name}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.31.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2021-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -138,20 +138,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
-    - - "!="
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '2.0'
 description:
 email:
 executables:
@@ -160,9 +168,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".appveyor.yml"
+- ".github/workflows/check.yml"
 - ".gitignore"
+- ".pre-commit-hooks.yaml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.markdown
 - CONTRIBUTING.markdown
 - Gemfile
@@ -182,6 +191,8 @@ files:
 - lib/image_optim/cmd.rb
 - lib/image_optim/config.rb
 - lib/image_optim/configuration_error.rb
+- lib/image_optim/elapsed_time.rb
+- lib/image_optim/errors.rb
 - lib/image_optim/handler.rb
 - lib/image_optim/hash_helpers.rb
 - lib/image_optim/image_meta.rb
@@ -194,6 +205,7 @@ files:
 - lib/image_optim/runner/glob_helpers.rb
 - lib/image_optim/runner/option_parser.rb
 - lib/image_optim/space.rb
+- lib/image_optim/timer.rb
 - lib/image_optim/true_false_nil.rb
 - lib/image_optim/worker.rb
 - lib/image_optim/worker/advpng.rb
@@ -204,6 +216,7 @@ files:
 - lib/image_optim/worker/jpegrecompress.rb
 - lib/image_optim/worker/jpegtran.rb
 - lib/image_optim/worker/optipng.rb
+- lib/image_optim/worker/oxipng.rb
 - lib/image_optim/worker/pngcrush.rb
 - lib/image_optim/worker/pngout.rb
 - lib/image_optim/worker/pngquant.rb
@@ -220,6 +233,7 @@ files:
 - spec/image_optim/cache_spec.rb
 - spec/image_optim/cmd_spec.rb
 - spec/image_optim/config_spec.rb
+- spec/image_optim/elapsed_time_spec.rb
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_meta_spec.rb
@@ -230,7 +244,10 @@ files:
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
 - spec/image_optim/space_spec.rb
+- spec/image_optim/timer_spec.rb
+- spec/image_optim/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
+- spec/image_optim/worker/oxipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb
@@ -269,7 +286,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim/issues
   changelog_uri: https://github.com/toy/image_optim/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.27.1
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.31.0
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem
@@ -281,20 +298,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: 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)
+  jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, oxipng, pngcrush,
+  pngout, pngquant, svgo)
 test_files:
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
 - spec/image_optim/bin_resolver/simple_version_spec.rb
@@ -303,6 +320,7 @@ test_files:
 - spec/image_optim/cache_spec.rb
 - spec/image_optim/cmd_spec.rb
 - spec/image_optim/config_spec.rb
+- spec/image_optim/elapsed_time_spec.rb
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_meta_spec.rb
@@ -313,7 +331,10 @@ test_files:
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
 - spec/image_optim/space_spec.rb
+- spec/image_optim/timer_spec.rb
+- spec/image_optim/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
+- spec/image_optim/worker/oxipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb

data/.travis.yml

@@ -1,49 +0,0 @@
-sudo: false
-dist: trusty
-language: ruby
-cache:
-  bundler: true
-  directories:
-    - $(npm root)
-    - ~/bin
-rvm:
-  - '1.8.7-p374'
-  - '1.9.3-p551'
-  - '2.0.0-p648'
-  - '2.1.10'
-  - '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:
-  - '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 "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=1
-      rvm: '2.4.10'
-      after_success: bundle exec codeclimate-test-reporter
-    - env: RUBOCOP=1
-      rvm: '2.4.10'
-      script: bundle exec rubocop
-      before_install: gem update --system && gem install bundler
-    - env: CHECK_RUBIES=1
-      rvm: '2.4.10'
-      script: bundle exec travis_check_rubies
-      before_install: gem update --system && gem install bundler
-addons:
-  code_climate:
-    repo_token:
-      secure: FDikT3JnOJHOAFSaKwVPB1VOphU0sSzAnzQ+YjSt9XFE+9uFQHth/j4rFoVoqALhCj+47trv6spwkbcSjGCVzm+87OI80GkLCCzNjDOz2W4sP9JWItVgS1VoWW+ioPxpLgpguTb3wutwKOUMEAf+40EX657ZiHumM7nNHrF+RCU=