mini_magick 4.8.0 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 49a53e90d9387b9fa7dbb83e10e08fcc7650e2e8
-  data.tar.gz: af2fecfe830084869b34bd41b6b2077b5ec4218a
+SHA256:
+  metadata.gz: ec4d1852a0e65227776a89740f0ba57fe4925e41806387fc194492f825c9f5ea
+  data.tar.gz: 5263d3061216db6852a0b89d9b2ab0c32f05fcd9b685bf1aca125d41d52c714a
 SHA512:
-  metadata.gz: fa011122b74d076892ae48198f56b71ab809f20bdca8d56c1a0754ccd7711c03093bcd6721b6b15aedd4599ede040ccb3d23d4947dbf4748f7531b5e68f0e5bb
-  data.tar.gz: 2507b667f71982f46c181a4b0ae8c55f94a2d01338f035a98e0df38ff18639b39a957bbd754c6b481e61c0a95f446e16e157e4b9562c1551f2696651c7ef22f0
+  metadata.gz: 12b052fb0879fe8e3d59d6f626ff5690f26795bf8a23b7990ba86fc74382c103f8582760dbae26d8910c7e6877d853fbea13ebf3c93e524f93901cb57635935c
+  data.tar.gz: 5f5fda33afe5326356f3d9f2930160559b5bbe372528313c4ecebfad91a1de86edb9f2503426c0cff96035430a7a6c83a24b79174b520ecd55c31ce880eb49f1

data/lib/mini_magick.rb

@@ -30,6 +30,14 @@ module MiniMagick
     cli == :imagemagick
   end
 
+  ##
+  # Checks whether the CLI used is ImageMagick 7.
+  #
+  # @return [Boolean]
+  def self.imagemagick7?
+    cli == :imagemagick7
+  end
+
   ##
   # Checks whether the CLI used is GraphicsMagick.
   #

data/lib/mini_magick/configuration.rb

@@ -8,7 +8,7 @@ module MiniMagick
     # Set whether you want to use [ImageMagick](http://www.imagemagick.org) or
     # [GraphicsMagick](http://www.graphicsmagick.org).
     #
-    # @return [Symbol] `:imagemagick` or `:graphicsmagick`
+    # @return [Symbol] `:imagemagick`, `:imagemagick7`, or `:graphicsmagick`
     #
     attr_accessor :cli
     # @private (for backwards compatibility)
@@ -24,6 +24,17 @@ module MiniMagick
     # @private (for backwards compatibility)
     attr_accessor :processor_path
 
+    ##
+    # Adds a prefix to the CLI command.
+    # For example, you could use `firejail` to run all commands in a sandbox.
+    # Can be a string, or an array of strings.
+    # e.g. 'firejail', or ['firejail', '--force']
+    #
+    # @return [String]
+    # @return [Array<String>]
+    #
+    attr_accessor :cli_prefix
+
     ##
     # If you don't want commands to take too long, you can set a timeout (in
     # seconds).
@@ -102,8 +113,14 @@ module MiniMagick
       yield self
     end
 
+    CLI_DETECTION = {
+      imagemagick:    "mogrify",
+      graphicsmagick: "gm",
+      imagemagick7:   "magick",
+    }
+
     def processor
-      @processor ||= ["mogrify", "gm"].detect do |processor|
+      @processor ||= CLI_DETECTION.values.detect do |processor|
         MiniMagick::Utilities.which(processor)
       end
     end
@@ -111,29 +128,24 @@ module MiniMagick
     def processor=(processor)
       @processor = processor.to_s
 
-      unless ["mogrify", "gm"].include?(@processor)
+      unless CLI_DETECTION.value?(@processor)
         raise ArgumentError,
-          "processor has to be set to either \"mogrify\" or \"gm\"" \
+          "processor has to be set to either \"magick\", \"mogrify\" or \"gm\"" \
           ", was set to #{@processor.inspect}"
       end
     end
 
     def cli
-      @cli ||
-        case processor.to_s
-        when "mogrify" then :imagemagick
-        when "gm"      then :graphicsmagick
-        else
-          raise MiniMagick::Error, "ImageMagick/GraphicsMagick is not installed"
-        end
+      @cli || CLI_DETECTION.key(processor) or
+        fail MiniMagick::Error, "You must have ImageMagick or GraphicsMagick installed"
     end
 
     def cli=(value)
       @cli = value
 
-      if not [:imagemagick, :graphicsmagick].include?(@cli)
+      if not CLI_DETECTION.key?(@cli)
         raise ArgumentError,
-          "CLI has to be set to either :imagemagick or :graphicsmagick" \
+          "CLI has to be set to either :imagemagick, :imagemagick7 or :graphicsmagick" \
           ", was set to #{@cli.inspect}"
       end
     end

data/lib/mini_magick/image/info.rb

@@ -100,6 +100,7 @@ module MiniMagick
                 hash[hash.keys.last] << "\n#{line}"
               end
             when :graphicsmagick
+              next if line == "unknown"
               key, value = line.split("=", 2)
               value.gsub!("\\012", "\n") # convert "\012" characters to newlines
               hash[key] = value
@@ -139,8 +140,8 @@ module MiniMagick
               next
             end
 
-            key, _, value = line.partition(/:[\s\n]/).map(&:strip)
-            hash = key_stack.inject(details_hash) { |hash, key| hash.fetch(key) }
+            key, _, value = line.partition(/:[\s]/).map(&:strip)
+            hash = key_stack.inject(details_hash) { |h, k| h.fetch(k) }
             if value.empty?
               hash[key] = {}
               key_stack.push key

data/lib/mini_magick/shell.rb

@@ -45,11 +45,10 @@ module MiniMagick
 
     def execute_posix_spawn(command, options = {})
       require "posix-spawn"
-
-      pid, in_w, out_r, err_r = POSIX::Spawn.popen4(*command)
-      subprocess_thread = Process.detach(pid)
-
-      capture_command(in_w, out_r, err_r, subprocess_thread, options)
+      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)
@@ -66,7 +65,11 @@ module MiniMagick
 
       [stdout_reader.value, stderr_reader.value, subprocess_thread.value]
     rescue Timeout::Error => error
-      Process.kill("TERM", subprocess_thread.pid)
+      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)

data/lib/mini_magick/tool.rb

@@ -15,10 +15,8 @@ module MiniMagick
   #
   class Tool
 
-    CREATION_OPERATORS = %w[
-      xc canvas logo rose gradient radial-gradient plasma pattern label caption
-      text
-    ]
+    CREATION_OPERATORS = %w[xc canvas logo rose gradient radial-gradient plasma
+                            pattern text pango]
 
     ##
     # Aside from classic instantiation, it also accepts a block, and then
@@ -112,7 +110,8 @@ module MiniMagick
 
     ##
     # The executable used for this tool. Respects
-    # {MiniMagick::Configuration#cli} and {MiniMagick::Configuration#cli_path}.
+    # {MiniMagick::Configuration#cli}, {MiniMagick::Configuration#cli_path},
+    # and {MiniMagick::Configuration#cli_prefix}.
     #
     # @return [Array<String>]
     #
@@ -121,10 +120,20 @@ module MiniMagick
     #   identify = MiniMagick::Tool::Identify.new
     #   identify.executable #=> ["gm", "identify"]
     #
+    # @example
+    #   MiniMagick.configure do |config|
+    #     config.cli = :graphicsmagick
+    #     config.cli_prefix = ['firejail', '--force']
+    #   end
+    #   identify = MiniMagick::Tool::Identify.new
+    #   identify.executable #=> ["firejail", "--force", "gm", "identify"]
+    #
     def executable
       exe = [name]
+      exe.unshift "magick" if MiniMagick.imagemagick7? && name != "magick"
       exe.unshift "gm" if MiniMagick.graphicsmagick?
       exe.unshift File.join(MiniMagick.cli_path, exe.shift) if MiniMagick.cli_path
+      Array(MiniMagick.cli_prefix).reverse_each { |p| exe.unshift p } if MiniMagick.cli_prefix
       exe
     end
 
@@ -285,6 +294,7 @@ require "mini_magick/tool/convert"
 require "mini_magick/tool/display"
 require "mini_magick/tool/identify"
 require "mini_magick/tool/import"
+require "mini_magick/tool/magick"
 require "mini_magick/tool/mogrify"
 require "mini_magick/tool/mogrify_restricted"
 require "mini_magick/tool/montage"

data/lib/mini_magick/tool/magick.rb

@@ -0,0 +1,14 @@
+module MiniMagick
+  class Tool
+    ##
+    # @see http://www.imagemagick.org/script/command-line-processing.php
+    #
+    class Magick < MiniMagick::Tool
+
+      def initialize(*args)
+        super("magick", *args)
+      end
+
+    end
+  end
+end

data/lib/mini_magick/version.rb

@@ -8,7 +8,7 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 8
+    MINOR = 9
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.9.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -128,6 +128,7 @@ files:
 - lib/mini_magick/tool/display.rb
 - lib/mini_magick/tool/identify.rb
 - lib/mini_magick/tool/import.rb
+- lib/mini_magick/tool/magick.rb
 - lib/mini_magick/tool/mogrify.rb
 - lib/mini_magick/tool/mogrify_restricted.rb
 - lib/mini_magick/tool/montage.rb
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick