image_optim 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2761c4a4a3488017b46d04acf157daa592537169ea05fcbeaf865928b0457618
-  data.tar.gz: 89c7fbe11f6b99cf3f1e8c4f3336fd122c1b16afd71fd56b1d0cbd6ab88c52c1
+  metadata.gz: b8d7c83b1d36f1cb0c41866cf421a8477632c43137749f2011b2520854de859d
+  data.tar.gz: 3030f2377d510cc964025e3497dfb2bc860bd560fa88e33acc97e3caaa56614c
 SHA512:
-  metadata.gz: facf38c901cbbd1ba0b8222637845b2e96dc8491e4a55b20a779be53e9ff6e14e561b2ab056aa9182205dd96df20ed0b25c8d8b5a1b3ebe721344ef5384bc7fc
-  data.tar.gz: f2d2f1d4179cce616a1024445d8a30b15367a4a156a0a085fa0d8b177f38e44aaff930788b90de6e8226e7b4c022eb1877794aceee5e62cd7e7c1153554238e3
+  metadata.gz: 3df3a7cd3606e03dc16fd7aed023e40f61e5c4b688707a39240cc67b5432b9705fbb2c33df9ec8a1da96e4408d7a5270b6a181415647e53c686565f45b5c2bd4
+  data.tar.gz: b19684e4d13d29e6ac52e3ba5cddb38a6716f9acfae9946962ab45582a38e49c6c42018387d66e75a5f52d7153e12cf4a9e9dc10388f6d36bd4834d5a5e78ee0

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.27.1 (2020-09-30)
+
+* Fixed atomic replacement for case when equal `File::Stat#dev` doesn't mean that file can be linked [#180](https://github.com/toy/image_optim/issues/180) [@toy](https://github.com/toy)
+
 ## v0.27.0 (2020-08-27)
 
 * Use `.tmp` as the extension for temporary file if it needs to be created for atomic replacement [#178](https://github.com/toy/image_optim/issues/178) [@toy](https://github.com/toy)

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.27.0'
+  s.version     = '0.27.1'
   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, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/image_optim/cache_path.rb

@@ -11,7 +11,21 @@ class ImageOptim
       tmpdir = [dirname, Path.new(Dir.tmpdir)].find do |dir|
         dir.same_dev?(dst.dirname)
       end
-      dst.temp_path_with_tmp_ext(tmpdir || dst.dirname) do |temp|
+      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/path.rb

@@ -53,13 +53,13 @@ class ImageOptim
       dst = self.class.convert(dst)
       if same_dev?(dst.dirname)
         dst.copy_metadata(self)
-        rename(dst.to_s)
-      else
-        dst.temp_path_with_tmp_ext(dst.dirname) do |temp|
-          move(temp)
-          dst.copy_metadata(temp)
-          temp.rename(dst.to_s)
+        begin
+          rename(dst.to_s)
+        rescue Errno::EXDEV
+          replace_using_tmp_file(dst)
         end
+      else
+        replace_using_tmp_file(dst)
       end
     end
 
@@ -80,6 +80,14 @@ class ImageOptim
       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

data/lib/image_optim/worker/optipng.rb

@@ -39,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

@@ -39,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/spec/image_optim/cache_path_spec.rb

@@ -8,12 +8,14 @@ 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 }
 
     shared_examples 'replaces file' do
       it 'moves data to destination' do
@@ -58,7 +60,7 @@ describe ImageOptim::CachePath do
       end
 
       it 'is using temporary file with .tmp extension' do
-        expect(src).to receive(:copy).with(having_attributes(:extname => '.tmp'))
+        expect(src).to receive(:copy).with(having_attributes(:extname => '.tmp')).at_least(:once)
 
         src.replace(dst)
       end
@@ -79,5 +81,22 @@ describe ImageOptim::CachePath do
 
       include_examples 'replaces file'
     end
+
+    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/path_spec.rb

@@ -125,5 +125,20 @@ describe ImageOptim::Path do
         src.replace(dst)
       end
     end
+
+    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

data/spec/image_optim_spec.rb

@@ -23,10 +23,11 @@ describe ImageOptim do
     stub_const('Cmd', ImageOptim::Cmd)
   end
 
-  isolated_options_base = {:skip_missing_workers => false}
-  ImageOptim::Worker.klasses.each do |klass|
-    isolated_options_base[klass.bin_sym] = false
-  end
+  isolated_options_base = Hash[
+    ImageOptim::Worker.klasses.map do |klass|
+      [klass.bin_sym, false]
+    end
+  ].merge(:skip_missing_workers => false)
 
   ImageOptim::Worker.klasses.each do |worker_klass|
     describe "#{worker_klass.bin_sym} worker" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -269,7 +269,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.27.0
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.27.1
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem