mini_magick 4.13.2 → 5.0.0

data/lib/mini_magick.rb

@@ -1,64 +1,39 @@
 require 'mini_magick/version'
 require 'mini_magick/configuration'
+require 'mini_magick/utilities'
+require 'mini_magick/tool'
+require 'mini_magick/image'
 
 module MiniMagick
 
-  extend MiniMagick::Configuration
-
-  ##
-  # You might want to execute only certain blocks of processing with a
-  # different CLI, because for example that CLI does that particular thing
-  # faster. After the block CLI resets to its previous value.
-  #
-  # @example
-  #   MiniMagick.with_cli :graphicsmagick do
-  #     # operations that are better done with GraphicsMagick
-  #   end
-  def self.with_cli(cli)
-    old_cli = self.cli
-    self.cli = cli
-    yield
-  ensure
-    self.cli = old_cli
-  end
+  Error = Class.new(RuntimeError)
+  Invalid = Class.new(StandardError)
+  TimeoutError = Class.new(Error)
 
-  ##
-  # Checks whether the CLI used is ImageMagick.
-  #
-  # @return [Boolean]
-  def self.imagemagick?
-    cli == :imagemagick
-  end
+  extend MiniMagick::Configuration
 
   ##
-  # Checks whether the CLI used is ImageMagick 7.
+  # Checks whether ImageMagick 7 is installed.
   #
   # @return [Boolean]
   def self.imagemagick7?
-    cli == :imagemagick7
+    return @imagemagick7 if defined?(@imagemagick7)
+    @imagemagick7 = !!MiniMagick::Utilities.which("magick")
   end
 
-  ##
-  # Checks whether the CLI used is GraphicsMagick.
-  #
-  # @return [Boolean]
-  def self.graphicsmagick?
-    cli == :graphicsmagick
+  %w[animate compare composite conjure convert display identify import mogrify montage stream].each do |tool|
+    name = imagemagick7? && tool == "convert" ? "magick" : tool
+    define_singleton_method(tool) do |**options, &block|
+      MiniMagick::Tool.new(name, **options, &block)
+    end
   end
 
   ##
-  # Returns ImageMagick's/GraphicsMagick's version.
+  # Returns ImageMagick version.
   #
   # @return [String]
   def self.cli_version
-    output = MiniMagick::Tool::Identify.new(&:version)
+    output = MiniMagick.identify(&:version)
     output[/\d+\.\d+\.\d+(-\d+)?/]
   end
-
-  class Error < RuntimeError; end
-  class Invalid < StandardError; end
-
 end
-
-require 'mini_magick/tool'
-require 'mini_magick/image'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.13.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -57,7 +57,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
+description: Manipulate images with minimal use of memory via ImageMagick
 email:
 - probablycorey@gmail.com
 - hcatlin@gmail.com
@@ -72,32 +72,19 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- lib/mini_gmagick.rb
 - lib/mini_magick.rb
 - lib/mini_magick/configuration.rb
 - lib/mini_magick/image.rb
 - lib/mini_magick/image/info.rb
 - lib/mini_magick/shell.rb
 - lib/mini_magick/tool.rb
-- lib/mini_magick/tool/animate.rb
-- lib/mini_magick/tool/compare.rb
-- lib/mini_magick/tool/composite.rb
-- lib/mini_magick/tool/conjure.rb
-- lib/mini_magick/tool/convert.rb
-- 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
-- lib/mini_magick/tool/stream.rb
 - lib/mini_magick/utilities.rb
 - lib/mini_magick/version.rb
 homepage: https://github.com/minimagick/minimagick
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/minimagick/minimagick/releases
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -113,9 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- You must have ImageMagick or GraphicsMagick installed
+- You must have ImageMagick installed
 rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
-summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
+summary: Manipulate images with minimal use of memory via ImageMagick
 test_files: []

data/lib/mini_gmagick.rb

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

data/lib/mini_magick/tool/animate.rb

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

data/lib/mini_magick/tool/compare.rb

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

data/lib/mini_magick/tool/composite.rb

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

data/lib/mini_magick/tool/conjure.rb

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

data/lib/mini_magick/tool/convert.rb

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

data/lib/mini_magick/tool/display.rb

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

data/lib/mini_magick/tool/identify.rb

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

data/lib/mini_magick/tool/import.rb

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

data/lib/mini_magick/tool/magick.rb

@@ -1,14 +0,0 @@
-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/tool/mogrify.rb

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

data/lib/mini_magick/tool/mogrify_restricted.rb

@@ -1,15 +0,0 @@
-require "mini_magick/tool/mogrify"
-
-module MiniMagick
-  class Tool
-    ##
-    # @see http://www.imagemagick.org/script/mogrify.php
-    #
-    class MogrifyRestricted < Mogrify
-      def format(*args)
-        fail NoMethodError,
-          "you must call #format on a MiniMagick::Image directly"
-      end
-    end
-  end
-end

data/lib/mini_magick/tool/montage.rb

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

data/lib/mini_magick/tool/stream.rb

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