mini_magick 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7813127461ce5e5ca5f48e6a502672535afd76d4
-  data.tar.gz: e82edbba8bb1af4fc07103cbaea62430f03fbb3f
+  metadata.gz: 8921e089d8d63d1391e76876bc63b4e3ff953706
+  data.tar.gz: 38930195578ded9545d86b4225718671a9cd8b6a
 SHA512:
-  metadata.gz: 0fee195089d16cd7e8f3ac7b034c1569a7f353116966000698f18153f7c0fa5a4b71b2620375b460d02497521c5d275f68072e8b4960bfc87f9df64c0d2b2014
-  data.tar.gz: da4fbde0cffd34084dd50340d4c8e8e51f5b26773b77370f856cc7aeb814e78ca605c053a055b54437bb9127e9c1fc0f631fd0eba581ca8e0b41d0b24217b5a5
+  metadata.gz: 39cc0fccd098a964a02be8e2cde7565d492ab9a5831df89a2f1b90d751d67368c13584c05ef3253aab51f8aecf107a52ca489a6849bd32e80a334869500f4628
+  data.tar.gz: 9c620a81d8b8e601a172d3b8333f4020048e2b7d385ce40fe85caff7f6df7480f1e08c8046d8fa10d66164eb264efe06d9303f111444f55c6193546ca34ab0f2

data/lib/mini_gmagick.rb

@@ -1,3 +1,3 @@
 require 'mini_magick'
 
-MiniMagick.processor = :graphicsmagick
+MiniMagick.processor = :gm

data/lib/mini_magick/configuration.rb

@@ -45,6 +45,7 @@ module MiniMagick
     # @return [Logger]
     #
     attr_accessor :logger
+
     ##
     # If set to `true`, it will `identify` every newly created image, and raise
     # `MiniMagick::Invalid` if the image is not valid. Useful for validating
@@ -63,9 +64,28 @@ module MiniMagick
     #
     attr_accessor :validate_on_write
 
+    ##
+    # If set to `false`, it will not raise errors when ImageMagick returns
+    # status code different than 0. Defaults to `true`.
+    #
+    # @return [Boolean]
+    #
+    attr_accessor :whiny
+
+    ##
+    # Instructs MiniMagick how to execute the shell commands. Available
+    # APIs are "open3" (default) and "posix-spawn" (requires the "posix-spawn"
+    # gem).
+    #
+    # @return [String]
+    #
+    attr_accessor :shell_api
+
     def self.extended(base)
       base.validate_on_create = true
       base.validate_on_write = true
+      base.whiny = true
+      base.shell_api = "open3"
     end
 
     ##
@@ -103,6 +123,8 @@ module MiniMagick
         case processor.to_s
         when "mogrify" then :imagemagick
         when "gm"      then :graphicsmagick
+        else
+          raise MiniMagick::Error, "ImageMagick/GraphicsMagick is not installed"
         end
     end
 

data/lib/mini_magick/image.rb

@@ -80,10 +80,10 @@ module MiniMagick
     #
     def self.open(path_or_url, ext = nil)
       ext ||=
-        if path_or_url.to_s =~ URI.regexp
-          File.extname(URI(path_or_url).path)
-        else
+        if File.exist?(path_or_url)
           File.extname(path_or_url)
+        else
+          File.extname(URI(path_or_url).path)
         end
 
       Kernel.open(path_or_url, "rb") do |file|
@@ -405,7 +405,7 @@ module MiniMagick
             builder << output_to
           end
         else
-          FileUtils.copy_file path, output_to
+          FileUtils.copy_file path, output_to unless path == output_to.to_s
         end
       else
         IO.copy_stream File.open(path, "rb"), output_to

data/lib/mini_magick/shell.rb

@@ -1,6 +1,4 @@
 require "mini_magick/logger"
-
-require "open3"
 require "timeout"
 
 module MiniMagick
@@ -35,14 +33,29 @@ module MiniMagick
       stdout, stderr, status =
         MiniMagick.logger.debug(command.join(" ")) do
           Timeout.timeout(MiniMagick.timeout) do
-            Open3.capture3(*command)
+            send("execute_#{MiniMagick.shell_api.gsub("-", "_")}", *command)
           end
         end
 
       [stdout, stderr, status.exitstatus]
-    rescue Errno::ENOENT
+    rescue Errno::ENOENT, IOError
       ["", "executable not found: \"#{command.first}\"", 127]
     end
 
+    private
+
+    def execute_open3(*command)
+      require "open3"
+      Open3.capture3(*command)
+    end
+
+    def execute_posix_spawn(*command)
+      require "posix-spawn"
+      pid, stdin, stdout, stderr = POSIX::Spawn.popen4(*command)
+      Process.waitpid(pid)
+
+      [stdout.read, stderr.read, $?]
+    end
+
   end
 end

data/lib/mini_magick/tool.rb

@@ -65,7 +65,7 @@ module MiniMagick
     #   MiniMagick::Tool::Identify.new(false) do |identify|
     #     identify.help # returns exit status 1, which would otherwise throw an error
     #   end
-    def initialize(name, whiny = true)
+    def initialize(name, whiny = MiniMagick.whiny)
       @name  = name
       @whiny = whiny
       @args  = []
@@ -149,10 +149,11 @@ module MiniMagick
     # Changes the last operator to its "plus" form.
     #
     # @example
-    #   mogrify = MiniMagick::Tool::Mogrify.new
-    #   mogrify.antialias.+
-    #   mogrify.distort.+("Perspective '0,0,4,5'")
-    #   mogrify.command #=> ["mogrify", "+antialias", "+distort", "Perspective '0,0,4,5'"]
+    #   MiniMagick::Tool::Mogrify.new do |mogrify|
+    #     mogrify.antialias.+
+    #     mogrify.distort.+("Perspective", "0,0,4,5 89,0,45,46")
+    #   end
+    #   # executes `mogrify +antialias +distort Perspective '0,0,4,5 89,0,45,46'`
     #
     # @return [self]
     #
@@ -162,6 +163,27 @@ module MiniMagick
       self
     end
 
+    ##
+    # Create an ImageMagick stack in the command (surround.
+    #
+    # @example
+    #   MiniMagick::Tool::Convert.new do |convert|
+    #     convert << "wand.gif"
+    #     convert.stack do |stack|
+    #       stack << "wand.gif"
+    #       stack.rotate(30)
+    #     end
+    #     convert.append.+
+    #     convert << "images.gif"
+    #   end
+    #   # executes `convert wand.gif \( wizard.gif -rotate 30 \) +append images.gif`
+    #
+    def stack
+      self << "("
+      yield self
+      self << ")"
+    end
+
     private
 
     ##
@@ -202,11 +224,12 @@ module MiniMagick
       ##
       # Creates method based on command-line option's name.
       #
-      #  mogrify = MiniMagick::Tool.new("mogrify")
-      #  mogrify.antialias
-      #  mogrify.depth(8)
-      #  mogrify.resize("500x500")
-      #  mogirfy.command.join(" ") #=> "mogrify -antialias -depth "8" -resize "500x500""
+      #   mogrify = MiniMagick::Tool.new("mogrify")
+      #   mogrify.antialias
+      #   mogrify.depth(8)
+      #   mogrify.resize("500x500")
+      #   mogirfy.command.join(" ")
+      #   #=> "mogrify -antialias -depth 8 -resize 500x500"
       #
       def option(*options)
         options.each do |option|

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 0
-    TINY  = 1
+    MINOR = 1
+    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: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,6 +42,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.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'
 description: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 email:
 - probablycorey@gmail.com
@@ -97,8 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 test_files: []
+has_rdoc: