image_optim 0.26.2 → 0.27.1

data/lib/image_optim/bin_resolver/comparable_condition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   class BinResolver
     # Allows to externalize conditions for an instance of Comparable to use in
@@ -24,6 +26,7 @@ class ImageOptim
       end
 
       attr_reader :method, :args
+
       def initialize(method, *args)
         @method, @args = method.to_sym, args
 

data/lib/image_optim/bin_resolver/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   class BinResolver
     # Base error during bin resolving

data/lib/image_optim/bin_resolver/simple_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImageOptim
   class BinResolver
     # Allows comparision of simple versions, only numbers separated by dots are

data/lib/image_optim/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest/sha1'
 require 'fspath'
 require 'image_optim/cache_path'
@@ -7,6 +9,7 @@ class ImageOptim
   class Cache
     def initialize(image_optim, workers_by_format)
       return unless image_optim.cache_dir
+
       @cache_dir = FSPath.new(image_optim.cache_dir)
       @cache_worker_digests = image_optim.cache_worker_digests
       @options_by_format = Hash[workers_by_format.map do |format, workers|

data/lib/image_optim/cache_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/path'
 
 class ImageOptim
@@ -5,8 +7,25 @@ class ImageOptim
   class CachePath < Path
     # Atomic replace dst with self
     def replace(dst)
-      dst = self.class.new(dst)
-      dst.temp_path(dst.dirname) do |temp|
+      dst = self.class.convert(dst)
+      tmpdir = [dirname, Path.new(Dir.tmpdir)].find do |dir|
+        dir.same_dev?(dst.dirname)
+      end
+      if tmpdir
+        begin
+          replace_using_tmp_file(dst, tmpdir)
+        rescue Errno::EXDEV
+          replace_using_tmp_file(dst, dst.dirname)
+        end
+      else
+        replace_using_tmp_file(dst, dst.dirname)
+      end
+    end
+
+  private
+
+    def replace_using_tmp_file(dst, tmpdir)
+      dst.temp_path_with_tmp_ext(tmpdir) do |temp|
         copy(temp)
         dst.copy_metadata(temp)
         temp.rename(dst.to_s)

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
@@ -32,10 +34,12 @@ class ImageOptim
           return {}
         end
         return {} unless File.size?(full_path)
+
         config = YAML.load_file(full_path)
         unless config.is_a?(Hash)
           fail "expected hash, got #{config.inspect}"
         end
+
         HashHelpers.deep_symbolise_keys(config)
       rescue => e
         warn "exception when reading #{full_path}: #{e}"
@@ -77,6 +81,7 @@ class ImageOptim
     def assert_no_unused_options!
       unknown_options = @options.reject{ |key, _value| @used.include?(key) }
       return if unknown_options.empty?
+
       fail ConfigurationError, "unknown options #{unknown_options.inspect}"
     end
 
@@ -131,6 +136,7 @@ class ImageOptim
       true
     rescue LoadError => e
       raise "Cannot load image_optim_pack: #{e}" if pack
+
       false
     end
 

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
@@ -39,6 +41,7 @@ class ImageOptim
       @dst ||= @original.temp_path
 
       return unless yield @src, @dst
+
       @result = @dst
       if @src == @original
         @src, @dst = @dst, nil
@@ -50,6 +53,7 @@ class ImageOptim
     # Remove extra temp files
     def cleanup
       return unless @dst
+
       @dst.unlink
       @dst = nil
     end

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'
@@ -104,6 +106,7 @@ class ImageOptim
         if File.file?(path)
           next if exclude_file?(dir, path)
           next unless @image_optim.optimizable?(path)
+
           to_optimize << path
         elsif File.directory?(path)
           Find.prune if dir != path && exclude_dir?(dir, path)

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"
@@ -185,7 +186,8 @@ 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|

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'
@@ -23,6 +24,7 @@ class ImageOptim
       unless image_optim.is_a?(ImageOptim)
         fail ArgumentError, 'first parameter should be an ImageOptim instance'
       end
+
       @image_optim = image_optim
       parse_options(options)
       assert_no_unknown_options!(options)
@@ -49,6 +51,7 @@ class ImageOptim
       unless format_from_name
         fail "#{self.class}: can't guess applicable format from worker name"
       end
+
       [format_from_name.to_sym]
     end
 
@@ -68,6 +71,7 @@ class ImageOptim
         @image_optim.resolve_bin!(bin)
       end
       return if errors.empty?
+
       fail BinResolver::Error, wrap_resolver_error_message(errors.join(', '))
     end
 
@@ -98,6 +102,7 @@ class ImageOptim
       known_keys = self.class.option_definitions.map(&:name)
       unknown_options = options.reject{ |key, _value| known_keys.include?(key) }
       return if unknown_options.empty?
+
       fail ConfigurationError, "unknown options #{unknown_options.inspect} "\
           "for #{self}"
     end

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
@@ -83,6 +87,7 @@ class ImageOptim
         klasses.map do |klass|
           options = options_proc[klass]
           next if options[:disable]
+
           if !options.key?(:allow_lossy) && klass.method_defined?(:allow_lossy)
             options[:allow_lossy] = image_optim.allow_lossy
           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
@@ -25,6 +27,7 @@ class ImageOptim
 
       def optimize(src, dst)
         return false unless oriented?(src)
+
         src.copy(dst)
         args = %W[
           -autorot

data/lib/image_optim/worker/jpegoptim.rb

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

data/lib/image_optim/worker/jpegrecompress.rb

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