image_optim 0.24.3 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76bd58bfc7147d344de3180b31eaf30572fdb940
-  data.tar.gz: 477c8fb36bab5dcd8abc0fa9714404453e19fc7a
+  metadata.gz: 0274d7bf579938c5c208f39fb85d60781d727566
+  data.tar.gz: e27be28692c75bc6456071311a3bed6fa3a8a216
 SHA512:
-  metadata.gz: c4dbea61152a4b7ae6fb1dd97f2019dd474073863009b7af55000f9e7657e691c43dbc7e11917f477f674536aba80d4e7d9dff588c0026f5e516a215941a5f6c
-  data.tar.gz: f120068d0b452500630247676dedbe475b8299127d3aa08e479308fea2731b7f3b06b63291858482d4f90ded3f9137975e11b9e66aa5abb0b067dd53e167e348
+  metadata.gz: e8b6ec09460fa0f07b11ab3930e4b55d52c6ab313caf1a04b55ad5244b20430686f1833a0e66e3501f3cbeb64893b7e35cc9fa75edcb3810b93fb8942d853a20
+  data.tar.gz: 7550e19b5a4ec5821e3b4603bab89d48f09fe6c24e65beb79130c5eda8fa2aa5f7e3e7fe08630bef0021ddcf3affc50964662db1e339d8e5b4c96c10ca08fea7

data/.rubocop.yml

@@ -6,6 +6,33 @@ AllCops:
 Bundler/OrderedGems:
   Enabled: false
 
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/IndentAssignment:
+  Enabled: false
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Layout/IndentHeredoc:
+  Enabled: false
+
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - spec/**/*_spec.rb
@@ -41,18 +68,9 @@ Security/MarshalLoad:
   Exclude:
     - 'script/worker_analysis'
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
-Style/CaseIndentation:
-  EnforcedStyle: end
-
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
@@ -68,43 +86,20 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   MaxLineLength: 40
 
-Style/IndentArray:
-  EnforcedStyle: consistent
-
-Style/IndentAssignment:
-  Enabled: false
-
-Style/IndentHash:
-  EnforcedStyle: consistent
-
-Style/IndentHeredoc:
-  Enabled: false
-
 Style/ParallelAssignment:
   Enabled: false
 
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%w': '[]'
-    '%W': '[]'
-
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 
 Style/SignalException:
   EnforcedStyle: semantic
 
-Style/SpaceBeforeBlockBraces:
-  EnforcedStyle: no_space
-
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+Style/SymbolArray:
+  Enabled: false
 
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: no_comma
 
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
-
-Style/SymbolArray:
-  Enabled: false

data/.travis.yml

@@ -15,11 +15,14 @@ rvm:
   - '2.4.1'
   - 'jruby-1.7.26'
   - 'jruby-9.0.5.0'
-  - 'jruby-9.1.5.0'
+  - 'jruby-9.1.9.0'
 script:
   - bundle exec image_optim --info
   - bundle exec rspec
 before_install:
+  - gem update --system
+  - gem update bundler
+  - nvm install stable
   - mkdir -p ~/bin
   - command -v svgo || npm install svgo
   - command -v pngout || curl -L "http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz" | tar -xz -C ~/bin --strip-components 2 --wildcards '*/x86_64/pngout'

data/CHANGELOG.markdown

@@ -2,6 +2,11 @@
 
 ## unreleased
 
+## v0.25.0 (2017-07-06)
+
+* Fix error `uninitialized constant EXIFR::JPEG` (breaking change in [exifr v1.3.0](https://github.com/remvee/exifr/commit/e073a22d06c39f2c1c0e77f5b5fe71545b25e967)) [#150](https://github.com/toy/image_optim/pull/150) [@abemedia](https://github.com/abemedia)
+* Add option to `pngquant` worker to limit maximum number of colors to use [#144](https://github.com/toy/image_optim/issues/144) [@toy](https://github.com/toy)
+
 ## v0.24.3 (2017-05-04)
 
 * Set mode of cache files to `0666 & ~umask`, related to [#147](https://github.com/toy/image_optim/issues/147) [@toy](https://github.com/toy)

data/README.markdown

@@ -58,7 +58,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.24'
+gem 'image_optim', '~> 0.25'
 ```
 <!---</update-version>-->
 
@@ -319,6 +319,7 @@ Worker has no options
 
 ### pngquant:
 * `:allow_lossy` — Allow quality option *(defaults to `false`)*
+* `:max_colors` — Maximum number of colors to use *(defaults to `256`)*
 * `:quality` — 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 *(defaults to `100..100`, `0..100` in lossy mode)*
 * `:speed` — speed/quality trade-off: `1` - slow, `3` - default, `11` - fast & rough *(defaults to `3`)*
 

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.24.3'
+  s.version     = '0.25.0'
   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']
@@ -29,6 +29,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.0'
-    s.add_development_dependency 'rubocop', '~> 0.47'
+    s.add_development_dependency 'rubocop', '~> 0.49'
   end
 end

data/lib/image_optim/worker/jhead.rb

@@ -1,5 +1,5 @@
 require 'image_optim/worker'
-require 'exifr'
+require 'exifr/jpeg'
 
 class ImageOptim
   class Worker

data/lib/image_optim/worker/pngquant.rb

@@ -9,6 +9,11 @@ class ImageOptim
       ALLOW_LOSSY_OPTION =
       option(:allow_lossy, false, 'Allow quality option'){ |v| !!v }
 
+      MAX_COLORS_OPTION =
+      option(:max_colors, 256, 'Maximum number of colors to use') do |v|
+        OptionHelpers.limit_with_range(v.to_i, 2..256)
+      end
+
       QUALITY_OPTION =
       option(:quality, '`100..100`, `0..100` in lossy mode',
              NonNegativeIntegerRange, 'min..max - don\'t '\
@@ -49,6 +54,7 @@ class ImageOptim
           --speed=#{speed}
           --output=#{dst}
           --force
+          #{max_colors}
           --
           #{src}
         ]

data/script/worker_analysis

@@ -133,8 +133,10 @@ class Analyser
 
   # Delegate to worker with short id
   class WorkerVariant < DelegateClass(ImageOptim::Worker)
-    attr_reader :name, :id, :cons_id
+    attr_reader :name, :id, :cons_id, :required
     def initialize(klass, image_optim, options)
+      @required = options.delete(:required)
+      @run_order = options.delete(:run_order)
       allow_consecutive_on = Array(options.delete(:allow_consecutive_on))
       @image_optim = image_optim
       @name = klass.bin_sym.to_s + options_string(options)
@@ -143,6 +145,10 @@ class Analyser
       @cons_id = [klass, allow_consecutive_on.map{ |key| [key, send(key)] }]
     end
 
+    def run_order
+      @run_order || super
+    end
+
     def etag
       [
         id,
@@ -155,7 +161,8 @@ class Analyser
 
     def bin_versions
       @bin_versions ||= used_bins.map do |name|
-        @image_optim.resolve_bin!(name).to_s
+        bin = @image_optim.resolve_bin!(name)
+        "#{bin.name} #{bin.version}"
       end
     end
 
@@ -189,7 +196,7 @@ class Analyser
 
       dst_size = success ? dst.size : nil
       digest = (success ? dst : src).digest
-      cache = digest.sub(/../, '\0/') + ".#{src.image_format}"
+      cache = digest.sub(/../, '\0/')
       result = new(worker.id, success, time, src.size, dst_size, cache)
       if success
         path = result.path
@@ -274,7 +281,9 @@ class Analyser
     end
 
     def run_workers(src, workers, last_result = nil, &block)
+      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]
@@ -306,19 +315,12 @@ class Analyser
     def difference_with(other)
       run_cache[:difference][other.digest] ||=
       Cache.get(:difference, [@path.digest, other.digest].sort, nil) do
-        images = [flatten_animation(@path), flatten_animation(other)]
-
-        alpha_presence = images.map do |image|
-          Cmd.capture("identify -format '%A' #{image.to_s.shellescape}")
-        end
-        if alpha_presence.uniq.length == 2
-          images.map!{ |image| underlay_noise(image) }
-        end
+        images = for_compare(@path, other)
 
         nrmse = Cmd.capture(%W[
           convert
-          #{images[0]} -auto-orient
-          #{images[1]} -auto-orient
+          #{images[0].image_format}:#{images[0]} -auto-orient
+          #{images[1].image_format}:#{images[1]} -auto-orient
           -metric RMSE
           -compare
           -format %[distortion]
@@ -331,16 +333,33 @@ class Analyser
       end
     end
 
+    def for_compare(*images)
+      images.map!{ |image| flatten_animation(image) }
+
+      alpha_presence = images.map do |image|
+        !!Cmd.capture(%W[
+          identify
+          -format %A
+          #{image.image_format}:#{image.to_s.shellescape}
+        ].shelljoin)[/true/i]
+      end
+      if alpha_presence.uniq.length != 1
+        images.map!{ |image| underlay_noise(image) }
+      end
+
+      images
+    end
+
     def flatten_animation(image)
       run_cache[:flatten][image.digest] ||= begin
         if image.image_format == :gif
           flattened = image.temp_path
           Cmd.run(*%W[
             convert
-            #{image}
+            #{image.image_format}:#{image}
             -coalesce
             -append
-            #{flattened}
+            #{image.image_format}:#{flattened}
           ]) || fail("failed flattening of #{image}")
           flattened
         else
@@ -354,12 +373,12 @@ class Analyser
         with_noise = image.temp_path
         Cmd.run(*%W[
           convert
-          #{image}
+          #{image.image_format}:#{image}
           +noise Random
-          #{image}
+          #{image.image_format}:#{image}
           -flatten
           -alpha off
-          #{with_noise}
+          #{image.image_format}:#{with_noise}
         ]) || fail("failed underlaying noise to #{image}")
         with_noise
       end
@@ -455,25 +474,24 @@ class Analyser
     end
   end
 
-  def initialize(option_variants)
-    option_variants = HashHelpers.deep_symbolise_keys(option_variants)
+  def initialize(config)
+    config = HashHelpers.deep_symbolise_keys(config)
     image_optim = ImageOptim.new
 
     @workers_by_format = Hash.new{ |h, k| h[k] = [] }
     ImageOptim::Worker.klasses.each do |klass|
-      worker_options_config = option_variants.delete(klass.bin_sym) || {}
-      allow_consecutive_on = worker_options_config.delete(:allow_consecutive_on)
-      worker_option_variants = case worker_options_config
-      when Array
-        worker_options_config
-      when Hash
-        worker_options_config.variants
-      else
-        fail "Array or Hash expected, got #{worker_options_config}"
+      worker_config = config.delete(klass.bin_sym)
+      next if worker_config == false
+      worker_config ||= {}
+
+      option_variants = worker_config.delete(:variants) || [{}]
+      option_variants = case option_variants
+      when Array then option_variants
+      when Hash then option_variants.variants
+      else fail "Array or Hash expected, got #{option_variants}"
       end
-      worker_option_variants.each do |options|
-        options = HashHelpers.deep_symbolise_keys(options)
-        options[:allow_consecutive_on] = allow_consecutive_on
+      option_variants.each do |options|
+        options = HashHelpers.deep_symbolise_keys(options).merge(worker_config)
         worker = WorkerVariant.new(klass, image_optim, options)
         worker.image_formats.each do |format|
           @workers_by_format[format] << worker
@@ -483,7 +501,7 @@ class Analyser
 
     log_workers_by_format
 
-    fail "unknown variants: #{option_variants}" unless option_variants.empty?
+    fail "unknown variants: #{config}" unless config.empty?
   end
 
   def analyse(paths)
@@ -553,7 +571,30 @@ private
   end
 end
 
-def option_variants
+abort <<-HELP if ARGV.empty?
+Specify paths for analysis.
+
+Example of `.analysis_variants.yml`:
+  jhead:
+    required: true # don't skip this worker
+  jpegtran: # 3 worker variants
+    variants:
+      - jpegrescan: true
+      - progressive: true
+      - progressive: false
+  optipng: # 6 worker variants by combining options
+    variants:
+      level: [6, 7]
+      interlace: [true, false, nil]
+  gifsicle: # allow variants with different interlace to run consecutively
+    variants:
+      allow_consecutive_on: interlace
+      interlace: [true, false]
+      careful: [true, false]
+  # other workers will be used with default options
+HELP
+
+Analyser.new(begin
   path = '.analysis_variants.yml'
   case h = YAML.load_file(path)
   when Hash then h
@@ -563,27 +604,4 @@ def option_variants
 rescue Errno::ENOENT => e
   warn e
   {}
-end
-
-analyser = Analyser.new(option_variants)
-
-if ARGV.empty?
-  abort <<-HELP
-Specify paths for analysis.
-
-Example of `.analysis_variants.yml`:
-  jpegtran: # 3 worker variants
-    - jpegrescan: true
-    - progressive: true
-    - progressive: false
-  optipng: # 6 worker variants by combining options
-    level: [6, 7]
-    interlace: [true, false, nil]
-  gifsicle: # allow variants with different interlace to run consecutively
-    allow_consecutive_on: interlace
-    interlace: [true, false]
-    careful: [true, false]
-  # other workers will be used with default options
-  HELP
-end
-analyser.analyse(ARGV)
+end).analyse(ARGV)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.49'
 description: 
 email: 
 executables: