image_optim 0.26.2 → 0.27.1

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'
 
@@ -35,6 +37,7 @@ class ImageOptim
       rescue SignalException => e
         raise unless Signal.list.key(e.signo) == 'SEGV'
         raise unless resolve_bin!(:pngout).version <= '20150920'
+
         warn "pngout caused Segmentation fault for #{src}"
       end
     end

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'

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}:"

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
@@ -118,8 +119,10 @@ class Analyser
       def get!(key, etag)
         raw = DB[Marshal.dump(key)]
         return unless raw
+
         entry = Marshal.load(raw)
         return unless entry[1] == etag
+
         entry[0]
       end
 
@@ -134,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
@@ -175,6 +179,7 @@ class Analyser
 
     def options_string(options)
       return '' if options.empty?
+
       "(#{options.sort.map{ |k, v| "#{k}:#{v.inspect}" }.join(', ')})"
     end
   end
@@ -284,6 +289,7 @@ class Analyser
       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]
@@ -329,6 +335,7 @@ class Analyser
         unless $CHILD_STATUS.success?
           fail "failed comparison of #{@path} with #{other}"
         end
+
         nrmse
       end
     end
@@ -446,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)
@@ -454,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
@@ -482,6 +491,7 @@ class Analyser
     ImageOptim::Worker.klasses.each do |klass|
       worker_config = config.delete(klass.bin_sym)
       next if worker_config == false
+
       worker_config ||= {}
 
       option_variants = worker_config.delete(:variants) || [{}]

data/spec/image_optim/bin_resolver/comparable_condition_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/bin_resolver/comparable_condition'
 

data/spec/image_optim/bin_resolver/simple_version_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/bin_resolver/simple_version'
 

data/spec/image_optim/bin_resolver_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/bin_resolver'
 require 'image_optim/cmd'
@@ -278,9 +280,9 @@ describe ImageOptim::BinResolver do
       bin = Bin.new(:advpng, '/bin/advpng')
 
       expect(Bin).to receive(:new).and_return(bin)
-      allow(bin).to receive(:version).and_return(SimpleVersion.new('1.15'))
+      allow(bin).to receive(:version).and_return(SimpleVersion.new('none'))
 
-      expect(bin).to receive(:warn).once.with(match(/does not use zopfli/))
+      expect(bin).to receive(:warn).once.with(match(/is of unknown version/))
 
       5.times do
         resolver.resolve!(:pngcrush)

data/spec/image_optim/cache_path_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/cache_path'
 require 'tempfile'
@@ -6,52 +8,95 @@ describe ImageOptim::CachePath do
   include CapabilityCheckHelpers
 
   before do
+    stub_const('Path', ImageOptim::Path)
     stub_const('CachePath', ImageOptim::CachePath)
   end
 
   describe '#replace' do
-    let(:src){ CachePath.temp_file_path }
-    let(:dst){ CachePath.temp_file_path }
+    let(:src_dir){ Path.temp_dir }
+    let(:src){ CachePath.temp_file_path(nil, src_dir) }
+    let(:dst){ Path.temp_file_path }
 
-    it 'moves data to destination' do
-      src.write('src')
+    shared_examples 'replaces file' do
+      it 'moves data to destination' do
+        src.write('src')
 
-      src.replace(dst)
+        src.replace(dst)
 
-      expect(dst.read).to eq('src')
-    end
+        expect(dst.read).to eq('src')
+      end
 
-    it 'does not remove original file' do
-      src.replace(dst)
+      it 'does not remove original file' do
+        src.replace(dst)
 
-      expect(src).to exist
-    end
+        expect(src).to exist
+      end
+
+      it 'preserves attributes of destination file' do
+        skip 'full file modes are not support' unless any_file_modes_allowed?
+        mode = 0o666
+
+        dst.chmod(mode)
+
+        src.replace(dst)
 
-    it 'preserves attributes of destination file' do
-      skip 'full file modes are not support' unless any_file_modes_allowed?
-      mode = 0o666
+        got = dst.stat.mode & 0o777
+        expect(got).to eq(mode), format('expected %04o, got %04o', mode, got)
+      end
 
-      dst.chmod(mode)
+      it 'does not preserve mtime of destination file' do
+        time = src.mtime
 
-      src.replace(dst)
+        dst.utime(time - 1000, time - 1000)
 
-      got = dst.stat.mode & 0o777
-      expect(got).to eq(mode), format('expected %04o, got %04o', mode, got)
+        src.replace(dst)
+
+        expect(dst.mtime).to be >= time
+      end
+
+      it 'changes inode of destination' do
+        skip 'inodes are not supported' unless inodes_supported?
+        expect{ src.replace(dst) }.to change{ dst.stat.ino }
+      end
+
+      it 'is using temporary file with .tmp extension' do
+        expect(src).to receive(:copy).with(having_attributes(:extname => '.tmp')).at_least(:once)
+
+        src.replace(dst)
+      end
     end
 
-    it 'does not preserve mtime of destination file' do
-      time = src.mtime
+    context 'when src and dst are on same device' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev).and_return(0)
+      end
 
-      dst.utime(time - 1000, time - 1000)
+      include_examples 'replaces file'
+    end
 
-      src.replace(dst)
+    context 'when src and dst are on different devices' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev, &:__id__)
+      end
 
-      expect(dst.mtime).to be >= time
+      include_examples 'replaces file'
     end
 
-    it 'changes inode of destination' do
-      skip 'inodes are not supported' unless inodes_supported?
-      expect{ src.replace(dst) }.to change{ dst.stat.ino }
+    context 'when src and dst are on same device, but rename causes Errno::EXDEV' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev).and_return(0)
+        allow(described_class).to receive(:temp_file_path).and_call_original
+        expect(described_class).to receive(:temp_file_path).
+          with([dst.basename.to_s, '.tmp'], src.dirname).
+          and_wrap_original do |m, *args, &block|
+            m.call(*args) do |tmp|
+              expect(tmp).to receive(:rename).with(dst.to_s).and_raise(Errno::EXDEV)
+              block.call(tmp)
+            end
+          end
+      end
+
+      include_examples 'replaces file'
     end
   end
 end

data/spec/image_optim/cache_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fspath'
 require 'image_optim/cache'
@@ -62,6 +64,7 @@ describe ImageOptim::Cache do
     end
   end
 
+  # rubocop:disable Style/RedundantFetchBlock
   shared_examples 'an enabled cache' do
     context 'when cached file does not exist' do
       describe :fetch do
@@ -114,6 +117,7 @@ describe ImageOptim::Cache do
       end
     end
   end
+  # rubocop:enable Style/RedundantFetchBlock
 
   context 'when cache is enabled (without worker digests)' do
     let(:image_optim) do

data/spec/image_optim/cmd_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/cmd'
 

data/spec/image_optim/config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/config'
 

data/spec/image_optim/handler_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/handler'
 

data/spec/image_optim/hash_helpers_spec.rb

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

data/spec/image_optim/image_meta_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/image_meta'
 
 describe ImageOptim::ImageMeta do

data/spec/image_optim/optimized_path_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_optim/optimized_path'
 
 describe ImageOptim::OptimizedPath do

data/spec/image_optim/option_definition_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/option_definition'
 

data/spec/image_optim/option_helpers_spec.rb

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

data/spec/image_optim/path_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'image_optim/path'
 require 'tempfile'
@@ -59,45 +61,84 @@ describe ImageOptim::Path do
     let(:src){ Path.temp_file_path }
     let(:dst){ Path.temp_file_path }
 
-    it 'moves data to destination' do
-      src.write('src')
+    shared_examples 'replaces file' do
+      it 'moves data to destination' do
+        src.write('src')
 
-      src.replace(dst)
+        src.replace(dst)
 
-      expect(dst.read).to eq('src')
-    end
+        expect(dst.read).to eq('src')
+      end
 
-    it 'removes original file' do
-      src.replace(dst)
+      it 'removes original file' do
+        src.replace(dst)
 
-      expect(src).to_not exist
-    end
+        expect(src).to_not exist
+      end
+
+      it 'preserves attributes of destination file' do
+        skip 'full file modes are not support' unless any_file_modes_allowed?
+        mode = 0o666
+
+        dst.chmod(mode)
+
+        src.replace(dst)
+
+        got = dst.stat.mode & 0o777
+        expect(got).to eq(mode), format('expected %04o, got %04o', mode, got)
+      end
+
+      it 'does not preserve mtime of destination file' do
+        time = src.mtime
+
+        dst.utime(time - 1000, time - 1000)
 
-    it 'preserves attributes of destination file' do
-      skip 'full file modes are not support' unless any_file_modes_allowed?
-      mode = 0o666
+        src.replace(dst)
 
-      dst.chmod(mode)
+        expect(dst.mtime).to be >= time
+      end
+
+      it 'changes inode of destination' do
+        skip 'inodes are not supported' unless inodes_supported?
+        expect{ src.replace(dst) }.to change{ dst.stat.ino }
+      end
+    end
 
-      src.replace(dst)
+    context 'when src and dst are on same device' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev).and_return(0)
+      end
 
-      got = dst.stat.mode & 0o777
-      expect(got).to eq(mode), format('expected %04o, got %04o', mode, got)
+      include_examples 'replaces file'
     end
 
-    it 'does not preserve mtime of destination file' do
-      time = src.mtime
+    context 'when src and dst are on different devices' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev, &:__id__)
+      end
 
-      dst.utime(time - 1000, time - 1000)
+      include_examples 'replaces file'
 
-      src.replace(dst)
+      it 'is using temporary file with .tmp extension' do
+        expect(src).to receive(:move).with(having_attributes(:extname => '.tmp'))
 
-      expect(dst.mtime).to be >= time
+        src.replace(dst)
+      end
     end
 
-    it 'changes inode of destination' do
-      skip 'inodes are not supported' unless inodes_supported?
-      expect{ src.replace(dst) }.to change{ dst.stat.ino }
+    context 'when src and dst are on same device, but rename causes Errno::EXDEV' do
+      before do
+        allow_any_instance_of(File::Stat).to receive(:dev).and_return(0)
+        expect(src).to receive(:rename).with(dst.to_s).once.and_raise(Errno::EXDEV)
+      end
+
+      include_examples 'replaces file'
+
+      it 'is using temporary file with .tmp extension' do
+        expect(src).to receive(:move).with(having_attributes(:extname => '.tmp'))
+
+        src.replace(dst)
+      end
     end
   end
 end