image_optim 0.26.3 → 0.28.0

data/lib/image_optim/cmd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'English'
 
 class ImageOptim

data/lib/image_optim/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/option_helpers'
 require 'image_optim/configuration_error'
 require 'image_optim/hash_helpers'
@@ -18,7 +20,7 @@ class ImageOptim
     end
 
     # Local config path at `./.image_optim.yml`
-    LOCAL_PATH = './.image_optim.yml'.freeze
+    LOCAL_PATH = './.image_optim.yml'
 
     class << self
       # Read options at path: expand path (warn on failure), return {} if file
@@ -195,10 +197,10 @@ class ImageOptim
       when /darwin9/
         Cmd.capture 'hwprefs cpu_count'
       when /darwin/
-        if (Cmd.capture 'which hwprefs') != ''
-          Cmd.capture 'hwprefs thread_count'
-        else
+        if (Cmd.capture 'which hwprefs') == ''
           Cmd.capture 'sysctl -n hw.ncpu'
+        else
+          Cmd.capture 'hwprefs thread_count'
         end
       when /linux/
         Cmd.capture 'grep -c processor /proc/cpuinfo'

data/lib/image_optim/configuration_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   class ConfigurationError < StandardError; end
 end

data/lib/image_optim/handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/path'
 
 class ImageOptim

data/lib/image_optim/hash_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   # Helper methods to manipulate Hash, mainly used in config
   module HashHelpers

data/lib/image_optim/image_meta.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_size'
 
 class ImageOptim

data/lib/image_optim/non_negative_integer_range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   # Denote range of non negative integers for worker option
   class NonNegativeIntegerRange

data/lib/image_optim/optimized_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/path'
 
 class ImageOptim
@@ -5,7 +7,7 @@ class ImageOptim
   class OptimizedPath < DelegateClass(Path)
     def initialize(path, original_or_size = nil)
       path = Path.convert(path)
-      __setobj__(path)
+      super(path)
       if original_or_size.is_a?(Integer)
         @original = path
         @original_size = original_or_size

data/lib/image_optim/option_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   # Hold information about an option
   class OptionDefinition

data/lib/image_optim/option_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   # Helper methods for options
   module OptionHelpers

data/lib/image_optim/path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fspath'
 require 'image_optim/image_meta'
 
@@ -48,11 +50,16 @@ class ImageOptim
 
     # Atomic replace dst with self
     def replace(dst)
-      dst = self.class.new(dst)
-      dst.temp_path(dst.dirname) do |temp|
-        move(temp)
-        dst.copy_metadata(temp)
-        temp.rename(dst.to_s)
+      dst = self.class.convert(dst)
+      if same_dev?(dst.dirname)
+        dst.copy_metadata(self)
+        begin
+          rename(dst.to_s)
+        rescue Errno::EXDEV
+          replace_using_tmp_file(dst)
+        end
+      else
+        replace_using_tmp_file(dst)
       end
     end
 
@@ -66,5 +73,23 @@ class ImageOptim
     def self.convert(path)
       path.is_a?(self) ? path : new(path)
     end
+
+  protected
+
+    def same_dev?(other)
+      stat.dev == other.stat.dev
+    end
+
+    def replace_using_tmp_file(dst)
+      dst.temp_path_with_tmp_ext(dst.dirname) do |temp|
+        move(temp)
+        dst.copy_metadata(temp)
+        temp.rename(dst.to_s)
+      end
+    end
+
+    def temp_path_with_tmp_ext(*args, &block)
+      self.class.temp_file_path([basename.to_s, '.tmp'], *args, &block)
+    end
   end
 end

data/lib/image_optim/runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim'
 require 'image_optim/hash_helpers'
 require 'image_optim/runner/glob_helpers'

data/lib/image_optim/runner/glob_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   class Runner
     # Helper methods for glob
@@ -21,7 +23,7 @@ class ImageOptim
             .*            # what is left
           )
           \z
-        /x
+        /x.freeze
 
         # Expand curly braces in glob as fnmatch in ruby before 2.0 doesn't
         # support them

data/lib/image_optim/runner/option_parser.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'image_optim'
 require 'image_optim/true_false_nil'
@@ -42,7 +43,7 @@ class ImageOptim
         # don't try to wrap if there is too little space for description
         return text if wrapped_width < 20
 
-        wrapped = ''
+        wrapped = ''.dup
         text.split("\n").each do |line|
           if line.length <= columns
             wrapped << line << "\n"
@@ -186,7 +187,7 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   ImageOptim::Worker.klasses.each_with_index do |klass, i|
     next if klass.option_definitions.empty?
 
-    op.separator nil unless i.zero?
+    op.separator nil unless i == 0
 
     bin = klass.bin_sym
     klass.option_definitions.each do |option_definition|
@@ -201,6 +202,8 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
         [Integer, 'N']
       when Array >= type
         [Array, 'a,b,c']
+      when String >= type
+        [String, 'S']
       when ImageOptim::NonNegativeIntegerRange == type
         [type, 'M-N']
       else

data/lib/image_optim/space.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   # Present size in readable form as fixed length string
   module Space
@@ -15,7 +17,7 @@ class ImageOptim
       else
         log_denominator = Math.log(size.abs) / Math.log(BASE)
         degree = [log_denominator.floor, SIZE_SYMBOLS.length - 1].min
-        number_string = if degree.zero?
+        number_string = if degree == 0
           size.to_s
         else
           denominator = BASE**degree

data/lib/image_optim/true_false_nil.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   # Denote ternary value (`true`/`false`/`nil`) for worker option
   class TrueFalseNil

data/lib/image_optim/worker.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'image_optim/cmd'
 require 'image_optim/configuration_error'

data/lib/image_optim/worker/advpng.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 require 'image_optim/option_helpers'
 

data/lib/image_optim/worker/class_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/bin_resolver'
 require 'image_optim/option_definition'
 
@@ -16,6 +18,7 @@ class ImageOptim
 
       # Remember all classes inheriting from this one
       def inherited(base)
+        super
         @klasses << base
       end
 
@@ -34,6 +37,7 @@ class ImageOptim
 
       def option(name, default, type, description = nil, &proc)
         attr_reader name
+
         OptionDefinition.new(name, default, type, description, &proc).
           tap{ |option_definition| option_definitions << option_definition }
       end

data/lib/image_optim/worker/gifsicle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 
 class ImageOptim

data/lib/image_optim/worker/jhead.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 require 'exifr/jpeg'
 
@@ -7,7 +9,7 @@ class ImageOptim
     #
     # Jhead internally uses jpegtran which should be on path
     class Jhead < Worker
-      ORIENTED = 2..8 # not top-left
+      ORIENTED = (2..8).freeze # not top-left
 
       # Works on jpegs
       def image_formats

data/lib/image_optim/worker/jpegoptim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 require 'image_optim/option_helpers'
 
@@ -9,14 +11,16 @@ class ImageOptim
       option(:allow_lossy, false, 'Allow limiting maximum quality'){ |v| !!v }
 
       STRIP_OPTION =
-      option(:strip, :all, Array, 'List of extra markers to strip: '\
-          '`:comments`, '\
+      option(:strip, :all, Array, 'List of markers to strip: '\
+          '`:com`, '\
           '`:exif`, '\
           '`:iptc`, '\
-          '`:icc` or '\
+          '`:icc`, '\
+          '`:xmp`, '\
+          '`:none` or '\
           '`:all`') do |v|
         values = Array(v).map(&:to_s)
-        known_values = %w[all comments exif iptc icc]
+        known_values = %w[com exif iptc icc xmp none all]
         unknown_values = values - known_values
         unless unknown_values.empty?
           warn "Unknown markers for jpegoptim: #{unknown_values.join(', ')}"

data/lib/image_optim/worker/jpegrecompress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 require 'image_optim/option_helpers'
 
@@ -24,6 +26,20 @@ class ImageOptim
         OptionHelpers.limit_with_range(v.to_i, 0...QUALITY_NAMES.length)
       end
 
+      METHOD_OPTION =
+      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
+        else
+          warn "Unknown method for jpegrecompress: #{v}"
+          opt_def.default
+        end
+      end
+
       def used_bins
         [:'jpeg-recompress']
       end
@@ -36,6 +52,7 @@ class ImageOptim
       def optimize(src, dst)
         args = %W[
           --quality #{QUALITY_NAMES[quality]}
+          --method #{method}
           --no-copy
           #{src}
           #{dst}

data/lib/image_optim/worker/jpegtran.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 
 class ImageOptim

data/lib/image_optim/worker/optipng.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 require 'image_optim/option_helpers'
 require 'image_optim/true_false_nil'
@@ -37,8 +39,8 @@ class ImageOptim
           #{dst}
         ]
         args.unshift "-i#{interlace ? 1 : 0}" unless interlace.nil?
-        if resolve_bin!(:optipng).version >= '0.7'
-          args.unshift '-strip', 'all' if strip
+        if strip && resolve_bin!(:optipng).version >= '0.7'
+          args.unshift '-strip', 'all'
         end
         execute(:optipng, *args) && optimized?(src, dst)
       end

data/lib/image_optim/worker/pngcrush.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 
 class ImageOptim
@@ -37,8 +39,8 @@ class ImageOptim
         end
         flags.push '-fix' if fix
         flags.push '-brute' if brute
-        if resolve_bin!(:pngcrush).version >= '1.7.38'
-          flags.push '-blacken' if blacken
+        if blacken && resolve_bin!(:pngcrush).version >= '1.7.38'
+          flags.push '-blacken'
         end
 
         args = flags + %W[

data/lib/image_optim/worker/pngout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 require 'image_optim/option_helpers'
 

data/lib/image_optim/worker/pngquant.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 require 'image_optim/option_helpers'
 require 'image_optim/non_negative_integer_range'
@@ -53,6 +55,7 @@ class ImageOptim
           --quality=#{quality.begin}-#{quality.end}
           --speed=#{speed}
           --output=#{dst}
+          --skip-if-larger
           --force
           #{max_colors}
           --

data/lib/image_optim/worker/svgo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/worker'
 
 class ImageOptim

data/script/update_worker_options_in_readme

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'bundler/setup'
 
 require 'image_optim'
 
 README_FILE = File.expand_path('../../README.markdown', __FILE__)
-BEGIN_MARKER = '<!---<worker-options>-->'.freeze
-END_MARKER = '<!---</worker-options>-->'.freeze
+BEGIN_MARKER = '<!---<worker-options>-->'
+END_MARKER = '<!---</worker-options>-->'
 
 def write_worker_options(io, klass)
   io.puts "### #{klass.bin_sym}:"
@@ -17,7 +18,7 @@ def write_worker_options(io, klass)
     klass.option_definitions.each do |option_definition|
       line = "* `:#{option_definition.name}` — #{option_definition.description}"
       unless line['(defaults']
-        line << " *(defaults to #{option_definition.default_description})*"
+        line += " *(defaults to #{option_definition.default_description})*"
       end
       io.puts line
     end

data/script/worker_analysis

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'bundler/setup'
 
@@ -12,7 +13,7 @@ require 'digest'
 require 'erb'
 require 'ostruct'
 
-DIR = 'tmp'.freeze
+DIR = 'tmp'
 Pathname(DIR).mkpath
 
 Array.class_eval do
@@ -136,13 +137,14 @@ class Analyser
   # Delegate to worker with short id
   class WorkerVariant < DelegateClass(ImageOptim::Worker)
     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)
-      __setobj__(klass.new(image_optim, options))
+      super(klass.new(image_optim, options))
       @id = klass.bin_sym.to_s + options_string(self.options)
       @cons_id = [klass, allow_consecutive_on.map{ |key| [key, send(key)] }]
     end
@@ -451,6 +453,7 @@ class Analyser
       attr_reader :name
       attr_reader :success_count
       attr_reader :time, :avg_time
+
       def initialize(name, steps)
         @name = name
         @success_count = steps.count(&:success)
@@ -459,11 +462,12 @@ class Analyser
       end
 
       def unused?
-        success_count.zero?
+        success_count == 0
       end
     end
 
     attr_reader :name, :results, :ids2names
+
     def initialize(name, results, ids2names)
       @name = name.to_s
       @results = results