mini_magick 4.7.2 → 4.13.2

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
@@ -46,8 +44,10 @@ module MiniMagick
     # @private
     attr_reader :name, :args
 
-    # @param whiny [Boolean] Whether to raise errors on exit codes different
-    #   than 0.
+    # @param name [String]
+    # @param options [Hash]
+    # @option options [Boolean] :whiny Whether to raise errors on non-zero
+    #   exit codes.
     # @example
     #   MiniMagick::Tool::Identify.new(whiny: false) do |identify|
     #     identify.help # returns exit status 1, which would otherwise throw an error
@@ -86,13 +86,13 @@ module MiniMagick
       whiny = args.fetch(0, @whiny)
 
       options[:whiny] = whiny
-      options[:stderr] = false if block_given?
+      options[:stderr] = MiniMagick.warnings && !block_given?
 
       shell = MiniMagick::Shell.new
       stdout, stderr, status = shell.run(command, options)
       yield stdout, stderr, status if block_given?
 
-      stdout.strip
+      stdout.chomp("\n")
     end
 
     ##
@@ -112,7 +112,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 +122,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
 
@@ -170,7 +181,7 @@ module MiniMagick
     # Create an ImageMagick stack in the command (surround.
     #
     # @example
-    #   MiniMagick::Tool::Convert.new do |convert|
+    #   MiniMagick::Tool::Magick.new do |convert|
     #     convert << "wand.gif"
     #     convert.stack do |stack|
     #       stack << "wand.gif"
@@ -181,9 +192,15 @@ module MiniMagick
     #   end
     #   # executes `convert wand.gif \( wizard.gif -rotate 30 \) +append images.gif`
     #
-    def stack
+    def stack(*args)
       self << "("
-      yield self
+      args.each do |value|
+        case value
+        when Hash   then value.each { |key, value| send(key, *value) }
+        when String then self << value
+        end
+      end
+      yield self if block_given?
       self << ")"
     end
 
@@ -204,7 +221,7 @@ module MiniMagick
     # Adds ImageMagick's pseudo-filename `-` for standard output.
     #
     # @example
-    #   content = MiniMagick::Tool::Convert.new do |convert|
+    #   content = MiniMagick::Tool::Magick.new do |convert|
     #     convert << "input.jpg"
     #     convert.auto_orient
     #     convert.stdout
@@ -218,12 +235,13 @@ module MiniMagick
     ##
     # Define creator operator methods
     #
+    # @example
     #   mogrify = MiniMagick::Tool.new("mogrify")
     #   mogrify.canvas("khaki")
     #   mogrify.command.join(" ") #=> "mogrify canvas:khaki"
     #
     CREATION_OPERATORS.each do |operator|
-      define_method(operator.gsub('-', '_')) do |value = nil|
+      define_method(operator.tr('-', '_')) do |value = nil|
         self << "#{operator}:#{value}"
         self
       end
@@ -242,10 +260,11 @@ module MiniMagick
     ##
     # Any undefined method will be transformed into a CLI option
     #
+    # @example
     #   mogrify = MiniMagick::Tool.new("mogrify")
     #   mogrify.adaptive_blur("...")
     #   mogrify.foo_bar
-    #   mogrify.command.join(" ") "mogrify -adaptive-blur ... -foo-bar"
+    #   mogrify.command.join(" ") # => "mogrify -adaptive-blur ... -foo-bar"
     #
     def method_missing(name, *args)
       option = "-#{name.to_s.tr('_', '-')}"
@@ -254,10 +273,6 @@ module MiniMagick
       self
     end
 
-    def respond_to_missing?(method_name, include_private = false)
-      true
-    end
-
     def self.option_methods
       @option_methods ||= (
         tool = new(whiny: false)
@@ -285,6 +300,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/utilities.rb

@@ -24,7 +24,7 @@ module MiniMagick
     end
 
     def tempfile(extension)
-      Tempfile.new(["mini_magick", extension]).tap do |tempfile|
+      Tempfile.new(["mini_magick", extension], MiniMagick.tmpdir).tap do |tempfile|
         tempfile.binmode
         yield tempfile if block_given?
         tempfile.close

data/lib/mini_magick/version.rb

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

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.
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.13.2
 platform: ruby
 authors:
 - Corey Johnson
@@ -10,10 +10,10 @@ authors:
 - James Miller
 - Thiago Fernandes Massa
 - Janko Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,48 +43,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: posix-spawn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +70,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
+- README.md
 - Rakefile
 - lib/mini_gmagick.rb
 - lib/mini_magick.rb
@@ -128,6 +87,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
@@ -138,7 +98,7 @@ homepage: https://github.com/minimagick/minimagick
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -154,9 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 test_files: []