mini_magick 5.3.1 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edcf3d52dfa447f650be4854b37f3352979bb33c52726fe0b48174b9f66d8259
-  data.tar.gz: 979b3307e4fc554f29d2f0293e1267d968fff48a9f6948c750efae4d5dfd813e
+  metadata.gz: ce89fb8c4944594e97e5fa8bb017b17ad827f6dd06df2effd4155b83bf8a4215
+  data.tar.gz: 4a130f7c8963143f29bad7432be8d90a68892716dffd479e56edffc45655e0a4
 SHA512:
-  metadata.gz: 3d53b6c00fafe8db9142358a3d56daa971e305a3a8a2161a19b8f7893fbaffd6c37bc06de1f2e5f9bd026ae8dd936102af274c118ea70f7107b0645b4fac9e27
-  data.tar.gz: 4a94a35509be48ae56ba3113778a49ca592569bc0ee711856c50d89f3b4cf277ccf207ff616b20b3e56c305fabb88a2534542ff79937fdf8e2e77e3caf541f01
+  metadata.gz: ed544ea77778b627fd58ff4a80665d9560ee67d2fe4d88fc391450bf53f01647f6d515c730d97ffa301619a46334134616dbb5fc1e4f0e40ff09e81355154fbe
+  data.tar.gz: 6aaf746cdb19db2f15bbbf3d55fdb839c0df1c9504f1ba8afc8a7b822329fe61c5eac7d6f07337f2735df0c00da089cf46f3e2f387789a46b1c0e41661041469

data/lib/mini_magick/shell.rb

@@ -31,7 +31,38 @@ module MiniMagick
       env["MAGICK_TIME_LIMIT"] = timeout.to_s if timeout
 
       stdout, stderr, status = log(command.join(" ")) do
-        Open3.capture3(env, *command, stdin_data: stdin, unsetenv_others: MiniMagick.restricted_env)
+        # We would ideally use Open3.capture3, but it doesn't allow us to
+        # terminate the command after timing out. We can't rely solely on
+        # ImageMagick's own $MAGICK_TIME_LIMIT for this, because it's only
+        # checked periodically inside ImageMagick's processing loops, so it
+        # can fire too late (or not at all) depending on the operation.
+        Open3.popen3(env, *command, unsetenv_others: MiniMagick.restricted_env) do |stdin_io, stdout_io, stderr_io, wait_thread|
+          stdin_io.binmode
+          stdout_io.binmode
+          stderr_io.binmode
+
+          stdout_reader = Thread.new { stdout_io.read }
+          stderr_reader = Thread.new { stderr_io.read }
+
+          begin
+            # Matches how Open3.capture3 detects IO objects.
+            if stdin.respond_to?(:readpartial)
+              IO.copy_stream(stdin, stdin_io)
+            else
+              stdin_io.write(stdin)
+            end
+          rescue Errno::EPIPE
+          end
+          stdin_io.close
+
+          if timeout && !wait_thread.join(timeout)
+            Process.kill("TERM", wait_thread.pid) rescue nil
+            wait_thread.join
+            fail MiniMagick::TimeoutError, "`#{command.join(" ")}` has timed out"
+          end
+
+          [stdout_reader.value, stderr_reader.value, wait_thread.value]
+        end
       end
 
       [stdout, stderr, status&.exitstatus]

data/lib/mini_magick/tool.rb

@@ -27,7 +27,7 @@ module MiniMagick
     #   instance of the tool, if block is given, returns the output of the
     #   command.
     #
-    def self.new(name, **options)
+    def self.new(*args, **options)
       instance = super
 
       if block_given?
@@ -46,7 +46,8 @@ module MiniMagick
     # @option options [Boolean] :errors Whether to raise errors on non-zero
     #   exit codes.
     # @option options [Boolean] :warnings Whether to print warnings to stderrr.
-    # @option options [String] :stdin Content to send to standard input stream.
+    # @option options [String, IO] :stdin Content to send to standard input
+    #   stream, either a string or a readable IO object.
     # @example
     #   MiniMagick.identify(errors: false) do |identify|
     #     identify.help # returns exit status 1, which would otherwise throw an error

data/lib/mini_magick/version.rb

@@ -9,7 +9,7 @@ module MiniMagick
   module VERSION
     MAJOR = 5
     MINOR = 3
-    TINY  = 1
+    TINY  = 3
     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: 5.3.1
+  version: 5.3.3
 platform: ruby
 authors:
 - Corey Johnson
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - You must have ImageMagick installed
-rubygems_version: 3.6.7
+rubygems_version: 4.0.13
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick
 test_files: []