image_optim 0.31.1 → 0.31.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481b027ab78658543ea138ff4d7547a609dca8b31eea02f8cb003318f10c67eb
-  data.tar.gz: e11f9f69a28e6a3e7a0028579cb36e78b5dd1457943a884f8071d6de17e7031e
+  metadata.gz: 7197f37a1a5cd0a61248ccd4ef6b08f2c05ff8f084866da48f76b038bac4e4ec
+  data.tar.gz: 7be50ee48142fd8775022855624a7ea642436b11d8ca260f322742a7814d513a
 SHA512:
-  metadata.gz: 961044af3b8ef65acbdc6bbce6a278e8aefe246a1ea53a6eceea5bb025f02c7adeecf457843fd2244a5bc21fa0f303094a16f4947cda41fc9ac7372dbcce5f46
-  data.tar.gz: ea8dcb08f8fffd1aad10506bdb3ab2bdf0043f30d08b68e2cb0d2195562492d6477619e3bdcf830a9bec9ead04adfe36b195b136fba61a1e7d4f96835c61c854
+  metadata.gz: 02dbbb2520b6250fc2a5262c2c0524a42519e3a969683efe95b384f0e0cc5b4247638e74e5766ce016ccc462f3646f3ab7e7bf363299b1f6e79894b59af69df2
+  data.tar.gz: 6673410e57ba7e01f0f146678f2b74e8bbdcd97ccccb320679f24acb860ea46be229b2184383ee59e5a7bac6a4977f506e113a68bf53f975c1b296e9e28310d1

data/.github/workflows/check.yml

@@ -19,7 +19,10 @@ jobs:
         - '2.6'
         - '2.7'
         - '3.0'
+        - '3.1'
         - jruby-9.2
+        - jruby-9.3
+        - jruby-9.4
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
@@ -28,7 +31,6 @@ jobs:
         ruby-version: "${{ matrix.ruby }}"
         bundler-cache: true
     - run: sudo npm install -g svgo
-    - run: curl -L "https://www.jonof.id.au/files/kenutils/pngout-20200115-linux.tar.gz" | sudo tar -xz -C /usr/local/bin --strip-components 2 --wildcards '*/amd64/pngout'
     - 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
@@ -40,6 +42,7 @@ jobs:
         - '2.6'
         - '2.7'
         - '3.0'
+        - '3.1'
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
@@ -70,20 +73,10 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: '3.1'
         bundler-cache: true
     - run: sudo npm install -g svgo
-    - run: curl -L "https://www.jonof.id.au/files/kenutils/pngout-20200115-linux.tar.gz" | sudo tar -xz -C /usr/local/bin --strip-components 2 --wildcards '*/amd64/pngout'
     - 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'
     - uses: paambaati/codeclimate-action@v2.7.5
       with:
         coverageCommand: bundle exec rspec
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.0'
-        bundler-cache: true
-    - run: bundle exec rubocop

data/.github/workflows/codeql.yml

@@ -0,0 +1,30 @@
+name: codeql
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '43 20 * * 0'
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    - uses: github/codeql-action/autobuild@v1
+
+    - uses: github/codeql-action/analyze@v1

data/.github/workflows/rubocop.yml

@@ -0,0 +1,16 @@
+name: rubocop
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: 45 4 * * 2
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.1'
+        bundler-cache: true
+    - run: bundle exec rubocop

data/.rubocop.yml

@@ -142,6 +142,9 @@ Style/Semicolon:
 Style/SignalException:
   EnforcedStyle: semantic
 
+Style/SlicingWithRange:
+  Enabled: false
+
 Style/SymbolArray:
   Enabled: false
 

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.31.2 (2022-11-27)
+
+* Support jruby 9.4 [@toy](https://github.com/toy)
+
 ## v0.31.1 (2021-10-21)
 
 * Allow image_size 3 [@toy](https://github.com/toy)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2021 Ivan Kuchin
+Copyright (c) 2012-2022 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,5 +1,7 @@
 [![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)
+[![Rubocop](https://img.shields.io/github/workflow/status/toy/image_optim/rubocop/master?label=rubocop&logo=rubocop)](https://github.com/toy/image_optim/actions/workflows/rubocop.yml)
+[![CodeQL](https://img.shields.io/github/workflow/status/toy/image_optim/codeql/master?label=codeql&logo=github)](https://github.com/toy/image_optim/actions/workflows/codeql.yml)
 [![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)
@@ -27,7 +29,7 @@ Based on [ImageOptim.app](http://imageoptim.com/).
 
 Documentation for [latest gem version](http://rubydoc.info/gems/image_optim/frames) and [master branch](http://rubydoc.info/github/toy/image_optim/master/frames).
 
-A test application with latest `image_optim` and `image_optim_pack` is available on heroku: https://iopack.herokuapp.com/.
+A test application with latest `image_optim` and `image_optim_pack` is available on render: https://iopack.onrender.com/.
 
 ## Gem installation
 
@@ -70,6 +72,18 @@ If you want to check latest changes:
 gem 'image_optim', :git => 'git://github.com/toy/image_optim.git'
 ```
 
+## Docker
+
+This gem is also be available as [docker image](https://github.com/toy/image_optim_pack/pkgs/container/image_optim) containing most binaries:
+
+```bash
+docker run --rm ghcr.io/toy/image_optim --version # image_optim version
+docker run --rm ghcr.io/toy/image_optim --info # image_optim info including bin versions
+docker run --rm -v "$PWD":/here -w /here ghcr.io/toy/image_optim image-in-this-folder.jpg
+```
+
+See [image_optim_pack repository](https://github.com/toy/image_optim_pack) for [Dockerfile](https://github.com/toy/image_optim_pack/blob/master/Dockerfile) and [instructions](https://github.com/toy/image_optim_pack#docker).
+
 ## Binaries location
 
 Simplest way for `image_optim` to locate binaries is to install them in common location present in `PATH` (see [Binaries installation](#binaries-installation)).
@@ -100,7 +114,7 @@ Besides permanently setting environment variables in `~/.profile`, `~/.bash_prof
 
 ### Binaries pack
 
-Easiest way to get latest versions of most binaries for `image_optim` for Linux, Mac OS X, FreeBSD and OpenBSD is by installing [`image_optim_pack`](https://github.com/toy/image_optim_pack) gem.
+Easiest way to get latest versions of most binaries for `image_optim` for Linux and Mac OS X is by installing [`image_optim_pack`](https://github.com/toy/image_optim_pack) gem.
 
 Check installation instructions in [Gem installation](#gem-installation) section.
 
@@ -163,7 +177,7 @@ sudo port install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush png
 ### OS X: Brew
 
 ```bash
-brew install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush pngquant jonof/kenutils/pngout
+brew install advancecomp gifsicle jhead jpegoptim jpeg optipng oxipng pngcrush pngquant jonof/kenutils/pngout
 ```
 
 ### oxipng installation (optional)
@@ -337,6 +351,11 @@ Worker has no options
 * `: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`)*
 
+### oxipng:
+* `:level` — Optimization level preset: `0` is least, `6` is best *(defaults to `3`)*
+* `: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`)*
+
 ### 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`)*
@@ -371,4 +390,4 @@ In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 
-Copyright (c) 2012-2021 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2012-2022 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.31.1'
+  s.version     = '0.31.2'
   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']
@@ -35,8 +35,8 @@ EOF
 
   s.add_development_dependency 'image_optim_pack', '~> 0.2', '>= 0.2.2'
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.4' && !Gem.win_platform? && !defined?(JRUBY_VERSION)
-    s.add_development_dependency 'rubocop', '~> 1.0'
+  if RUBY_VERSION >= '2.5' && !Gem.win_platform? && !defined?(JRUBY_VERSION)
+    s.add_development_dependency 'rubocop', '~> 1.22', '!= 1.22.2'
     s.add_development_dependency 'rubocop-rspec', '~> 2.0'
   end
 end

data/lib/image_optim/bin_resolver.rb

@@ -61,7 +61,7 @@ class ImageOptim
       [
         dir,
         pack_path,
-        ENV['PATH'],
+        ENV.fetch('PATH', nil),
         VENDOR_PATH,
       ].compact.join(File::PATH_SEPARATOR)
     end
@@ -109,12 +109,12 @@ class ImageOptim
     # dir as name
     def symlink_custom_bin!(name)
       env_name = "#{name}_bin".upcase
-      path = ENV[env_name]
+      path = ENV.fetch(env_name, nil)
       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} 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)
 

data/lib/image_optim/config.rb

@@ -15,7 +15,7 @@ class ImageOptim
 
     # Global config path at `$XDG_CONFIG_HOME/image_optim.yml` (by default
     # `~/.config/image_optim.yml`)
-    GLOBAL_PATH = File.join(ENV['XDG_CONFIG_HOME'] || '~/.config', 'image_optim.yml')
+    GLOBAL_PATH = File.join(ENV.fetch('XDG_CONFIG_HOME', '~/.config'), 'image_optim.yml')
 
     # Local config path at `./.image_optim.yml`
     LOCAL_PATH = './.image_optim.yml'
@@ -185,7 +185,7 @@ class ImageOptim
       when false
         {disable: true}
       else
-        fail ConfigurationError, "Got #{worker_options.inspect} for "\
+        fail ConfigurationError, "Got #{worker_options.inspect} for " \
                                  "#{klass.name} options"
       end
     end

data/lib/image_optim/optimized_path.rb

@@ -2,6 +2,8 @@
 
 require 'image_optim/path'
 
+require 'delegate'
+
 class ImageOptim
   # Holds optimized image with reference to original and its size
   class OptimizedPath < DelegateClass(Path)

data/lib/image_optim/runner/option_parser.rb

@@ -96,29 +96,29 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
     |
   TEXT
 
-  op.on('--config-paths PATH1,PATH2', Array, 'Config paths to use instead of '\
+  op.on('--config-paths PATH1,PATH2', Array, 'Config paths to use instead of ' \
                                              'default ones') do |paths|
     options[:config_paths] = paths
   end
 
   op.separator nil
 
-  op.on('-r', '-R', '--recursive', 'Recursively scan directories '\
+  op.on('-r', '-R', '--recursive', 'Recursively scan directories ' \
                                    'for images') do |recursive|
     options[:recursive] = recursive
   end
 
-  op.on("--exclude-dir 'GLOB'", 'Glob for excluding directories '\
+  op.on("--exclude-dir 'GLOB'", 'Glob for excluding directories ' \
                                 '(defaults to .*)') do |glob|
     options[:exclude_dir_glob] = glob
   end
 
-  op.on("--exclude-file 'GLOB'", 'Glob for excluding files '\
+  op.on("--exclude-file 'GLOB'", 'Glob for excluding files ' \
                                  '(defaults to .*)') do |glob|
     options[:exclude_file_glob] = glob
   end
 
-  op.on("--exclude 'GLOB'", 'Set glob for excluding both directories and '\
+  op.on("--exclude 'GLOB'", 'Set glob for excluding both directories and ' \
                             'files') do |glob|
     options[:exclude_file_glob] = options[:exclude_dir_glob] = glob
   end
@@ -129,19 +129,19 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
     options[:show_progress] = show_progress
   end
 
-  op.on('--[no-]threads N', Integer, 'Number of threads or disable '\
+  op.on('--[no-]threads N', Integer, 'Number of threads or disable ' \
                                      '(defaults to number of processors)') do |threads|
     options[:threads] = threads
   end
 
-  op.on('--[no-]nice N', Integer, 'Nice level, priority of all used tools '\
-                                  'with higher value meaning lower priority, in range -20..19, negative '\
+  op.on('--[no-]nice N', Integer, '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)') do |nice|
     options[:nice] = nice
   end
 
-  op.on('--[no-]pack', 'Require image_optim_pack or disable it, '\
-                       'by default image_optim_pack will be used if available, '\
+  op.on('--[no-]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') do |pack|
     options[:pack] = pack
   end
@@ -149,12 +149,12 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator nil
   op.separator '  Caching:'
 
-  op.on('--cache-dir DIR', 'Cache optimized images '\
+  op.on('--cache-dir DIR', 'Cache optimized images ' \
                            'into the specified directory') do |cache_dir|
     options[:cache_dir] = cache_dir
   end
 
-  op.on('--cache-worker-digests', 'Cache worker digests '\
+  op.on('--cache-worker-digests', 'Cache worker digests ' \
                                   '(updating workers invalidates cache)') do |cache_worker_digests|
     options[:cache_worker_digests] = cache_worker_digests
   end
@@ -162,7 +162,7 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator nil
   op.separator '  Disabling workers:'
 
-  op.on('--[no-]skip-missing-workers', 'Skip workers with missing or '\
+  op.on('--[no-]skip-missing-workers', 'Skip workers with missing or ' \
                                        'problematic binaries') do |skip|
     options[:skip_missing_workers] = skip
   end
@@ -177,7 +177,7 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator nil
   op.separator '  Worker options:'
 
-  op.on('--allow-lossy', 'Allow lossy workers and '\
+  op.on('--allow-lossy', 'Allow lossy workers and ' \
                          'optimizations') do |allow_lossy|
     options[:allow_lossy] = allow_lossy
   end
@@ -229,8 +229,8 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator nil
   op.separator '  Common options:'
 
-  op.on_tail('-v', '--verbose', 'Verbose output (show global and worker '\
-                                'config, binary resolution log, information about each tool invocation, '\
+  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/advpng.rb

@@ -8,11 +8,11 @@ class ImageOptim
     # http://advancemame.sourceforge.net/doc-advpng.html
     class Advpng < Worker
       LEVEL_OPTION =
-      option(:level, 4, 'Compression level: '\
-                        '`0` - don\'t compress, '\
-                        '`1` - fast, '\
-                        '`2` - normal, '\
-                        '`3` - extra, '\
+      option(:level, 4, 'Compression level: ' \
+                        '`0` - don\'t compress, ' \
+                        '`1` - fast, ' \
+                        '`2` - normal, ' \
+                        '`3` - extra, ' \
                         '`4` - extreme') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..4)
       end

data/lib/image_optim/worker/gifsicle.rb

@@ -17,19 +17,19 @@ class ImageOptim
       end
 
       INTERLACE_OPTION =
-      option(:interlace, false, TrueFalseNil, 'Interlace: '\
-                                              '`true` - interlace on, '\
-                                              '`false` - interlace off, '\
-                                              '`nil` - as is in original image '\
-                                              '(defaults to running two instances, one with interlace off and '\
+      option(:interlace, false, TrueFalseNil, '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)') do |v|
         TrueFalseNil.convert(v)
       end
 
       LEVEL_OPTION =
-      option(:level, 3, 'Compression level: '\
-                        '`1` - light and fast, '\
-                        '`2` - normal, '\
+      option(:level, 3, 'Compression level: ' \
+                        '`1` - light and fast, ' \
+                        '`2` - normal, ' \
                         '`3` - heavy (slower)') do |v|
         OptionHelpers.limit_with_range(v.to_i, 1..3)
       end

data/lib/image_optim/worker/jpegoptim.rb

@@ -11,13 +11,13 @@ class ImageOptim
       option(:allow_lossy, false, 'Allow limiting maximum quality'){ |v| !!v }
 
       STRIP_OPTION =
-      option(:strip, :all, Array, 'List of markers to strip: '\
-                                  '`:com`, '\
-                                  '`:exif`, '\
-                                  '`:iptc`, '\
-                                  '`:icc`, '\
-                                  '`:xmp`, '\
-                                  '`:none` or '\
+      option(:strip, :all, Array, 'List of markers to strip: ' \
+                                  '`:com`, ' \
+                                  '`:exif`, ' \
+                                  '`:iptc`, ' \
+                                  '`:icc`, ' \
+                                  '`:xmp`, ' \
+                                  '`:none` or ' \
                                   '`:all`') do |v|
         values = Array(v).map(&:to_s)
         known_values = %w[com exif iptc icc xmp none all]
@@ -29,7 +29,7 @@ class ImageOptim
       end
 
       MAX_QUALITY_OPTION =
-      option(:max_quality, 100, 'Maximum image quality factor '\
+      option(:max_quality, 100, 'Maximum image quality factor ' \
                                 '`0`..`100`, ignored in default/lossless mode') do |v, opt_def|
         if allow_lossy
           OptionHelpers.limit_with_range(v.to_i, 0..100)

data/lib/image_optim/worker/jpegrecompress.rb

@@ -27,10 +27,10 @@ class ImageOptim
       end
 
       METHOD_OPTION =
-      option(:method, 'ssim', 'Comparison Metric: '\
-                              '`mpe` - Mean pixel error, '\
-                              '`ssim` - Structural similarity, '\
-                              '`ms-ssim` - Multi-scale structural similarity (slow!), '\
+      option(:method, 'ssim', 'Comparison Metric: ' \
+                              '`mpe` - Mean pixel error, ' \
+                              '`ssim` - Structural similarity, ' \
+                              '`ms-ssim` - Multi-scale structural similarity (slow!), ' \
                               '`smallfry` - Linear-weighted BBCQ-like (may be patented)') do |v, opt_def|
         if %w[mpe ssim ms-ssim smallfry].include? v
           v

data/lib/image_optim/worker/jpegtran.rb

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

data/lib/image_optim/worker/optipng.rb

@@ -9,16 +9,16 @@ class ImageOptim
     # http://optipng.sourceforge.net/
     class Optipng < Worker
       LEVEL_OPTION =
-      option(:level, 6, 'Optimization level preset: '\
-                        '`0` is least, '\
+      option(:level, 6, 'Optimization level preset: ' \
+                        '`0` is least, ' \
                         '`7` is best') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..7)
       end
 
       INTERLACE_OPTION =
-      option(:interlace, false, TrueFalseNil, 'Interlace: '\
-                                              '`true` - interlace on, '\
-                                              '`false` - interlace off, '\
+      option(:interlace, false, TrueFalseNil, 'Interlace: ' \
+                                              '`true` - interlace on, ' \
+                                              '`false` - interlace off, ' \
                                               '`nil` - as is in original image') do |v|
         TrueFalseNil.convert(v)
       end

data/lib/image_optim/worker/oxipng.rb

@@ -9,16 +9,16 @@ class ImageOptim
     # https://github.com/shssoichiro/oxipng
     class Oxipng < Worker
       LEVEL_OPTION =
-      option(:level, 3, 'Optimization level preset: '\
-                        '`0` is least, '\
+      option(:level, 3, 'Optimization level preset: ' \
+                        '`0` is least, ' \
                         '`6` is best') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..6)
       end
 
       INTERLACE_OPTION =
-      option(:interlace, false, TrueFalseNil, 'Interlace: '\
-                                              '`true` - interlace on, '\
-                                              '`false` - interlace off, '\
+      option(:interlace, false, TrueFalseNil, 'Interlace: ' \
+                                              '`true` - interlace on, ' \
+                                              '`false` - interlace off, ' \
                                               '`nil` - as is in original image') do |v|
         TrueFalseNil.convert(v)
       end

data/lib/image_optim/worker/pngcrush.rb

@@ -7,18 +7,18 @@ class ImageOptim
     # http://pmt.sourceforge.net/pngcrush/
     class Pngcrush < Worker
       CHUNKS_OPTION =
-      option(:chunks, :alla, Array, 'List of chunks to remove or '\
-                                    '`:alla` - all except tRNS/transparency or '\
+      option(:chunks, :alla, Array, 'List of chunks to remove or ' \
+                                    '`:alla` - all except tRNS/transparency or ' \
                                     '`:allb` - all except tRNS and gAMA/gamma') do |v|
         Array(v).map(&:to_s)
       end
 
       FIX_OPTION =
-      option(:fix, false, 'Fix otherwise fatal conditions '\
+      option(:fix, false, 'Fix otherwise fatal conditions ' \
                           'such as bad CRCs'){ |v| !!v }
 
       BRUTE_OPTION =
-      option(:brute, false, 'Brute force try all methods, '\
+      option(:brute, false, 'Brute force try all methods, ' \
                             'very time-consuming and generally not worthwhile'){ |v| !!v }
 
       BLACKEN_OPTION =

data/lib/image_optim/worker/pngout.rb

@@ -11,11 +11,11 @@ class ImageOptim
       option(:copy_chunks, false, 'Copy optional chunks'){ |v| !!v }
 
       STRATEGY_OPTION =
-      option(:strategy, 0, 'Strategy: '\
-                           '`0` - xtreme, '\
-                           '`1` - intense, '\
-                           '`2` - longest Match, '\
-                           '`3` - huffman Only, '\
+      option(:strategy, 0, 'Strategy: ' \
+                           '`0` - xtreme, ' \
+                           '`1` - intense, ' \
+                           '`2` - longest Match, ' \
+                           '`3` - huffman Only, ' \
                            '`4` - uncompressed') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..4)
       end

data/lib/image_optim/worker/pngquant.rb

@@ -18,9 +18,9 @@ class ImageOptim
 
       QUALITY_OPTION =
       option(:quality, '`100..100`, `0..100` in lossy mode',
-             NonNegativeIntegerRange, '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 '\
+             NonNegativeIntegerRange, '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') do |v, opt_def|
         if allow_lossy
           if v == opt_def.default
@@ -39,9 +39,9 @@ class ImageOptim
       end
 
       SPEED_OPTION =
-      option(:speed, 3, 'speed/quality trade-off: '\
-                        '`1` - slow, '\
-                        '`3` - default, '\
+      option(:speed, 3, 'speed/quality trade-off: ' \
+                        '`1` - slow, ' \
+                        '`3` - default, ' \
                         '`11` - fast & rough') do |v|
         OptionHelpers.limit_with_range(v.to_i, 1..11)
       end

data/lib/image_optim/worker.rb

@@ -104,7 +104,7 @@ class ImageOptim
       unknown_options = options.reject{ |key, _value| known_keys.include?(key) }
       return if unknown_options.empty?
 
-      fail ConfigurationError, "unknown options #{unknown_options.inspect} "\
+      fail ConfigurationError, "unknown options #{unknown_options.inspect} " \
                                "for #{self}"
     end
 
@@ -117,8 +117,8 @@ class ImageOptim
 
     def wrap_resolver_error_message(message)
       name = self.class.bin_sym
-      "#{name} worker: #{message}; please provide proper binary or "\
-        "disable this worker (--no-#{name} argument or "\
+      "#{name} worker: #{message}; please provide proper binary or " \
+        "disable this worker (--no-#{name} argument or " \
         "`:#{name} => false` through options)"
     end
 

data/script/update_worker_options_in_readme

@@ -28,7 +28,7 @@ end
 
 def write_marked(io)
   io.puts BEGIN_MARKER
-  io.puts '<!-- markdown for worker options is generated by '\
+  io.puts '<!-- markdown for worker options is generated by ' \
           "`#{Pathname($PROGRAM_NAME).cleanpath}` -->"
   io.puts
 
@@ -52,9 +52,7 @@ end
 
 readme = File.read(README_FILE)
 if (readme = update_readme(readme))
-  File.open(README_FILE, 'w') do |f|
-    f.write readme
-  end
+  File.write(README_FILE, readme)
 else
   abort 'Did not update worker options'
 end

data/script/worker_analysis

@@ -11,7 +11,6 @@ require 'shellwords'
 require 'gdbm'
 require 'digest'
 require 'erb'
-require 'ostruct'
 
 DIR = 'tmp'
 Pathname(DIR).mkpath
@@ -172,7 +171,7 @@ class Analyser
 
     def source_digest
       @source_digest ||= begin
-        source_path = __getobj__.method(:optimize).source_location[0]
+        source_path = __getobj__.class.instance_method(:optimize).source_location[0]
         Digest::SHA256.file(source_path).hexdigest
       end
     end
@@ -515,7 +514,7 @@ class Analyser
   def analyse(paths)
     results = collect_results(paths)
 
-    template = ERB.new(template_path.read, nil, '>')
+    template = ERB.new(template_path.read, trim_mode: '>')
     by_format = results.group_by(&:format)
     formats = by_format.keys.sort
     basenames = Hash[formats.map do |format|
@@ -524,13 +523,10 @@ class Analyser
     formats.each do |format|
       stats = Stats.new('all', by_format[format], worker_ids2names)
       path = FSPath("#{DIR}/#{basenames[format]}")
-      model = {
-        stats_format: format,
-        stats: stats,
-        format_links: basenames,
-        template_dir: template_path.dirname.relative_path_from(path.dirname),
-      }
-      html = template.result(OpenStruct.new(model).instance_eval{ binding })
+      stats_format = format
+      format_links = basenames
+      template_dir = template_path.dirname.relative_path_from(path.dirname)
+      html = template.result(binding)
       path.write(html)
       puts "Created #{path}"
     end

data/spec/image_optim/bin_resolver_spec.rb

@@ -8,6 +8,7 @@ require 'image_optim/path'
 describe ImageOptim::BinResolver do
   def stub_env(key, value)
     allow(ENV).to receive(:[]).with(key).and_return(value)
+    allow(ENV).to receive(:fetch).with(key, nil).and_return(value)
   end
 
   before do
@@ -17,6 +18,7 @@ describe ImageOptim::BinResolver do
     stub_const('Cmd', ImageOptim::Cmd)
 
     allow(ENV).to receive(:[]).and_call_original
+    allow(ENV).to receive(:fetch).and_call_original
   end
 
   let(:image_optim){ double(:image_optim, verbose: false, pack: false) }
@@ -87,7 +89,7 @@ describe ImageOptim::BinResolver do
     expect(resolver.env_path).to eq([
       'temp_dir',
       'pack_path',
-      ENV['PATH'],
+      ENV.fetch('PATH', nil),
       BinResolver::VENDOR_PATH,
     ].join(File::PATH_SEPARATOR))
   end
@@ -105,7 +107,7 @@ describe ImageOptim::BinResolver do
       expect(resolver.resolve!(:ls)).to eq(bin)
     end
     expect(resolver.env_path).to eq([
-      ENV['PATH'],
+      ENV.fetch('PATH', nil),
       BinResolver::VENDOR_PATH,
     ].join(File::PATH_SEPARATOR))
   end
@@ -122,7 +124,7 @@ describe ImageOptim::BinResolver do
       end.to raise_error BinResolver::BinNotFound
     end
     expect(resolver.env_path).to eq([
-      ENV['PATH'],
+      ENV.fetch('PATH', nil),
       BinResolver::VENDOR_PATH,
     ].join(File::PATH_SEPARATOR))
   end
@@ -162,7 +164,7 @@ describe ImageOptim::BinResolver do
     end
     expect(resolver.env_path).to eq([
       tmpdir,
-      ENV['PATH'],
+      ENV.fetch('PATH', nil),
       BinResolver::VENDOR_PATH,
     ].join(File::PATH_SEPARATOR))
 
@@ -187,7 +189,7 @@ describe ImageOptim::BinResolver do
 
     after do
       expect(resolver.env_path).to eq([
-        ENV['PATH'],
+        ENV.fetch('PATH', nil),
         BinResolver::VENDOR_PATH,
       ].join(File::PATH_SEPARATOR))
     end

data/spec/image_optim/cache_spec.rb

@@ -15,7 +15,7 @@ describe ImageOptim::Cache do
 
   let(:cache_dir) do
     dir = '/somewhere/cache'
-    allow(FileUtils).to receive(:mkpath).with(Regexp.new(Regexp.escape(dir)))
+    allow(FileUtils).to receive(:mkpath).with(Regexp.new(Regexp.escape(dir)), any_args)
     allow(FileUtils).to receive(:touch)
     allow(FSPath).to receive(:temp_file_path) do
       tmp_file

data/spec/image_optim/handler_spec.rb

@@ -8,7 +8,7 @@ describe ImageOptim::Handler do
     stub_const('Handler', ImageOptim::Handler)
   end
 
-  it 'uses original as source for first conversion '\
+  it 'uses original as source for first conversion ' \
      'and two temp files for further conversions' do
     original = double(:original)
     allow(original).to receive(:respond_to?).with(:temp_path).and_return(true)

data/spec/image_optim_spec.rb

@@ -252,7 +252,7 @@ describe ImageOptim do
       end
 
       describe 'given block' do
-        it 'optimizes images, yields path and result for each and '\
+        it 'optimizes images, yields path and result for each and ' \
            'returns array of yield results' do
           image_optim = ImageOptim.new
           results = test_images.map do |src|

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'image_optim/path'
 
 ENV['PATH'] = [
   ImageOptim::Pack.path,
-  ENV['PATH'],
+  ENV.fetch('PATH', nil),
 ].compact.join File::PATH_SEPARATOR
 
 RSpec.configure do |c|
@@ -72,7 +72,7 @@ RSpec::Matchers.define :be_similar_to do |expected, max_difference|
     @diff <= max_difference
   end
   failure_message do |actual|
-    "expected #{actual} to have at most #{max_difference} difference from "\
+    "expected #{actual} to have at most #{max_difference} difference from " \
       "#{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.1
+  version: 0.31.2
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -138,14 +138,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.22'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.22.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.22'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.22.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +174,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/check.yml"
+- ".github/workflows/codeql.yml"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".pre-commit-hooks.yaml"
 - ".rubocop.yml"
@@ -176,7 +184,6 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.markdown
-- Vagrantfile
 - bin/image_optim
 - image_optim.gemspec
 - lib/image_optim.rb
@@ -285,7 +292,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.1
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.31.2
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem
@@ -304,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Command line tool and ruby interface to optimize (lossless compress, optionally

data/Vagrantfile

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-Vagrant.configure('2') do |config|
-  config.vm.box = 'ubuntu/precise64'
-
-  config.vm.provision 'shell', inline: <<-SH
-    set -e
-
-    cd /vagrant
-
-    echo 'apt-get update...'
-    apt-get update > /dev/null
-
-    echo 'Install git, imagemagick, ruby1.9.1-dev...'
-    apt-get install -y git npm imagemagick ruby1.9.1-dev > /dev/null
-
-    echo 'Install node, npm...'
-    curl -sL https://deb.nodesource.com/setup | sudo bash - > /dev/null
-    sudo apt-get install -y nodejs > /dev/null
-
-    echo 'Update rubygems...'
-    REALLY_GEM_UPDATE_SYSTEM=x gem update --system > /dev/null
-
-    echo 'Install bundler...'
-    gem install bundler > /dev/null
-
-    echo 'Install svgo...'
-    npm install -g -q svgo > /dev/null
-
-    echo 'Install pngout...'
-    curl -s \
-      'http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz' | \
-      tar -xz -C /usr/local/bin --strip-components 2 \
-      --wildcards '*/x86_64/pngout'
-
-    echo 'Bundle...'
-    bundle install --jobs=3 --quiet
-    bundle list
-  SH
-end