rmagick 2.13.3 → 2.13.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2ZlZjIzODVkZjk2YzI4NTE2ZjFlNjgzZTA2YTBjZGJiNTlkZDZlMw==
-  data.tar.gz: !binary |-
-    MzdiMTk3ODVjYzM3NTc2N2FhNTlmZjhkOWIzMDMyN2EwNzdhZDUwNA==
+SHA1:
+  metadata.gz: 508f276e9009e084323676549e393518a5d4bb86
+  data.tar.gz: 25255ce344cfe6c13ad3e8c86196af8c4acfc1df
 SHA512:
-  metadata.gz: !binary |-
-    ZDcyZTAyMzUxMTVjOTA1NTdhMzI2ZjRmMWViNDQ3Yjg5Nzk1MzFlZTRiNmM2
-    OTE3OTRkNDQ4MTc5YmVlNzc1ZDljMzVmYjdjMzA1MjRjOGI0ZmVmMjhkYmJi
-    YjVlODgwNGQwNjE3NjhhNjY4M2Y5NDFjMTk5NmI0NGZmYzY3MGU=
-  data.tar.gz: !binary |-
-    NTI1MjgwZmYyN2FiMDlkZmI0MDlmZmNiM2M1NTA3ODEzNjU1YmQwOTA0ZTNk
-    MWM4ZWEwMmM5MjEwYmJhZGQyMmU4NTc2NmI2YjRmZDBiNjQ4NmU5YjY5NTU4
-    YWI5NDc2MTIzN2I4MjQ3NGM1Mjc5NTQzNjVkZmY0OWMyYTc2ZmI=
+  metadata.gz: d6c520465ccb71d40bc6930e5c21d857c13f6f5d48d38d9ebce852ed6a7a96db4e840ddf9c959b9692de0d495ba74c122272592cf76de690c02c272273338310
+  data.tar.gz: 224f1cc16579906b338ee8e5bd6052b08e736d4b22cb314984abff9600a2dabb13a8f287fa2c9adeada88673ca5a6d51f0b87ac8567a07675e458e577965b1aa

data/.gitignore

@@ -0,0 +1,21 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/.travis.yml

@@ -0,0 +1,57 @@
+language: ruby
+
+os:
+  - linux
+  #- osx
+
+env:
+  # Currently successful release
+  - IMAGEMAGICK_VERSION=6.6.9-10
+  # Ubuntu's current stable release
+  - IMAGEMAGICK_VERSION=6.7.7-10
+  # Latest 6.7 release
+  - IMAGEMAGICK_VERSION=6.7.9-10
+  # Latest 6.8 release
+  - IMAGEMAGICK_VERSION=6.8.9-6
+  # Try with HDRI support, we don't mind if this fails currently.
+  - IMAGEMAGICK_VERSION=6.8.9-6 CONFIGURE_OPTIONS=--enable-hdri
+
+before_install:
+  - source before_install_$TRAVIS_OS_NAME.sh
+
+rvm:
+  - 1.9
+  - 2.0
+  - 2.1
+
+matrix:
+  exclude:
+#    - rvm: 1.9
+#      env: IMAGEMAGICK_VERSION=6.7.7-10
+    - rvm: 1.9
+      env: IMAGEMAGICK_VERSION=6.7.9-10
+#    - rvm: 1.9
+#      env: IMAGEMAGICK_VERSION=6.8.9-6
+    - rvm: 1.9
+      env: IMAGEMAGICK_VERSION=6.8.9-6 CONFIGURE_OPTIONS=--enable-hdri
+    - rvm: 2.0
+      env: IMAGEMAGICK_VERSION=6.7.7-10
+    - rvm: 2.0
+      env: IMAGEMAGICK_VERSION=6.7.9-10
+    - rvm: 2.0
+      env: IMAGEMAGICK_VERSION=6.8.9-6
+    - rvm: 2.0
+      env: IMAGEMAGICK_VERSION=6.8.9-6 CONFIGURE_OPTIONS=--enable-hdri
+  allow_failures:
+    - env: IMAGEMAGICK_VERSION=6.7.7-10
+    - env: IMAGEMAGICK_VERSION=6.7.9-10
+    #- env: IMAGEMAGICK_VERSION=6.8.9-6
+    - env: IMAGEMAGICK_VERSION=6.8.9-6 CONFIGURE_OPTIONS=--enable-hdri
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/a98c1112f5d60f97a532
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

data/CONTRIBUTING.md

@@ -0,0 +1,22 @@
+RMagick Contributor's Guide
+===========================
+
+Welcome
+-------
+
+Thank you for considering contributing to RMagick. Your contribution is always welcome!
+
+
+Background
+----------
+
+RMagick is a Ruby gem with a C extension. The extension wraps the ImageMagick C library. Therefore, the following document may be helpful to you:
+
+[Running C in Ruby](http://silverhammermba.github.io/emberb/extend/)
+
+
+Priorities
+----------
+
+9. Green build of the gem on all operating systems. You can see the current build state on [the project page at Travis CI](https://travis-ci.org/gemhome/rmagick). You are welcome to improve it.
+9. [Open issues](https://github.com/gemhome/rmagick/issues). You are welcome to reproduce them, report current state, suggest solutions, open pull requests with fixes.

data/ChangeLog

@@ -1,7 +1,50 @@
+HEAD
+RMagick 2.13.4
+    #129 from @theschoolmaster
+      proof of concept for using pkg-config in place of Magick-config on debian based systems
+
+    #127 from @u338steven
+      Changed Image#resample to calling ResampleImage (related #29, #45)
+
+    #124 from @u338steven
+      Fixed #122: lib/RMagick.rb is overwritten by lib/rmagick.rb on case-insensitive systems
+
+    #123 from @prijutme4ty
+      New class SolidFill in order to fill image with monochromatic background
+
+    #121 from @markotom
+      Quotes for correct path of font file
+
+    #120 from @chulkilee
+      Allow MagickCore6 from Magick-config
+
+    #112 from @u338steven/
+      Fixed: build error with ImageMagick 6.8.9 (when deprecated functions are excluded)
+
+    #102 from @u338steven
+      Fixed: related x_resolution, y_resolution
+
+    from @u338steven
+      Lots of test fixes
+
+    #95 from @ioquatix
+      Fix pixel hash test
+
+    #94 from @u338steven
+      Fixed: build error on Windows Ruby x64 (with ImageMagick 6.8.0-10 or Ima...
+
+    #91 from @vassilevsky
+      Do not test machine and OS-specific integers
+      Fix initial memory limit test
+
+RMagick 2.13.3
+    #90 from @bricef
+      Fix installation error on systems with HRDI enabled RMagick
+
 RMagick 2.13.2
     o Fixed issues preventing RMagick from working with version 6.8 or higher
-    o Fixed issues preventing RMagick from working with ruby 1.9.3	
-	
+    o Fixed issues preventing RMagick from working with ruby 1.9.3
+
 RMagick 2.13.1
     o Fixed bug preventing RMagick from working with version 6.5.9 or higher
 
@@ -9,10 +52,10 @@ RMagick 2.13.0
     o Added Doxygen documentation, for automatic documentation
     o Fixed bug #27467, get RMagick to compile witH ImageMagick 6.5.7
     o Fixed bug #27607, switch Pixel#from_hsla and Pixel#to_hsla to use ranges
-      0-255 instead of 0-100 for saturation and lightness (range used by 
+      0-255 instead of 0-100 for saturation and lightness (range used by
       ImageMagick 6.5.6-5 and higher). Also added ability to specify all
       arguments to these functions as percentages (bug report by Arthur Chan).
-	
+
 
 RMagick 2.12.2
     o Add feature tests for SinusoidFunction and PolynomialFunction enum

data/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rmagick.gemspec
+gemspec
+
+# Used by README.textile
+# gem "RedCloth"

data/{README.rc → README.textile}

@@ -1,21 +1,22 @@
-h1. RMagick 0.0.0$ README
+h1. RMagick
 
-h2. YY/MM/DD
+!https://img.shields.io/gem/v/rmagick.svg?style=flat(RubyGems)!:http://rubygems.org/gems/rmagick !https://img.shields.io/gem/dt/rmagick.svg?style=flat! !https://www.versioneye.com/ruby/rmagick/reference_badge.svg?style=flat(VersionEye)!:https://www.versioneye.com/ruby/rmagick/references !https://img.shields.io/travis/gemhome/rmagick.svg?style=flat(Travis CI)!:https://travis-ci.org/gemhome/rmagick !https://img.shields.io/codeclimate/github/gemhome/rmagick.svg?style=flat(Code Climate)!:https://codeclimate.com/github/gemhome/rmagick !https://badges.gitter.im/Join%20Chat.svg(Gitter)!:https://gitter.im/gemhome/rmagick?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
+This is the official fork of RMagick. The decision to create a fork "originated here":https://github.com/rmagick/rmagick/issues/18#issuecomment-50022523, where you can read more about why it happened.
 
 h3. Table of Contents
 
 * "Introduction":#intro
 * "Prerequisites":#prereq
 * "Installing RMagick":#install
-* "Configuration Options":#config
 * "Things that can go wrong":#wrong
 * "Upgrading":#upgrade
-* "Uninstalling":#uninstall
 * "More samples":#samples
 * "Reporting Bugs":#bugs
 * "Contact Information":#contact
 * "Credits":#credits
 * "License":#license
+* "Releasing":#releasing
 
 h2(#intro). Introduction
 
@@ -26,88 +27,38 @@ h2(#prereq). Prerequisites
 
 *O/S* Linux, *BSD, OS X, Windows 2000, XP, Vista, other *nix-like systems.
 
-*Ruby* Version 1.8.2 or later. You can get Ruby from "www.ruby-lang.org":http://www.ruby-lang.org.
-The use of versions of Ruby older than 1.8.4 with RMagick is deprecated. Support will be
-removed in a future release.
-
-*ImageMagick* Version 6.3.0 or later. You can get ImageMagick from "www.imagemagick.org":http://www.imagemagick.org.
-
-h2(#install). Installing RMagick
-
-First install ImageMagick. Complete and up-to-date instructions for installing
-ImageMagick on Linux, *BSD, and other *nix-type O/S's are available
-"here":http://rmagick.rubyforge.org/install-linux.html. Use steps 0, 1, and 2.
-Similarly, instructions for installing ImageMagick using MacPorts on OS X
-are available "here":http://rmagick.rubyforge.org/install-osx.html. Use steps
-1 and 2.
+*Ruby* Version 1.8.5 or later. You can get Ruby from "www.ruby-lang.org":http://www.ruby-lang.org.
 
-This release of RMagick uses Minero Aoki's setup.rb script for installation.
-See the next section for configuration options. Usually you do not need to
-specify any of these options. You can get more information about setup.rb from
-his "web site":<http://i.loveruby.net.
+Ruby must be able to build C-Extensions (e.g. MRI, Rubinius, not JRuby)
 
-I assume you've already decompressed the tarball, or you wouldn't be reading
-this. If you have not decompressed the tarball, do so with one of these commands,
-depending on which tarball you have:
+*ImageMagick* Version 6.4.9 or later. You can get ImageMagick from "www.imagemagick.org":http://www.imagemagick.org.
 
-<pre>
-    tar xvzf RMagick-0.0.0$-tar.gz              (gzipped tarball)
-    tar xvjf RMagick-0.0.0$-tar.bz2             (bzipped tarball)
-    7z e RMagick-x.y.z.tar.lzma -so | tar xv    (7zipped tarball)
-</pre>
-
-Change to the RMagick-0.0.0 directory. If you are not using any
-configuration options (usually you don't need to) enter the command
-
-<pre>
-   ruby setup.rb
-</pre>
+h2(#install). Installing RMagick
 
-Note that setup.rb executes all the example programs, so this can take
-some time.  This process both builds the example images used in the
-documentation and validates your RMagick installation.
+h4. Installing via Bundler
 
-After this command completes, make sure you have root privileges (that
-is, login as root or use su or sudo) and enter the command
+Add to your `Gemfile`:
 
-<pre>
-    ruby setup.rb install
-</pre>
+bc. gem 'rmagick'
 
-h2(#config). Configuration options
+Then run:
 
-Type @ruby setup.rb --help@ to see a list of configuration options.  In
-addition to the regular options, there are a few RMagick-specific options:
+bc. bundle install
 
-h4. --doc-dir=directory
+h4. Installing via RubyGems
 
-Specify the directory to install the RMagick documentation.
-By default this is $prefix/share/RMagick, where $prefix is the
-prefix specified by --prefix. For example, to install the
-documentation in /Users/me/RMagick, specify:
+Run:
 
-<pre>
-    ruby setup.rb --doc-dir=/Users/me/RMagick
-</pre>
-
-h4. --allow-example-errors
+bc. gem install rmagick
 
-Normally the documentation installation terminates if 5 examples fail.
-If you use this option, the installation does not check for failing
-examples and will always complete. This option is useful if you're
-having trouble installing RMagick and you want to see all the failing examples.
+Require RMagick in your project as follows:
 
-h4. -- disable-htmldoc
-
-By default the install process runs all the RMagick example programs and
-generates HTML versions of all the examples.  This option causes the
-install process to skip this step.  No install verification will take
-place and no documentation will be installed.
+bc. require 'rmagick'
 
 h2(#wrong). Things that can go wrong
 
-The "RMagick installation FAQ":http://rmagick.rubyforge.org/install-faq.html
-has answers to the most commonly reported problems.
+The "RMagick installation FAQ":https://web.archive.org/web/20140512193354/http://rmagick.rubyforge.org/install-faq.html
+has answers to the most commonly reported problems, though may be out of date.
 
 h4. Can't install RMagick. Can't find libMagick or one of the dependent libraries. Check the mkmf.log file for more detailed information.
 
@@ -115,7 +66,7 @@ Typically this message means that one or more of the libraries that ImageMagick
 depends on hasn't been installed. Examine the mkmf.log file in the ext/RMagick
 subdirectory of the installation directory for any error messages. These messages
 typically contain enough additional information for you to be able to diagnose
-the problem. Also see "this FAQ":http://rmagick.rubyforge.org/install-faq.html#libmagick.
+the problem. Also see "this FAQ":https://web.archive.org/web/20140512193354/http://rmagick.rubyforge.org/install-faq.html#libmagick.
 
 h4. Cannot open shared object file
 
@@ -141,22 +92,6 @@ LD_LIBRARY_PATH variable like this:
 On Linux, see @ld(1)@ and @ld.so(8)@ for more information. On other operating
 systems, see the documentation for the dynamic loading facility.
 
-h4. No such file or directory - "/tmp/rmagick6872.6"
-
-When setup.rb is running the examples, if you get a message like this:
-
-<pre>
-    hook /home/me/src/RMagick-0.0.0/./post-setup.rb failed:
-    No such file or directory - "/tmp/rmagick6872.6"
-</pre>
-
-you probably do not have a temporary directory environment variable set. Set
-the TMPDIR environment variable to your temporary directory. For example:
-
-<pre>
-    export TMPDIR=/home/me/tmp
-</pre>
-
 
 h2(#upgrade). Upgrading
 
@@ -164,15 +99,6 @@ If you upgrade to a newer release of ImageMagick, make sure you're using a
 release of RMagick that supports that release. It's safe to install a new
 release of RMagick over an earlier release.
 
-h2(#uninstall). Uninstalling
-
-The uninstall.rb script will uninstall RMagick completely. Make sure you
-have administrator priviledges. Then run this command:
-
-<pre>
-    ruby uninstall.rb
-</pre>
-
 h2(#samples). More samples
 
 You can find more sample RMagick programs in the /example directory.
@@ -181,7 +107,8 @@ These programs are not installed in the RMagick documentation tree.
 h2(#bugs). Reporting bugs
 
 Please report bugs in RMagick, its documentation, or its installation
-programs to me via the bug tracker on the "RMagick project page":http://rubyforge.org/projects/rmagick.
+programs to me via the bug tracker on the "RMagick issues page":https://github.com/gemhome
+
 However, I can't help with Ruby installation and configuration or ImageMagick
 installation and configuration. Information about reporting problems and
 getting help for ImageMagick is available at the "ImageMagick web site":http://www.imagemagick.org
@@ -191,16 +118,12 @@ h2(#contact). Contact Information
 
 *Author:* Tim Hunter, Omer Bar-or, Benjamin Thomas
 
-*Email:* "rmagick@rubyforge.org":mailto:rmagick@rubyforge.org
-
-*Web site:* "http://rmagick.rubyforge.org":http://rmagick.rubyforge.org
-
 h2(#credits). Credits
 
 Thanks to "ImageMagick Studio LLC":http://www.imagemagick.org for ImageMagick
 and for hosting the RMagick documentation.
 
-h2(#license). License
+h2(#license). MIT License
 
 <pre>
 Copyright &copy; 2002-2009 by Timothy P. Hunter
@@ -227,5 +150,12 @@ DEALINGS IN THE SOFTWARE.
 </pre>
 
 <hr>
-This file is marked up using "Textile":http://hobix.com/textile/ and converted
-to HTML with "RedCloth":http://whytheluckystiff.net/ruby/redcloth/.
+
+h2(#releasing). Releasing
+
+See https://github.com/rmagick/rmagick/wiki/Release-Process
+
+# Update ChangeLog
+# Edit lib/rmagick/version.rb
+# Are the tests passing? Run `rake` again just to be sure.
+# `rake release`

data/Rakefile

@@ -1,40 +1,176 @@
-# note, there are other, legacy tasks in build_tarball.rake
-# thate currently are run by e.g.
-#   rake -f build_tarball.rake clean release=RMagick_2-13-1
-#   rake -f build_tarball.rake release=RMagick_2-13-1
 require './lib/rmagick/version'
 require 'fileutils'
-desc "build and push gem, tag and push repo"
-task "release" do
+task :config do
+  def version
+    Magick::VERSION
+  end
+  # e.g. 2.13.3 becomes RMagick_2-13-3
+  def version_tag
+    "RMagick_#{version.gsub(".","-")}"
+  end
+  # e.g. 2.13.3 becomes rmagick-2.13.3.gem
+  def gem_name
+    "rmagick-#{version}.gem"
+  end
+  def base
+    File.expand_path('..', __FILE__)
+  end
+end
+
+desc "abort when repo nto clean or has uncommited code"
+task :assert_clean_repo do
   sh("git diff --exit-code")
   abort "Git repo not clean" unless $?.success?
   sh("git diff-index --quiet --cached HEAD")
   abort "Git repo not commited" unless $?.success?
-  version = Magick::VERSION
-  # e.g. 2.13.3 becomes RMagick_2-13-3
-  version_tag = "RMagick_#{version.gsub(".","-")}"
-  # e.g. 2.13.3 becomes rmagick-2.13.3.gem
-  gem_name = "rmagick-#{version}.gem"
+end
 
-  # build gem
+desc "build gem"
+task :build => [:config] do
   sh "gem build -V rmagick.gemspec"
   if $?.success?
-    base = File.expand_path('..', __FILE__)
     FileUtils.mkdir_p(File.join(base, 'pkg'))
     FileUtils.mv(File.join(base, gem_name), 'pkg')
-    # push gem
-    sh "gem push #{File.join(base, 'pkg', gem_name)}"
-    if $?.success?
-      sh "git tag -a -m \"Version #{version}\" #{version_tag}"
-      STDOUT.puts "Tagged #{version_tag}."
-      sh "git push"
-      sh "git push --tags"
-    else
-      abort "tagging abd pushing gem failed"
-    end
-
   else
     STDERR.puts "Could not build gem"
     exit $?.exitstatus
   end
 end
+
+task :push_and_tag => [:build] do
+  sh "gem push #{File.join(base, 'pkg', gem_name)}"
+  if $?.success?
+    sh "git tag -a -m \"Version #{version}\" #{version_tag}"
+    STDOUT.puts "Tagged #{version_tag}."
+    sh "git push"
+    sh "git push --tags"
+  else
+    abort "tagging aborted pushing gem failed"
+  end
+end
+
+desc "Release"
+task :release => [:assert_clean_repo, :push_and_tag]
+
+desc "Release and build the legacy way"
+task :legacy_release=> ["legacy:README.html", "legacy:extconf", "legacy:doc", "legacy:manifest", "release"]
+
+namespace :legacy do
+  require 'find'
+
+  task :redcloth do
+    require 'redcloth'
+  end
+
+  README = "README.html"
+  MANIFEST = "ext/RMagick/MANIFEST"
+
+  # Change the version number placeholders in a file.
+  # Returns an array of lines from the file.
+  def reversion(name)
+    now = Time.new
+    now = now.strftime("%m/%d/%y")
+
+    lines = File.readlines name
+    lines.each do |line|
+      line.gsub!(%r{0\.0\.0}, Magick::VERSION)
+      line.gsub!(%r{YY/MM/DD}, now)
+    end
+    lines
+  end
+
+  # Rewrite a file containing embedded version number placeholders.
+  def reversion_file(name)
+    lines = reversion(name)
+    tmp_name = name + "_tmp"
+    mv name, tmp_name
+    begin
+      File.open(name, "w") { |f| lines.each { |line| f.write line } }
+    rescue
+      mv tmp_name, name
+    ensure
+      rm tmp_name
+    end
+  end
+
+  desc "Update version in extconf"
+  task :extconf do
+    reversion_file "ext/RMagick/extconf.rb"
+  end
+
+  desc "Build README.txt from README.textile using RedCloth"
+  task "README.txt" => [:redcloth] do
+    reversion_file "README.textile"
+    body = File.readlines "README.textile"
+    body = RedCloth.new(body.join).to_html + "\n"
+    File.open("README.txt", "w") { |f| f.write body }
+  end
+
+  desc "Build README.html from README.txt"
+  task README => "README.txt" do
+    puts "writing #{README}"
+    File.open(README, "w") do |html|
+      html.write <<END_HTML_HEAD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <title>RMagick #{Magick::VERSION} README</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <meta name="GENERATOR" content="RedCloth">
+  </head>
+  <body>
+END_HTML_HEAD
+      html.write File.readlines("README.txt")
+      html.write <<END_HTML_TAIL
+  </body>
+</html>
+END_HTML_TAIL
+    end
+  end
+
+  desc "Update versions in html files"
+  task :doc do
+    Dir.chdir("doc") do
+      FileList["*.html"].each { |d| reversion_file(d) }
+    end
+  end
+
+  # Remove files we don't want in the tarball.
+  # Ensure files are not executable. (ref: bug #10080)
+  desc "Remove files we don't want in the .gem; ensure files are not executable"
+  task :fix_files do
+    rm "README.txt", :verbose => true
+    chmod 0644, FileList["doc/*.html", "doc/ex/*.rb", "doc/ex/images/*", "examples/*.rb"]
+  end
+
+  desc "Build manifest"
+  task :manifest do
+    now = Time.new
+    now = now.strftime("%H:%M:%S %m/%d/%y")
+    puts "generating #{MANIFEST}"
+
+    File.open(MANIFEST, "w") do |f|
+      f.puts "MANIFEST for #{Magick::VERSION} - #{now}\n\n"
+      Find.find('.') do |name|
+        next if File.directory? name
+        f.puts name[2..-1]    # remove leading "./"
+      end
+    end
+  end
+
+end
+
+require 'rake/extensiontask'
+require 'rake/testtask'
+
+Rake::ExtensionTask.new('RMagick2') do |ext|
+  ext.ext_dir = 'ext/RMagick'
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+end
+
+task :test => :compile
+
+task :default => :test