rmagick 2.15.3 → 2.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcaee92d74cc985e1296e1a1e31577597da850af
-  data.tar.gz: 7a2b76f61cfd85f4699e6a91ee61672c5488f1e9
+  metadata.gz: 79bd6595ef81cd3743a21521e9a4bed46dbcf52b
+  data.tar.gz: 659d7eff32093a2a9d1738509a0c4c3376466d29
 SHA512:
-  metadata.gz: 588236f986f01875b947efb01049991768e3f38f9dc9b1a1387e02ebc4dc636ac8b27925ac8048fa2d0dd726555ab8a4826ed9d15113683276225c0b82cb187e
-  data.tar.gz: 308b4616c264fd8bf908b817b46e35624ba99987d12268775be459cd477454c0931be08756f9d5ec4b69fbf1baf3b43e6cc721531ba0b591e046b27e5a11cc59
+  metadata.gz: 72eb476772660c07483bf8748716d1a95412c3d64988c65385dee9b48b4177a9e42beb583a031233689446fb3aa2987d1da672ed18fe88bf96618ea28da5fb6e
+  data.tar.gz: b67cb2bcccb97b2e4ef53b65fdfabde8cacf18dfcba388d49a476d6f96d27d2685aeef6e15e1268aa68465277e3752a45fe4f7c1bbc26bb8ebad091056953ca4

data/.editorconfig

@@ -0,0 +1,14 @@
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
+# @see http://editorconfig.org
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = spaces
+tab_width = 2
+
+[{*.{rb,yml,sh,md}]
+indent_size = 2

data/.rubocop.yml

@@ -14,9 +14,6 @@ Style/Lambda:
 Style/StringLiterals:
   EnforcedStyle: single_quotes
 
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
 Style/DotPosition:
   EnforcedStyle: leading
 
@@ -27,6 +24,9 @@ Style/DotPosition:
 Lint/BlockAlignment:
   Enabled: false
 
+Lint/FormatParameterMismatch:
+  Enabled: false
+
 # Offense count: 1
 Lint/HandleExceptions:
   Enabled: false
@@ -93,10 +93,16 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 41
 
+Performance/StringReplacement:
+  Enabled: false
+
 # Offense count: 4
 Style/AccessorMethodName:
   Enabled: false
 
+Style/AlignArray:
+  Enabled: false
+
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -126,6 +132,9 @@ Style/ClassAndModuleChildren:
 Style/ClosingParenthesisIndentation:
   Enabled: false
 
+Style/CollectionMethods:
+  Enabled: false
+
 # Offense count: 5
 # Cop supports --auto-correct.
 Style/CommentIndentation:
@@ -139,6 +148,12 @@ Style/ConstantName:
 Style/Documentation:
   Enabled: false
 
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Style/ExtraSpacing:
+  Enabled: false
+
 # Offense count: 23
 # Configuration parameters: Exclude.
 Style/FileName:
@@ -165,6 +180,12 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/IndentArray:
+  Enabled: false
+
+Style/IndentationConsistency:
+  Enabled: false
+
 # Offense count: 1049
 # Cop supports --auto-correct.
 # Configuration parameters: Width.
@@ -227,6 +248,9 @@ Style/PredicateName:
 Style/RegexpLiteral:
   Enabled: false
 
+Style/RescueEnsureAlignment:
+  Enabled: false
+
 # Offense count: 2
 Style/RescueModifier:
   Enabled: false

data/.travis.yml

@@ -3,10 +3,11 @@ language: ruby
 os:
   - linux
 
+sudo: required
+
 env:
   # Currently successful release
   - IMAGEMAGICK_VERSION=6.6.9-10
-  - IMAGEMAGICK_VERSION=6.6.9-10 STYLE_CHECKS=true
   # Ubuntu's current stable release
   - IMAGEMAGICK_VERSION=6.7.7-10
   # Latest 6.7 release
@@ -30,8 +31,6 @@ rvm:
 
 matrix:
   exclude:
-    - rvm: 1.8
-      env: IMAGEMAGICK_VERSION=6.6.9-10 STYLE_CHECKS=true
     - rvm: 1.8
       env: IMAGEMAGICK_VERSION=6.7.9-10
     - rvm: 1.8
@@ -53,12 +52,16 @@ matrix:
     - rvm: 2.0
       env: IMAGEMAGICK_VERSION=6.8.9-10 CONFIGURE_OPTIONS=--enable-hdri
   allow_failures:
-    - rvm: 1.8
-    - rvm: 2.2
-    - env: IMAGEMAGICK_VERSION=6.6.9-10 STYLE_CHECKS=true
     - env: IMAGEMAGICK_VERSION=6.7.7-10
     - env: IMAGEMAGICK_VERSION=6.7.9-10
+      rvm: 2.1
+    - env: IMAGEMAGICK_VERSION=6.7.9-10
+      rvm: 2.2
+    - env: IMAGEMAGICK_VERSION=6.8.9-10
+      rvm: 2.1
     - env: IMAGEMAGICK_VERSION=6.8.9-10 CONFIGURE_OPTIONS=--enable-hdri
+      rvm: 2.1
+    - env: IMAGEMAGICK_VERSION=latest
 
 notifications:
   webhooks:

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 2.15.4
+
+- Improved C extension building process - @u338steven
+
 ## RMagick 2.15.3
 
 - Fixed ImageMagick version detection on Windows - @maisumakun

data/CONTRIBUTING.md

@@ -37,4 +37,14 @@ You are also welcome to convert existing Test/Unit tests to RSpec.
 Committing
 ----------
 
+All work for a next release is done in the `develop` branch. Please create your branch off of it.
+
 It is better if you follow [Git Style Guide](https://github.com/agis-/git-style-guide).
+
+
+Pull Requests
+-------------
+
+Please choose the `rmagick/rmagick` repo and the `develop` branch as the destination for your pull request.
+
+NOTE: GitHub suggests `rmagick-temp/rmagick` repo by default. **This is incorrect.** Please switch to `rmagick/rmagick`. It should be the next repo in the drop-down list.

data/README.textile

@@ -32,6 +32,10 @@ Ruby must be able to build C-Extensions (e.g. MRI, Rubinius, not JRuby)
 
 *ImageMagick* Version 6.4.9 or later. You can get ImageMagick from "www.imagemagick.org":http://www.imagemagick.org.
 
+On Ubuntu, you can run:
+
+bc. sudo apt-get install libmagickwand-dev
+
 h2(#install). Installing RMagick
 
 h4. Installing via Bundler

data/before_install_linux.sh

@@ -5,13 +5,13 @@ sudo apt-get install -y build-essential libx11-dev libxext-dev zlib1g-dev libpng
 sudo apt-get build-dep -y imagemagick
 case $IMAGEMAGICK_VERSION in
     latest)
-        wget http://www.imagemagick.org/download/ImageMagick.tar.gz
-        tar -xzvf ImageMagick.tar.gz
+        wget http://www.imagemagick.org/download/ImageMagick.tar.xz
+        tar -xf ImageMagick.tar.xz
         cd ImageMagick-*
     ;;
     *)
-        wget http://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.gz
-        tar -xzvf ImageMagick-${IMAGEMAGICK_VERSION}.tar.gz
+        wget http://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
+        tar -xf ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
         cd ImageMagick-${IMAGEMAGICK_VERSION}
     ;;
 esac

data/doc/ex/gravity.rb

@@ -5,7 +5,8 @@
 
 require 'rmagick'
 
-x, y = 100, 100
+x = 100
+y = 100
 
 begin
 

data/ext/RMagick/extconf.rb

@@ -1,5 +1,6 @@
 lib_dir = File.expand_path('../../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
+require 'rubygems'
 require 'mkmf'
 require 'date'
 
@@ -60,10 +61,12 @@ module RMagick
         $pkg_config = false
 
         # Check for Magick-config
-        if find_executable('Magick-config')
+        if find_executable('Magick-config') && !has_graphicsmagick_libmagick_dev_compat?
           $magick_config = true
+          $magick_version = `Magick-config --version`[/^(\d+\.\d+\.\d+)/]
         elsif find_executable('pkg-config')
           $pkg_config = true
+          $magick_version = `pkg-config MagickCore --modversion`[/^(\d+\.\d+\.\d+)/]
         else
           exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config or pkg-config in #{ENV['PATH']}\n"
         end
@@ -74,15 +77,10 @@ module RMagick
         # Ensure minimum ImageMagick version
         # Check minimum ImageMagick version if possible
         checking_for("outdated ImageMagick version (<= #{Magick::MIN_IM_VERSION})") do
-          # extract version info from convert binary (could use identify as well)
-          # TODO: Extract the value of MagickLibVersionText constant in MagickCore/version.h somehow
-          `convert -version`.match(/^Version: ImageMagick (\d+\.\d+\.\d+)/) do |matches|
-            version = matches[1]
-            Logging.message("Detected ImageMagick version: #{version}\n")
-
-            if Gem::Version.new(version) < Gem::Version.new(Magick::MIN_IM_VERSION)
-              exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{Magick::MIN_IM_VERSION} or later.\n"
-            end
+          Logging.message("Detected ImageMagick version: #{$magick_version}\n")
+
+          if Gem::Version.new($magick_version) < Gem::Version.new(Magick::MIN_IM_VERSION)
+            exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{Magick::MIN_IM_VERSION} or later.\n"
           end
         end
 
@@ -109,25 +107,25 @@ module RMagick
 
       elsif RUBY_PLATFORM =~ /mingw/  # mingw
 
-        `convert -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
+        `identify -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         abort 'Unable to get ImageMagick version' unless $1
         $magick_version = $1
-        if RUBY_PLATFORM =~ /x64/
-          $LOCAL_LIBS = '-lCORE_RL_magick_'
-        else
-          $LOCAL_LIBS = '-lCORE_RL_magick_ -lX11'
+        unless have_library('CORE_RL_magick_')
+          search_paths_for_library_for_mingw
         end
+        have_library('X11')
 
       else  # mswin
 
-        `convert -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
+        `identify -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         abort 'Unable to get ImageMagick version' unless $1
         $magick_version = $1
         $CFLAGS = '-W3'
         $CPPFLAGS = %Q{-I"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include" -I"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\include"}
         # The /link option is required by the Makefile but causes warnings in the mkmf.log file.
         $LDFLAGS = %Q{/link /LIBPATH:"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib" /LIBPATH:"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\lib" /LIBPATH:"C:\\ruby\\lib"}
-        $LOCAL_LIBS = 'CORE_RL_magick_.lib X11.lib'
+        $LOCAL_LIBS = 'CORE_RL_magick_.lib'
+        have_library('X11')
 
       end
     end
@@ -156,6 +154,20 @@ SRC
       end
     end
 
+    def has_graphicsmagick_libmagick_dev_compat?
+      config_path = `which Magick-config`.chomp
+      if File.exist?(config_path) &&
+         File.symlink?(config_path) &&
+         File.readlink(config_path) =~ /GraphicsMagick/
+        msg = 'Found a graphicsmagick-libmagick-dev-compat installation.'
+        Logging.message msg
+        message msg+"\n"
+        true
+      else
+        false
+      end
+    end
+
     def exit_failure(msg)
       Logging.message msg
       message msg+"\n"
@@ -228,6 +240,37 @@ SRC
       end
     end
 
+    def search_paths_for_library_for_mingw
+      msg = 'searching PATH for the ImageMagick library...'
+      Logging.message msg
+      message msg+"\n"
+
+      found_lib = false
+
+      paths = ENV['PATH'].split(File::PATH_SEPARATOR)
+      paths.each do |dir|
+        lib = File.join(dir, 'lib')
+        lib_file = File.join(lib, 'CORE_RL_magick_.lib')
+        if File.exist?(lib_file)
+          $CPPFLAGS = %Q{-I"#{File.join(dir, 'include')}"}
+          $LDFLAGS = %Q{-L"#{lib}"}
+          found_lib = have_library('CORE_RL_magick_')
+          break if found_lib
+        end
+      end
+
+      unless found_lib
+        exit_failure <<END_MINGW
+Can't install RMagick #{RMAGICK_VERS}.
+Can't find the ImageMagick library.
+Retry with '--with-opt-dir' option.
+Usage: gem install rmagick -- '--with-opt-dir=\"[path to ImageMagick]\"'
+e.g.
+  gem install rmagick -- '--with-opt-dir=\"C:\Program Files\ImageMagick-6.9.1-Q16\"'
+END_MINGW
+      end
+    end
+
     def assert_can_compile!
       assert_not_windows!
       assert_minimum_ruby_version!

data/lib/rmagick/version.rb

@@ -1,5 +1,5 @@
 module Magick
-  VERSION = '2.15.3'
+  VERSION = '2.15.4'
   MIN_RUBY_VERSION = '1.8.5'
   MIN_IM_VERSION = '6.4.9'
 end

data/lib/rvg/clippath.rb

@@ -3,42 +3,43 @@
 # Copyright (C) 2009 Timothy P. Hunter
 #++
 module Magick
-    class RVG
-        class ClipPath
-            include ShapeConstructors
-            include UseConstructors
-            include TextConstructors
-            include Describable
-            include Stylable
-            include Duplicatable
+  class RVG
+    class ClipPath
+      include ShapeConstructors
+      include UseConstructors
+      include TextConstructors
+      include Describable
+      include Stylable
+      include Duplicatable
 
-            # Create a clipping path. Within the block create an outline
-            # from one or more paths, basic shapes, text objects, or +use+.
-            # Everything drawn within the outline will be displayed.
-            # Anything drawn outside the outline will not.
-            #
-            # If the clipping path contains a +use+, it
-            # must directly reference path, basic shape, or text objects.
-            #
-            # Attach the clipping path to an object with the :clip_path style.
-            def initialize(clip_path_units='userSpaceOnUse')
-                super()
-                unless ['userSpaceOnUse', 'objectBoundingBox'].include?(clip_path_units)
-                    fail ArgumentError, "undefined value for clip path units: #{clip_path_units}"
-                end
-                @clip_path_units = clip_path_units
-                @content = Content.new
-                yield(self) if block_given?
-            end
+      # Create a clipping path. Within the block create an outline
+      # from one or more paths, basic shapes, text objects, or +use+.
+      # Everything drawn within the outline will be displayed.
+      # Anything drawn outside the outline will not.
+      #
+      # If the clipping path contains a +use+, it
+      # must directly reference path, basic shape, or text objects.
+      #
+      # Attach the clipping path to an object with the :clip_path style.
+      def initialize(clip_path_units = 'userSpaceOnUse')
+        super()
+        unless ['userSpaceOnUse', 'objectBoundingBox'].include?(clip_path_units)
+          fail ArgumentError, "undefined value for clip path units: #{clip_path_units}"
+        end
 
-            def add_primitives(gc, style)   #:nodoc:
-                name = __id__.to_s
-                gc.define_clip_path(name) do
-                    gc.clip_units(@clip_path_units)
-                    @content.each { |element| element.add_primitives(gc) }
-                end
-                gc.clip_path(name)
-            end
-        end     # class ClipPath
-    end # class RVG
+        @clip_path_units = clip_path_units
+        @content = Content.new
+        yield(self) if block_given?
+      end
+
+      def add_primitives(gc, style) #:nodoc:
+        name = __id__.to_s
+        gc.define_clip_path(name) do
+          gc.clip_units(@clip_path_units)
+          @content.each { |element| element.add_primitives(gc) }
+        end
+        gc.clip_path(name)
+      end
+    end # class ClipPath
+  end # class RVG
 end # module Magick

data/lib/rvg/container.rb

@@ -2,122 +2,121 @@
 # $Id: container.rb,v 1.5 2009/02/28 23:52:13 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter
 #++
-
 module Magick
-    class RVG
-        # Content is simply an Array with a deep_copy method.
-        # When unit-testing, it also has a deep_equal method.
-        class Content < Array       #:nodoc:
-            def deep_copy(h = {})
-                me = __id__
-                copy = h[me]
-                unless copy
-                    copy = self.class.new
-                    each do |c|
-                        copy << case
-                            when c.nil?
-                                nil
-                            when c.respond_to?(:deep_copy)
-                                c.deep_copy(h)
-                            when c.respond_to?(:dup)
-                                c.dup rescue c
-                            else
-                                c
-                            end
-                    end
-                    copy.freeze if frozen?
-                    h[me] = copy
-                end
-                copy
+  class RVG
+    # Content is simply an Array with a deep_copy method.
+    # When unit-testing, it also has a deep_equal method.
+    class Content < Array       #:nodoc:
+      def deep_copy(h = {})
+        me = __id__
+        copy = h[me]
+        unless copy
+          copy = self.class.new
+          each do |c|
+            copy << case
+            when c.nil?
+              nil
+            when c.respond_to?(:deep_copy)
+              c.deep_copy(h)
+            when c.respond_to?(:dup)
+              c.dup rescue c
+            else
+              c
             end
-        end     # class Content
+          end
+          copy.freeze if frozen?
+          h[me] = copy
+        end
+        copy
+      end
+    end  # class Content
 
-        # Define a collection of shapes, text, etc. that can be reused.
-        # Group objects are _containers_. That is, styles and transforms defined
-        # on the group are used by contained objects such as shapes, text, and
-        # nested groups unless overridden by a nested container or the object itself.
-        # Groups can be reused with the RVG::UseConstructors#use method.
-        # Create groups within
-        # containers with the RVG::StructureConstructors#g method.
-        #
-        # Example:
-        #   # All elements in the group will be translated by 50 in the
-        #   # x-direction and 10 in the y-direction.
-        #   rvg.g.translate(50, 10).styles(:stroke=>'red',:fill=>'none') do |grp|
-        #       # The line will be red.
-        #       grp.line(10,10, 20,20)
-        #       # The circle will be blue.
-        #       grp.circle(10, 20, 20).styles(:stroke=>'blue')
-        #   end
-        class Group
-            include Stylable
-            include Transformable
-            include Embellishable
-            include Describable
-            include Duplicatable
+    # Define a collection of shapes, text, etc. that can be reused.
+    # Group objects are _containers_. That is, styles and transforms defined
+    # on the group are used by contained objects such as shapes, text, and
+    # nested groups unless overridden by a nested container or the object itself.
+    # Groups can be reused with the RVG::UseConstructors#use method.
+    # Create groups within
+    # containers with the RVG::StructureConstructors#g method.
+    #
+    # Example:
+    #   # All elements in the group will be translated by 50 in the
+    #   # x-direction and 10 in the y-direction.
+    #   rvg.g.translate(50, 10).styles(:stroke=>'red',:fill=>'none') do |grp|
+    #       # The line will be red.
+    #       grp.line(10,10, 20,20)
+    #       # The circle will be blue.
+    #       grp.circle(10, 20, 20).styles(:stroke=>'blue')
+    #   end
+    class Group
+        include Stylable
+        include Transformable
+        include Embellishable
+        include Describable
+        include Duplicatable
 
-            def initialize
-                super
-                @content = Content.new
-                yield(self) if block_given?
-            end
+      def initialize
+        super
+        @content = Content.new
+        yield(self) if block_given?
+      end
 
-            def add_primitives(gc)          #:nodoc:
-                gc.push
-                add_transform_primitives(gc)
-                add_style_primitives(gc)
-                @content.each { |element| element.add_primitives(gc) }
-                gc.pop
-            end
+      def add_primitives(gc)  #:nodoc:
+        gc.push
+        add_transform_primitives(gc)
+        add_style_primitives(gc)
+        @content.each { |element| element.add_primitives(gc) }
+        gc.pop
+      end
 
-            # Translate container according to #use arguments
-            def ref(x, y, width, height)    #:nodoc:
-                translate(x, y) if x != 0 || y != 0
-            end
+      # Translate container according to #use arguments
+      def ref(x, y, width, height)    #:nodoc:
+        translate(x, y) if x != 0 || y != 0
+      end
 
-            # Append an arbitrary object to the group's content. Called
-            # by #use to insert a non-container object into a group.
-            def <<(obj)                     #:nodoc:
-                @content << obj
-            end
-        end     # class Group
+      # Append an arbitrary object to the group's content. Called
+      # by #use to insert a non-container object into a group.
+      def <<(obj)  #:nodoc:
+        @content << obj
+      end
+    end  # class Group
 
-        # A Use object allows the re-use of RVG and RVG::Group
-        # objects within a container. Create a Use object with the
-        # RVG::UseConstructors#use method.
-        class Use
-            include Stylable
-            include Transformable
-            include Duplicatable
+    # A Use object allows the re-use of RVG and RVG::Group
+    # objects within a container. Create a Use object with the
+    # RVG::UseConstructors#use method.
+    class Use
+      include Stylable
+      include Transformable
+      include Duplicatable
 
-            # In a container, Use objects are created indirectly via the
-            # RVG::UseConstructors#use method.
-            # The +x+ and +y+ arguments
-            # can be used to specify an additional translation for
-            # the group. The +width+ and +height+ arguments specify
-            # a width and height for referenced RVG objects.
-            def initialize(element, x=0, y=0, width=nil, height=nil)
-                super()
+      # In a container, Use objects are created indirectly via the
+      # RVG::UseConstructors#use method.
+      # The +x+ and +y+ arguments
+      # can be used to specify an additional translation for
+      # the group. The +width+ and +height+ arguments specify
+      # a width and height for referenced RVG objects.
+      def initialize(element, x = 0, y = 0, width = nil, height = nil)
+        super()
 
-                # If the element is not a group, defs, symbol, or rvg,
-                # wrap a group around it so it can get a transform and
-                # possibly a new viewport.
-                if !element.respond_to?(:ref)
-                    @element = Group.new
-                    @element << element.deep_copy
-                else
-                    @element = element.deep_copy
-                end
-                @element.ref(x, y, width, height)
-            end
+        # If the element is not a group, defs, symbol, or rvg,
+        # wrap a group around it so it can get a transform and
+        # possibly a new viewport.
+        if !element.respond_to?(:ref)
+          @element = Group.new
+          @element << element.deep_copy
+        else
+          @element = element.deep_copy
+        end
+        @element.ref(x, y, width, height)
+      end
 
-            def add_primitives(gc)      #:nodoc:
-                gc.push
-                add_transform_primitives(gc)
-                add_style_primitives(gc)
-                @element.add_primitives(gc)
-                gc.pop
-            end
-        end # class Use
-    end # class RVG
+      def add_primitives(gc)  #:nodoc:
+        gc.push
+        add_transform_primitives(gc)
+        add_style_primitives(gc)
+        @element.add_primitives(gc)
+        gc.pop
+      end
+    end # class Use
+  end # class RVG
 end # module Magick