mini_magick 5.1.2 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573cda9139f6e0b3dea89a7d981006b64b577902cebc65c99b397c298ab069cd
-  data.tar.gz: 6c84cd11d7308fc2555740606cc42caf6be7a404e8b8233443d6591780f38395
+  metadata.gz: 7d3bab346f7bac143cb8a0818cebb0f743d0fdbf792471ca4c44ba99475f594d
+  data.tar.gz: 90aacc6449f72d4bdc2c9f94657316d376c2bb764aa4aa50472af77ce3ca079b
 SHA512:
-  metadata.gz: '010348f8a6140c1e6df3cf274521cae0935be4d1f262e564456e725d983a7c4962975265ba763c320ccf423841aa323ff78ccd1c045b3553499932f1e1292997'
-  data.tar.gz: 3480cdc918c7ccf0b39c19a520484c89782ee3f6c84aea57eaf69f0efabaae5f92287a087da7f49bf6d1c035e8b2f4d86e380eb1653779c7222cec5133f6a7e4
+  metadata.gz: e7ca5d839383a0787220dddb187cfa138757d68d3b5f82188c5b58704792cb761c4f4369ff9156f18e9723a6b7c0c08492d33528d52a102b103cb0243c4d1e48
+  data.tar.gz: 95772859b64dea5957cd6fbeab71b99ccb46abed4c6bf287d1a2ce51e670953a6a5e34cfc68ef2e49f83f14f21583646258ea97c8efa5fb19c6adce43fa5a767

data/README.md

@@ -237,10 +237,11 @@ MiniMagick.configure do |config|
   config.timeout = nil # number of seconds IM commands may take
   config.errors = true # raise errors non nonzero exit status
   config.warnings = true # forward warnings to standard error
-  config.tmdir = Dir.tmpdir # alternative directory for tempfiles
+  config.tmpdir = 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
+  config.restricted_env = false # when true, block IM commands from accessing system environment variables other than those in cli_env
 end
 ```
 

data/lib/mini_magick/configuration.rb

@@ -32,6 +32,16 @@ module MiniMagick
     #
     attr_accessor :cli_env
 
+    ##
+    # If set to true, Open3 will restrict system calls to access only
+    # environment variables defined in :cli_env, plus HOME, PATH, and LANG
+    # since those are required for such system calls. It will not pass on any
+    # other environment variables from the system.
+    #
+    # @return [Boolean]
+    #
+    attr_accessor :restricted_env
+
     ##
     # If you don't want commands to take too long, you can set a timeout (in
     # seconds).
@@ -73,6 +83,7 @@ module MiniMagick
       base.logger = Logger.new($stdout).tap { |l| l.level = Logger::INFO }
       base.warnings = true
       base.cli_env = {}.freeze
+      base.restricted_env = false
       base.graphicsmagick = false
     end
 

data/lib/mini_magick/shell.rb

@@ -1,5 +1,4 @@
 require "open3"
-require "benchmark"
 
 module MiniMagick
   ##
@@ -27,12 +26,12 @@ module MiniMagick
     end
 
     def execute(command, stdin: "", timeout: MiniMagick.timeout)
-      env = {}
+      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
-        Open3.capture3(env, *command, stdin_data: stdin)
+        Open3.capture3(env, *command, stdin_data: stdin, unsetenv_others: MiniMagick.restricted_env)
       end
 
       [stdout, stderr, status&.exitstatus]
@@ -43,8 +42,9 @@ module MiniMagick
     private
 
     def log(command, &block)
-      value = nil
-      duration = Benchmark.realtime { value = block.call }
+      time_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      value = block.call
+      duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - time_start
       MiniMagick.logger.debug "[%.2fs] %s" % [duration, command]
       value
     end

data/lib/mini_magick/tool.rb

@@ -27,8 +27,8 @@ module MiniMagick
     #   instance of the tool, if block is given, returns the output of the
     #   command.
     #
-    def self.new(*args)
-      instance = super(*args)
+    def self.new(name, **options)
+      instance = super
 
       if block_given?
         yield instance
@@ -121,11 +121,10 @@ module MiniMagick
     #   identify.executable #=> ["firejail", "--force", "magick", "identify"]
     #
     def executable
-      exe = [name]
-      exe.unshift "gm" if MiniMagick.graphicsmagick
-      exe.unshift "magick" if MiniMagick.imagemagick7? && name != "magick"
-      exe.unshift *Array(MiniMagick.cli_prefix)
-      exe
+      exe = Array(MiniMagick.cli_prefix)
+      exe << "magick" if MiniMagick.imagemagick7? && name != "magick"
+      exe << "gm" if MiniMagick.graphicsmagick
+      exe << name
     end
 
     ##

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 5
-    MINOR = 1
-    TINY  = 2
+    MINOR = 3
+    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.1.2
+  version: 5.3.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -12,7 +12,7 @@ authors:
 - Janko Marohnić
 bindir: bin
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -28,20 +28,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -113,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - You must have ImageMagick installed
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick
 test_files: []