mini_magick 4.9.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec4d1852a0e65227776a89740f0ba57fe4925e41806387fc194492f825c9f5ea
-  data.tar.gz: 5263d3061216db6852a0b89d9b2ab0c32f05fcd9b685bf1aca125d41d52c714a
+  metadata.gz: bd1b90888eb75abf0899889732c4e4321813141e80dea7f9fa5cce53605f9c26
+  data.tar.gz: 325191562a968ccbabd99ab4946d78f95caebbbb510992f0fb1bb65c770b364d
 SHA512:
-  metadata.gz: 12b052fb0879fe8e3d59d6f626ff5690f26795bf8a23b7990ba86fc74382c103f8582760dbae26d8910c7e6877d853fbea13ebf3c93e524f93901cb57635935c
-  data.tar.gz: 5f5fda33afe5326356f3d9f2930160559b5bbe372528313c4ecebfad91a1de86edb9f2503426c0cff96035430a7a6c83a24b79174b520ecd55c31ce880eb49f1
+  metadata.gz: 1964d16e84e1c032564068345b42312e64915bb71fd6560c17a73a33bcbccae3fb1453ecc79e600df0e55183031a6673a2ae2ad454941c76f97c7939f50b8b16
+  data.tar.gz: f2846d504c4c95e29a17bfb880a40ba6685e4a5f0511997560c5a46d967b743ec6403343300ca8344ccd9a470fd3a0085d2c14c075c7efaccae1a4825c68444f

data/lib/mini_magick/image/info.rb

@@ -91,7 +91,7 @@ module MiniMagick
             line = line.chomp("\n")
 
             case MiniMagick.cli
-            when :imagemagick
+            when :imagemagick, :imagemagick7
               if match = line.match(/^exif:/)
                 key, value = match.post_match.split("=", 2)
                 value = decode_comma_separated_ascii_characters(value) if ASCII_ENCODED_EXIF_KEYS.include?(key)
@@ -120,7 +120,7 @@ module MiniMagick
       end
 
       def details
-        warn "[MiniMagick] MiniMagick::Image#details has been deprecated, as it was causing too many parsing errors. You should use MiniMagick::Image#data instead, which differs in a way that the keys are in camelcase." if MiniMagick.imagemagick?
+        warn "[MiniMagick] MiniMagick::Image#details has been deprecated, as it was causing too many parsing errors. You should use MiniMagick::Image#data instead, which differs in a way that the keys are in camelcase." if MiniMagick.imagemagick? || MiniMagick.imagemagick7?
 
         @info["details"] ||= (
           details_string = identify(&:verbose)

data/lib/mini_magick/shell.rb

@@ -38,9 +38,27 @@ module MiniMagick
     def execute_open3(command, options = {})
       require "open3"
 
-      in_w, out_r, err_r, subprocess_thread = Open3.popen3(*command)
+      # We would ideally use Open3.capture3, but it wouldn't allow us to
+      # terminate the command after timing out.
+      Open3.popen3(*command) do |in_w, out_r, err_r, thread|
+        [in_w, out_r, err_r].each(&:binmode)
+        stdout_reader = Thread.new { out_r.read }
+        stderr_reader = Thread.new { err_r.read }
+        begin
+          in_w.write options[:stdin].to_s
+        rescue Errno::EPIPE
+        end
+        in_w.close
+
+        begin
+          Timeout.timeout(MiniMagick.timeout, nil, "MiniMagick command timed out: #{command}") { thread.join }
+        ensure
+          Process.kill("TERM", thread.pid) rescue nil
+          Process.waitpid(thread.pid)      rescue nil
+        end
 
-      capture_command(in_w, out_r, err_r, subprocess_thread, options)
+        [stdout_reader.value, stderr_reader.value, thread.value]
+      end
     end
 
     def execute_posix_spawn(command, options = {})
@@ -48,31 +66,7 @@ module MiniMagick
       child = POSIX::Spawn::Child.new(*command, input: options[:stdin].to_s, timeout: MiniMagick.timeout)
       [child.out, child.err, child.status]
     rescue POSIX::Spawn::TimeoutExceeded
-      raise Timeout::Error
-    end
-
-    def capture_command(in_w, out_r, err_r, subprocess_thread, options)
-      [in_w, out_r, err_r].each(&:binmode)
-      stdout_reader = Thread.new { out_r.read }
-      stderr_reader = Thread.new { err_r.read }
-      begin
-        in_w.write options[:stdin].to_s
-      rescue Errno::EPIPE
-      end
-      in_w.close
-
-      Timeout.timeout(MiniMagick.timeout) { subprocess_thread.join }
-
-      [stdout_reader.value, stderr_reader.value, subprocess_thread.value]
-    rescue Timeout::Error => error
-      begin
-        Process.kill("TERM", subprocess_thread.pid)
-      rescue Errno::ESRCH
-        # ignore if the PID doesn't exist
-      end
-      raise error
-    ensure
-      [out_r, err_r].each(&:close)
+      raise Timeout::Error, "MiniMagick command timed out: #{command}"
     end
 
     def log(command, &block)

data/lib/mini_magick/version.rb

@@ -9,7 +9,7 @@ module MiniMagick
   module VERSION
     MAJOR = 4
     MINOR = 9
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.9.1
 platform: ruby
 authors:
 - Corey Johnson