mini_magick 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2745570a5fe6e4da7ac8ab1cac8ad6799d6790893d1a1b626835f2e64f81f89
-  data.tar.gz: 4a3d182ac394001a77df8f137f48b8f46fd2e85d4bd60d08d5ef04c44949675d
+  metadata.gz: 7ac6bfa9bd38b6ba1482ad9d52e4ce0f983a44ae6cc51d1e7cb66c1cca49209f
+  data.tar.gz: e3088be1a95e47dc6b0426a8bc76f3ac071e3755f301c3d06c6d46b442ae7274
 SHA512:
-  metadata.gz: aaa65a8d47dd6c558d4207d0412f25bcf1ffcc79bcab07be9f6ca973bb175de9d57288a3348aa16bc85606647e499390e291878b12cdfda36ce14609ac5fb75b
-  data.tar.gz: '0584062e993c3330236f84a0e91ef88ca36441c92bd81a6f3de35b89feefdc53a04d93613e0e684c847c65875367321f5f8565758b6ade5d5ca6737f45922149'
+  metadata.gz: c2703437721ca376faf5674d2b0a10c34f456d0146ee4a7dc3ad506d700be9fcd098301213b1c688931ae872f8507691f02b70eb4f3131df2c1a760e8f86f25d
+  data.tar.gz: c8d33063710a5e0898e6bd2a5aaca6533c0d2943c4a5c545ab700de5e25eb38fa0efc4e08cf9d5eec46c3ba78d315231c541f6b4fe802306da181513b957291c

data/README.md

@@ -240,6 +240,7 @@ MiniMagick.configure do |config|
   config.tmdir = Dir.tmpdir # alternative directory for tempfiles
   config.logger = Logger.new($stdout) # where to log IM commands
   config.cli_prefix = nil # add prefix to all IM commands
+  config.cli_env = {} # environment variables to set for IM commands
 end
 ```
 
@@ -455,11 +456,14 @@ end
 ### GraphicsMagick
 
 As of MiniMagick 5+, [GraphicsMagick](http://www.graphicsmagick.org/) isn't
-officially supported. However, you can still configure MiniMagick to use it:
+officially supported. This means its installation won't be auto-detected, and no
+attempts will be made to handle differences in GraphicsMagick API or output.
+
+However, you can still configure MiniMagick to use it:
 
 ```rb
 MiniMagick.configure do |config|
-  config.cli_prefix = "gm"
+  config.graphicsmagick = true
 end
 ```
 
@@ -468,16 +472,27 @@ Some MiniMagick features won't be supported, such as global timeout,
 
 ### Limiting resources
 
-ImageMagick supports a number of environment variables for controlling its
+ImageMagick supports a number of [environment variables] for controlling its
 resource limits. For example, you can enforce memory or execution time limits by
-setting the following variables in your application's process environment:
+setting the following:
 
-* `MAGICK_MEMORY_LIMIT=128MiB`
-* `MAGICK_MAP_LIMIT=64MiB`
-* `MAGICK_TIME_LIMIT=30`
+```rb
+MiniMagick.configure do |config|
+  config.cli_env = {
+    "MAGICK_MEMORY_LIMIT" => "128MiB",
+    "MAGICK_MAP_LIMIT" => "64MiB",
+    "MAGICK_TIME_LIMIT" => "30"
+  }
+end
+```
 
-For a full list of variables and description, see [ImageMagick's resources
-documentation](http://www.imagemagick.org/script/resources.php#environment).
+For time limit you can also use the `timeout` configuration:
+
+```rb
+MiniMagick.configure do |config|
+  config.timeout = 30 # 30 seconds
+end
+```
 
 ### Changing temporary directory
 
@@ -538,3 +553,5 @@ Unlike RMagick, MiniMagick is a much thinner wrapper around ImageMagick.
 * To open files with MiniMagick you use `MiniMagick::Image.open` as you would
   `Magick::Image.read`. To open a file and directly edit it, use
   `MiniMagick::Image.new`.
+
+[environment variables]: https://imagemagick.org/script/resources.php#environment

data/lib/mini_magick/configuration.rb

@@ -4,6 +4,13 @@ require 'logger'
 module MiniMagick
   module Configuration
 
+    ##
+    # Uses [GraphicsMagick](http://www.graphicsmagick.org/) instead of
+    # ImageMagick, by prefixing commands with `gm` instead of `magick`.
+    #
+    # @return [Boolean]
+    attr_accessor :graphicsmagick
+
     ##
     # Adds a prefix to the CLI command.
     # For example, you could use `firejail` to run all commands in a sandbox.
@@ -15,6 +22,16 @@ module MiniMagick
     #
     attr_accessor :cli_prefix
 
+    ##
+    # Adds environment variables to every CLI command call.
+    # For example, you could use it to set `LD_PRELOAD="/path/to/libsomething.so"`.
+    # Must be a hash of strings keyed to valid environment variable name strings.
+    # e.g. {'MY_ENV' => 'my value'}
+    #
+    # @return [Hash]
+    #
+    attr_accessor :cli_env
+
     ##
     # If you don't want commands to take too long, you can set a timeout (in
     # seconds).
@@ -55,6 +72,8 @@ module MiniMagick
       base.errors = true
       base.logger = Logger.new($stdout).tap { |l| l.level = Logger::INFO }
       base.warnings = true
+      base.cli_env = {}.freeze
+      base.graphicsmagick = false
     end
 
     ##

data/lib/mini_magick/shell.rb

@@ -27,8 +27,12 @@ module MiniMagick
     end
 
     def execute(command, stdin: "", timeout: MiniMagick.timeout)
+      env = {}
+      env.merge!(MiniMagick.cli_env)
+      env["MAGICK_TIME_LIMIT"] = timeout.to_s if timeout
+
       stdout, stderr, status = log(command.join(" ")) do
-        Open3.capture3({ "MAGICK_TIME_LIMIT" => timeout&.to_s }, *command, stdin_data: stdin)
+        Open3.capture3(env, *command, stdin_data: stdin)
       end
 
       [stdout, stderr, status&.exitstatus]

data/lib/mini_magick/tool.rb

@@ -122,8 +122,9 @@ module MiniMagick
     #
     def executable
       exe = [name]
+      exe.unshift "gm" if MiniMagick.graphicsmagick
       exe.unshift "magick" if MiniMagick.imagemagick7? && name != "magick"
-      Array(MiniMagick.cli_prefix).reverse_each { |p| exe.unshift p } if MiniMagick.cli_prefix
+      exe.unshift *Array(MiniMagick.cli_prefix)
       exe
     end
 

data/lib/mini_magick/version.rb

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

data/lib/mini_magick.rb

@@ -17,6 +17,7 @@ module MiniMagick
   #
   # @return [Boolean]
   def self.imagemagick7?
+    return false if graphicsmagick
     return @imagemagick7 if defined?(@imagemagick7)
     @imagemagick7 = !!MiniMagick::Utilities.which("magick")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -10,10 +10,9 @@ authors:
 - James Miller
 - Thiago Fernandes Massa
 - Janko Marohnić
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,20 +42,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  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'
 description: Manipulate images with minimal use of memory via ImageMagick
 email:
 - probablycorey@gmail.com
@@ -85,7 +70,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/minimagick/minimagick/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - You must have ImageMagick installed
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick
 test_files: []