rmagick 2.15.4 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79bd6595ef81cd3743a21521e9a4bed46dbcf52b
-  data.tar.gz: 659d7eff32093a2a9d1738509a0c4c3376466d29
+  metadata.gz: cdb0b76b421e905281ea36ab502157f8127ef7f4
+  data.tar.gz: 7055d7ca36c20dfe2368b86274fcae3b092ce4af
 SHA512:
-  metadata.gz: 72eb476772660c07483bf8748716d1a95412c3d64988c65385dee9b48b4177a9e42beb583a031233689446fb3aa2987d1da672ed18fe88bf96618ea28da5fb6e
-  data.tar.gz: b67cb2bcccb97b2e4ef53b65fdfabde8cacf18dfcba388d49a476d6f96d27d2685aeef6e15e1268aa68465277e3752a45fe4f7c1bbc26bb8ebad091056953ca4
+  metadata.gz: 3e48587349334725feb46115787fe620396220163f61822724f818645d89538b3a0a898f03b9d3af20a959ed023619ac3d268d8597f34b3dacc4ce7e2af7fd95
+  data.tar.gz: 830620183fb702cd38df0bd0d227e1a3d094198cb4d8a6d94b6354c4a854412ae795700f25584e4470c8078fe52a8208275f758fdb249aa2dc109261316b665b

data/.travis.yml

@@ -22,6 +22,8 @@ env:
 before_install:
   - source before_install_$TRAVIS_OS_NAME.sh
 
+install: bundle install --verbose
+
 rvm:
   - 1.8
   - 1.9

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.16.0
+
+- Support ImageMagick 6.9+ - @ZipoKing
+
 ## RMagick 2.15.4
 
 - Improved C extension building process - @u338steven

data/README.textile

@@ -36,6 +36,8 @@ On Ubuntu, you can run:
 
 bc. sudo apt-get install libmagickwand-dev
 
+*Note to Windows users:* Please make sure that you choose an ImageMagick version that matches the bitness of your Ruby version.
+
 h2(#install). Installing RMagick
 
 h4. Installing via Bundler
@@ -54,6 +56,14 @@ Run:
 
 bc. gem install rmagick
 
+h4. Versioning
+
+RMagick is versioned according to Semantic Versioning.
+For stable version compatible with Ruby 1.8+, use `~> 2.0`.
+Upcoming version 3 will work on Ruby 2.x only.
+
+h2(#usage). Using RMagick
+
 Require RMagick in your project as follows:
 
 bc. require 'rmagick'

data/before_install_linux.sh

@@ -24,3 +24,9 @@ if [[ $TRAVIS_RUBY_VERSION =~ ^1.8 ]]; then
     echo "Set the stack size to unlimited to avoid segfault for Ruby 1.8"
     ulimit -s unlimited
 fi
+
+# Fixes this error:
+# NoMethodError: undefined method `spec' for nil:NilClass
+# Travis uses Bundler 1.7.6 by default and it has this bug
+# https://github.com/rubygems/rubygems/issues/1419
+gem install bundler

data/doc/draw.html

@@ -649,10 +649,13 @@ title.annotate(montage, 0,0,0,40, 'Named Colors') {
     <h4>Description</h4>
 
     <p>Returns information for a specific string if rendered on a
-    image. The <code>get_multiline_type_metrics</code> method is
-    the same as <code>get_type_metrics</code>, except the former
-    returns the maximum height and width for multiple lines of
-    text. (Text lines are separated by "\n" characters.)</p>
+    image.  Metrics are derived from either the <a href="#attributes">
+    annotate attributes</a> or from the <a href="info.html">image
+    info attributes</a>, but not from any drawing primitive methods.
+    The <code>get_multiline_type_metrics</code> method is the same as 
+    <code>get_type_metrics</code>, except the former returns the 
+    maximum height and width for multiple lines of text. (Text lines
+    are separated by "\n" characters.)</p>
 
     <p>The Magick++ documentation for its TypeMetric class provides
     this useful additional information. (I've changed it a bit to

data/ext/RMagick/extconf.rb

@@ -21,6 +21,7 @@ module RMagick
     def configured_compile_options
       {
         :magick_config => $magick_config,
+        :with_magick_wand => $with_magick_wand,
         :pkg_config    => $pkg_config,
         :magick_version => $magick_version,
         :local_libs     => $LOCAL_LIBS,
@@ -57,6 +58,7 @@ module RMagick
         end
 
         # ugly way to handle which config tool we're going to use...
+        $with_magick_wand = false
         $magick_config = false
         $pkg_config = false
 
@@ -84,21 +86,50 @@ module RMagick
           end
         end
 
-        # either set flags using Magick-config or pkg-config (new Debian default)
-        if $magick_config
-          # Save flags
-          $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `Magick-config --cflags`.chomp
-          $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `Magick-config --cppflags`.chomp
-          $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `Magick-config --ldflags`.chomp
-          $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `Magick-config --libs`.chomp
+        # From ImageMagick 6.9 binaries are split to two and we have to use
+        # MagickWand instead of MagickCore
+        checking_for("presence of MagickWand API (ImageMagick version >= #{Magick::MIN_WAND_VERSION})") do
+          $with_magick_wand = Gem::Version.new($magick_version) >= Gem::Version.new(Magick::MIN_WAND_VERSION)
+          if $with_magick_wand
+            Logging.message('Detected 6.9+ version, using MagickWand API')
+          else
+            Logging.message('Older version detected, using MagickCore API')
+          end
         end
 
-        if $pkg_config
-          # Save flags
-          $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `pkg-config --cflags MagickCore`.chomp
-          $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore`.chomp
-          $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `pkg-config --libs MagickCore`.chomp
-          $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `pkg-config --libs MagickCore`.chomp
+        # either set flags using Magick-config, MagickWand-config or pkg-config (new Debian default)
+        if $with_magick_wand
+          if $magick_config
+            # Save flags
+            $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `MagickWand-config --cflags`.chomp
+            $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `MagickWand-config --cppflags`.chomp
+            $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `MagickWand-config --ldflags`.chomp
+            $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `MagickWand-config --libs`.chomp
+          end
+
+          if $pkg_config
+            # Save flags
+            $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `pkg-config --cflags MagickWand`.chomp
+            $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand`.chomp
+            $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `pkg-config --libs MagickWand`.chomp
+            $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `pkg-config --libs MagickWand`.chomp
+          end
+        else
+          if $magick_config
+            # Save flags
+            $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `Magick-config --cflags`.chomp
+            $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `Magick-config --cppflags`.chomp
+            $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `Magick-config --ldflags`.chomp
+            $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `Magick-config --libs`.chomp
+          end
+
+          if $pkg_config
+            # Save flags
+            $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `pkg-config --cflags MagickCore`.chomp
+            $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore`.chomp
+            $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `pkg-config --libs MagickCore`.chomp
+            $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `pkg-config --libs MagickCore`.chomp
+          end
         end
 
         if RUBY_PLATFORM =~ /darwin/ # osx

data/lib/rmagick/version.rb

@@ -1,5 +1,6 @@
 module Magick
-  VERSION = '2.15.4'
+  VERSION = '2.16.0'
   MIN_RUBY_VERSION = '1.8.5'
   MIN_IM_VERSION = '6.4.9'
+  MIN_WAND_VERSION = '6.9.0'
 end

data/lib/rmagick_internal.rb

@@ -1812,7 +1812,6 @@ module Magick
     end
 
     def slice(*args)
-      current = get_current
       slice = @images.slice(*args)
       if slice
         ilist = self.class.new

data/rmagick.gemspec

@@ -2,6 +2,13 @@ require 'date'
 require 'English'
 require './lib/rmagick/version'
 
+def v(version)
+  Gem::Version.new(version)
+end
+
+RUBY     = v(RUBY_VERSION.dup)
+RUBYGEMS = v(Gem::VERSION.dup)
+
 Gem::Specification.new do |s|
   s.name = 'rmagick'
   s.version = Magick::VERSION
@@ -29,14 +36,28 @@ Gem::Specification.new do |s|
   s.has_rdoc = false
   s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
   s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
-  s.add_development_dependency 'rake-compiler'
+
   s.add_development_dependency 'rspec', '~> 3.2.0'
 
-  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('1.9.2')
+  if RUBY < v('1.9.0')
+    s.add_development_dependency 'rake', '~> 10.0'
+  end
+
+  if RUBY < v('2.0.0')
+    s.add_development_dependency 'json', '~> 1.0'
+  end
+
+  if RUBY >= v('1.9.2')
     s.add_development_dependency 'rubocop', '~> 0.33.0'
   end
 
-  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.0')
+  if RUBY >= v('2.2.0')
     s.add_development_dependency 'test-unit', '~> 2'
   end
+
+  if RUBYGEMS < v('1.8.25')
+    s.add_development_dependency 'rake-compiler', '~> 0.8.0'
+  else
+    s.add_development_dependency 'rake-compiler'
+  end
 end

data/wercker.yml

@@ -0,0 +1,10 @@
+box: centos:6
+build:
+  steps:
+  - script:
+      name: deps
+      code: sudo yum install -y ruby ruby-devel rubygems ImageMagick-devel gcc git
+  - bundle-install
+  - script:
+      name: tests
+      code: bundle exec rake

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 2.15.4
+  version: 2.16.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,50 +11,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  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: RMagick is an interface between Ruby and ImageMagick.
 email: github@benjaminfleischer.com
 executables: []
@@ -452,6 +466,7 @@ files:
 - test/srgb.icm
 - test/test_all_basic.rb
 - test/tmpnam_test.rb
+- wercker.yml
 homepage: https://github.com/rmagick/rmagick
 licenses:
 - MIT
@@ -475,7 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick 6.4.9 or later
 rubyforge_project: rmagick
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby binding to ImageMagick
@@ -505,4 +520,3 @@ test_files:
 - test/srgb.icm
 - test/test_all_basic.rb
 - test/tmpnam_test.rb
-has_rdoc: false