mini_magick 5.3.3 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce89fb8c4944594e97e5fa8bb017b17ad827f6dd06df2effd4155b83bf8a4215
-  data.tar.gz: 4a130f7c8963143f29bad7432be8d90a68892716dffd479e56edffc45655e0a4
+  metadata.gz: b3e8bb8f330d41946c8be0bb756798727c20e7acc5716fe4b96e4a4e663c5bdb
+  data.tar.gz: 9e4b699bd809a7694621475923b8a133feb91e17c49688b6bd25b86e87253f0b
 SHA512:
-  metadata.gz: ed544ea77778b627fd58ff4a80665d9560ee67d2fe4d88fc391450bf53f01647f6d515c730d97ffa301619a46334134616dbb5fc1e4f0e40ff09e81355154fbe
-  data.tar.gz: 6aaf746cdb19db2f15bbbf3d55fdb839c0df1c9504f1ba8afc8a7b822329fe61c5eac7d6f07337f2735df0c00da089cf46f3e2f387789a46b1c0e41661041469
+  metadata.gz: 49dc51bf6819aa5ac6a981305f0f31b6b67859f67b54b78c58602e7c82fff36bdbec5d97d8d623f40a2ec5665df438fdb966d8143a91c645019e2705a41e0006
+  data.tar.gz: 9dfca63b5a1e65d71bdc1604aa1fb316063fef145b62fe1832c7c86de7dbba7fe2ab3e7df74e9aa143c421e1b74063a35ce3ac9f1eb12f9f52bbe719a625f2d7

data/README.md

@@ -437,6 +437,25 @@ content = MiniMagick.convert do |convert|
 end
 ```
 
+### Inheriting file descriptors
+
+If the input is a file this process already has open, you can have the command
+inherit the descriptor with the `:inherit_fds` option and name it as
+`/dev/fd/N`, rather than writing out a copy for the command to read:
+
+```rb
+File.open("input.jpg", "rb") do |file|
+  MiniMagick.identify(inherit_fds: [file]) do |identify|
+    identify << "/dev/fd/#{file.fileno}"
+  end
+end
+```
+
+Each IO given to `:inherit_fds` is inherited at the same file descriptor
+number. Without it the descriptor is close-on-exec, so `/dev/fd/N` does not
+exist in the command. The command's own standard streams occupy 0, 1 and 2, so
+those cannot be inherited.
+
 ### Capturing STDERR
 
 Some MiniMagick tools such as `compare` output the result of the command on

data/lib/mini_magick/shell.rb

@@ -25,18 +25,24 @@ module MiniMagick
       [stdout, stderr, status]
     end
 
-    def execute(command, stdin: "", timeout: MiniMagick.timeout)
+    def execute(command, stdin: "", timeout: MiniMagick.timeout, inherit_fds: [])
       env = MiniMagick.restricted_env ? ENV.to_h.slice("HOME", "PATH", "LANG") : {} # Using #to_h for Ruby 2.5 compatibility.
       env.merge!(MiniMagick.cli_env)
       env["MAGICK_TIME_LIMIT"] = timeout.to_s if timeout
 
       stdout, stderr, status = log(command.join(" ")) do
+        options = { unsetenv_others: MiniMagick.restricted_env }
+        # Descriptors are close-on-exec, and spawn clears that only for the ones
+        # its redirect map names, so /dev/fd/N does not exist in the command
+        # unless the descriptor is named here.
+        inherit_fds.each { |io| options[io.fileno] = io.fileno }
+
         # 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|
+        Open3.popen3(env, *command, options) do |stdin_io, stdout_io, stderr_io, wait_thread|
           stdin_io.binmode
           stdout_io.binmode
           stderr_io.binmode

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 5
-    MINOR = 3
-    TINY  = 3
+    MINOR = 4
+    TINY  = 0
     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.3
+  version: 5.4.0
 platform: ruby
 authors:
 - Corey Johnson