image_optim 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80e82d67e3434476f0bdf332b14b6369601010aaeef7ab7b901515d0c03565c
-  data.tar.gz: 16f304385c879cf1afc0073d7d037fb548d6c260f57e2b94cdcdd974f3cd4b4e
+  metadata.gz: 481b027ab78658543ea138ff4d7547a609dca8b31eea02f8cb003318f10c67eb
+  data.tar.gz: e11f9f69a28e6a3e7a0028579cb36e78b5dd1457943a884f8071d6de17e7031e
 SHA512:
-  metadata.gz: b0395980a804453e3273f779c1217d5dd5b9b7c522e74964070b43f2b3ac433f9f39d5f997a3e9c6594f22d244752910eea1697ac2e570de34e6b0641555b9e8
-  data.tar.gz: 9de0bebe89071d3aa7bd506b02dc684b53d998dcfccab1debad72bdc244e6fbae6eb0ac2d5871359fe2ffa5cb9e7c5ae8a7dc98829e00e8abef49c017ac3b00c
+  metadata.gz: 961044af3b8ef65acbdc6bbce6a278e8aefe246a1ea53a6eceea5bb025f02c7adeecf457843fd2244a5bc21fa0f303094a16f4947cda41fc9ac7372dbcce5f46
+  data.tar.gz: ea8dcb08f8fffd1aad10506bdb3ab2bdf0043f30d08b68e2cb0d2195562492d6477619e3bdcf830a9bec9ead04adfe36b195b136fba61a1e7d4f96835c61c854

data/.github/workflows/check.yml

@@ -32,6 +32,36 @@ jobs:
     - run: curl -L "https://github.com/shssoichiro/oxipng/releases/download/v4.0.3/oxipng-4.0.3-x86_64-unknown-linux-musl.tar.gz" | tar -xz -C /usr/local/bin --strip-components 1 --wildcards '*oxipng'
     - run: bundle exec image_optim --info
     - run: bundle exec rspec
+  windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby:
+        - '2.6'
+        - '2.7'
+        - '3.0'
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+        bundler-cache: true
+    - uses: actions/cache@v2
+      with:
+        path: "$HOME/bin"
+        key: ${{ runner.os }}
+    - run: |
+        mkdir "$HOME/bin"
+        git fetch origin windows-binaries
+        git --work-tree="$HOME/bin" checkout origin/windows-binaries -- '*.exe'
+        echo "$HOME/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+    - run: |
+        choco install --no-progress imagemagick
+        ls C:\'Program Files'\ImageMagick* | % FullName | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+    - run: npm install -g svgo
+    - run: bundle exec image_optim --info
+    - run: bundle exec rspec
   coverage:
     runs-on: ubuntu-latest
     env:

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.31.1 (2021-10-21)
+
+* Allow image_size 3 [@toy](https://github.com/toy)
+
 ## v0.31.0 (2021-10-03)
 
 * Add support for Oxipng [#167](https://github.com/toy/image_optim/issues/167) [#190](https://github.com/toy/image_optim/pull/190) [@oblakeerickson](https://github.com/oblakeerickson)

data/README.markdown

@@ -1,6 +1,5 @@
 [![Gem Version](https://img.shields.io/gem/v/image_optim?logo=rubygems)](https://rubygems.org/gems/image_optim)
 [![Build Status](https://img.shields.io/github/workflow/status/toy/image_optim/check/master?logo=github)](https://github.com/toy/image_optim/actions/workflows/check.yml)
-[![AppVeyor Status](https://img.shields.io/appveyor/build/toy/image-optim/master?label=windows&logo=appveyor)](https://ci.appveyor.com/project/toy/image-optim)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/toy/image_optim?logo=codeclimate)](https://codeclimate.com/github/toy/image_optim)
 [![Code Climate Coverage](https://img.shields.io/codeclimate/coverage/toy/image_optim?logo=codeclimate)](https://codeclimate.com/github/toy/image_optim)
 [![Depfu](https://img.shields.io/depfu/toy/image_optim)](https://depfu.com/github/toy/image_optim)

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.31.0'
+  s.version     = '0.31.1'
   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, oxipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -28,7 +28,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.5', '< 3'
+  s.add_dependency 'image_size', '>= 1.5', '< 4'
   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/runner/option_parser.rb

@@ -84,7 +84,7 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   ImageOptim::TrueFalseNil.add_to_option_parser(op)
   ImageOptim::NonNegativeIntegerRange.add_to_option_parser(op)
 
-  op.banner = <<-TEXT.gsub(/^\s*\|/, '') # rubocop:disable Layout/DotPosition
+  op.banner = <<-TEXT.gsub(/^\s*\|/, '')
     |#{ImageOptim.full_version}
     |
     |Usage:

data/spec/spec_helper.rb

@@ -23,16 +23,18 @@ RSpec.configure do |c|
   c.order = :random
 end
 
+IMAGEMAGICK_PREFIX = ImageOptim::Cmd.capture('which magick').empty? ? [] : %w[magick]
+
 def flatten_animation(image)
   if image.image_format == :gif
     flattened = image.temp_path
-    command = %W[
+    command = (IMAGEMAGICK_PREFIX + %W[
       convert
       #{image}
       -coalesce
       -append
       #{flattened}
-    ].shelljoin
+    ]).shelljoin
     expect(ImageOptim::Cmd.run(command)).to be_truthy
     flattened
   else
@@ -43,7 +45,7 @@ end
 def mepp(image_a, image_b)
   coalesce_a = flatten_animation(image_a)
   coalesce_b = flatten_animation(image_b)
-  output = ImageOptim::Cmd.capture(%W[
+  output = ImageOptim::Cmd.capture((IMAGEMAGICK_PREFIX + %W[
     compare
     -metric MEPP
     -alpha Background
@@ -51,7 +53,7 @@ def mepp(image_a, image_b)
     #{coalesce_b.to_s.shellescape}
     #{ImageOptim::Path::NULL}
     2>&1
-  ].join(' '))
+  ]).join(' '))
   unless [0, 1].include?($CHILD_STATUS.exitstatus)
     fail "compare #{image_a} with #{image_b} failed with `#{output}`"
   end
@@ -71,7 +73,7 @@ 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 mean error per pixel of #{@diff}"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.31.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -33,7 +33,7 @@ dependencies:
         version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".appveyor.yml"
 - ".github/workflows/check.yml"
 - ".gitignore"
 - ".pre-commit-hooks.yaml"
@@ -286,7 +285,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.31.0
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.31.1
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem
@@ -305,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Command line tool and ruby interface to optimize (lossless compress, optionally

data/.appveyor.yml

@@ -1,55 +0,0 @@
-version: '{build}-{branch}'
-install:
-  - mkdir tmp\bin || exit 0
-  - set PATH=C:\Ruby25-x64\bin;%cd%\tmp\bin;%PATH%
-  - ruby --version
-  - gem --version
-  - bundle package --all
-
-  - ps: Install-Product node
-
-  - ps: git --work-tree=tmp\bin checkout origin/windows-binaries -- '*.exe'
-
-  - ps: | # svgo
-      npm install -g svgo
-
-  - ps: | # ImageMagick
-      if ((-not (test-path tmp/bin/convert.exe)) -or (-not (test-path tmp/bin/compare.exe)) -or (-not (test-path tmp/bin/magic.xml))) {
-        choco install -y imagemagick.tool
-        cp C:\ProgramData\chocolatey\lib\imagemagick.tool\tools\convert.exe tmp\bin
-        cp C:\ProgramData\chocolatey\lib\imagemagick.tool\tools\compare.exe tmp\bin
-        cp C:\ProgramData\chocolatey\lib\imagemagick.tool\tools\magic.xml tmp\bin
-      }
-
-  - bundle exec image_optim --info --allow-lossy --no-pack
-cache:
-  - tmp/bin
-build: off
-test_script:
-  - ps: |
-      $path = $env:Path
-      $rubypaths = ls -Path C:\Ruby*\bin
-      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
-        if ($LASTEXITCODE -gt 0) {
-          exit 1
-        }
-        rm tmp/optimize_test -recurse -force
-        cp spec/images tmp/optimize_test -recurse -force
-        bundle exec image_optim --allow-lossy -r tmp/optimize_test
-        if ($LASTEXITCODE -gt 0) {
-          exit 1
-        }
-      }
-      $env:Path = $path