rmagick 2.13.3 → 2.13.4

data/test/Pixel.rb

@@ -15,20 +15,19 @@ class Pixel_UT < Test::Unit::TestCase
         hash = nil
         assert_nothing_raised { hash = @pixel.hash}
         assert_not_nil(hash)
-        assert_equal(-761981696, hash)
+        assert_equal(1385501952, hash)
 
         p = Magick::Pixel.new
         assert_equal(0, p.hash)
 
         p = Magick::Pixel.from_color('red')
-        assert_equal(-8388608, p.hash)
+        assert_equal(2139095040, p.hash)
 
         # Pixel.hash sacrifices the last bit of the opacity channel
         p = Magick::Pixel.new(0, 0, 0, 72)
         p2 = Magick::Pixel.new(0, 0, 0, 73)
         assert_not_equal(p, p2)
         assert_equal(p.hash, p2.hash)
-
     end
 
     def test_eql?
@@ -66,7 +65,7 @@ class Pixel_UT < Test::Unit::TestCase
         25.times do |s|
           25.times do |l|
             5.times do |a|
-              args = [20*h, s+25, l+25, a/5]
+              args = [20*h, s+25, l+25, a/5.0]
               px = Magick::Pixel.from_hsla(*args)
               hsla = px.to_hsla()
               #puts "[#{args.join(', ')}] = [#{hsla.join(', ')}]"

data/test/{all_basic.rb → test_all_basic.rb}

@@ -6,27 +6,20 @@ require 'test/unit/ui/console/testrunner'  if !RUBY_VERSION[/^1\.9|^2/]
 puts RUBY_VERSION
 puts RUBY_VERSION.class
 
-module Test
-    module Unit
-        class TestCase
-            alias :_old_run_ :run
-            def run(result, &blk)
-                method_name = RUBY_VERSION[/^1\.9|^2/] ? self.__name__ : @method_name
-                puts "Running #{method_name}"
-                _old_run_(result, &blk)
-            end
-        end
-    end
-end
+root_dir = File.expand_path("../..", __FILE__)
+$LOAD_PATH.push(root_dir)
 
-
-$:.push('.')
-
-IMAGES_DIR = '../doc/ex/images'
+IMAGES_DIR = File.join(root_dir, 'doc/ex/images')
 FILES = Dir[IMAGES_DIR+'/Button_*.gif'].sort
 FLOWER_HAT = IMAGES_DIR+'/Flower_Hat.jpg'
 IMAGE_WITH_PROFILE = IMAGES_DIR+'/image_with_profile.jpg'
 
+Magick::Magick_version =~ /ImageMagick (\d+\.\d+\.\d+)-(\d+) /
+abort "Unable to get ImageMagick version" unless $1 && $2
+
+IM_VERSION = Gem::Version.new($1)
+IM_REVISION = Gem::Version.new($2)
+
 require 'Image1.rb'
 require 'Image2.rb'
 require 'Image3.rb'
@@ -39,4 +32,3 @@ require 'Preview.rb'
 require 'Info.rb'
 require 'Magick.rb'
 require 'Draw.rb'
-

data/test/tmpnam_test.rb

@@ -0,0 +1,50 @@
+require 'minitest/autorun'
+require 'rmagick'
+
+class TmpnamTest < Minitest::Test
+  # test the @@_tmpnam_ class variable
+  # the count is incremented by Image::Info#texture=,
+  # ImageList::Montage#texture=, and Draw.composite
+  def test_tmpnam
+    tmpfiles = Dir[ENV["HOME"] + "/tmp/magick*"].length
+
+    texture = Magick::Image.read("granite:") { self.size = "20x20" }.first
+    info = Magick::Image::Info.new
+
+    # does not exist at first
+    assert_raise(NameError) { x = Magick._tmpnam_ }
+
+    info.texture = texture
+
+    # now it exists
+    assert_nothing_raised { x = Magick._tmpnam_ }
+    assert_equal(1, Magick._tmpnam_)
+
+    info.texture = texture
+    assert_equal(2, Magick._tmpnam_)
+
+    mon = Magick::ImageList::Montage.new
+    mon.texture = texture
+    assert_equal(3, Magick._tmpnam_)
+
+    mon.texture = texture
+    assert_equal(4, Magick._tmpnam_)
+
+    gc = Magick::Draw.new
+    gc.composite(0, 0, 20, 20, texture)
+    assert_equal(5, Magick._tmpnam_)
+
+    gc.composite(0, 0, 20, 20, texture)
+    assert_equal(6, Magick._tmpnam_)
+
+    tmpfiles2 = Dir[ENV["HOME"] + "/tmp/magick*"].length
+
+    # The 2nd montage texture deletes the first.
+    # The 2nd info texture deletes the first.
+    # Both composite images are still alive.
+    # Therefore only 4 tmp files are left.
+    #assert_equal(tmpfiles+4, tmpfiles2)
+    # 6.4.1-5 - only 1 tmpfile?
+    assert_equal(tmpfiles, tmpfiles2)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 2.13.3
+  version: 2.13.4
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,8 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
-dependencies: []
+date: 2014-11-25 00:00:00.000000000 Z
+dependencies:
+- !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: []
@@ -20,14 +34,18 @@ extensions:
 - ext/RMagick/extconf.rb
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
+- CONTRIBUTING.md
 - ChangeLog
 - Doxyfile
+- Gemfile
 - LICENSE
-- README
-- README-Mac-OSX.txt
-- README.rc
+- README.textile
 - Rakefile
-- build_tarball.rake
+- before_install_linux.sh
+- before_install_osx.sh
+- doc/.cvsignore
 - doc/comtasks.html
 - doc/constants.html
 - doc/css/doc.css
@@ -188,6 +206,7 @@ files:
 - doc/ex/images/duck8.gif
 - doc/ex/images/duck9.gif
 - doc/ex/images/graydient230x6.gif
+- doc/ex/images/image_with_profile.jpg
 - doc/ex/images/logo400x83.gif
 - doc/ex/images/model.miff
 - doc/ex/images/notimplemented.gif
@@ -356,7 +375,9 @@ files:
 - ext/RMagick/rmstruct.c
 - ext/RMagick/rmutil.c
 - lib/RMagick.rb
+- lib/rmagick.rb
 - lib/rmagick/version.rb
+- lib/rmagick_internal.rb
 - lib/rvg/clippath.rb
 - lib/rvg/container.rb
 - lib/rvg/deep_equal.rb
@@ -369,16 +390,9 @@ files:
 - lib/rvg/stretchable.rb
 - lib/rvg/stylable.rb
 - lib/rvg/text.rb
-- lib/rvg/to_c.rb
 - lib/rvg/transformable.rb
 - lib/rvg/units.rb
-- metaconfig
-- pkg/rmagick-2.13.3.rc1.gem
-- post-clean.rb
-- post-install.rb
-- post-setup.rb
 - rmagick.gemspec
-- setup.rb
 - test/Draw.rb
 - test/Image1.rb
 - test/Image2.rb
@@ -391,10 +405,10 @@ files:
 - test/Magick.rb
 - test/Pixel.rb
 - test/Preview.rb
-- test/all_basic.rb
 - test/cmyk.icm
 - test/srgb.icm
-- uninstall.rb
+- test/test_all_basic.rb
+- test/tmpnam_test.rb
 homepage: https://github.com/gemhome/rmagick
 licenses:
 - MIT
@@ -407,20 +421,35 @@ require_paths:
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - ImageMagick 6.4.9 or later
 rubyforge_project: rmagick
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Ruby binding to ImageMagick
-test_files: []
-has_rdoc: false
+test_files:
+- test/Draw.rb
+- test/Image1.rb
+- test/Image2.rb
+- test/Image3.rb
+- test/ImageList1.rb
+- test/ImageList2.rb
+- test/Image_attributes.rb
+- test/Import_Export.rb
+- test/Info.rb
+- test/Magick.rb
+- test/Pixel.rb
+- test/Preview.rb
+- test/cmyk.icm
+- test/srgb.icm
+- test/test_all_basic.rb
+- test/tmpnam_test.rb

data/README

@@ -1,15 +0,0 @@
-A new release 2.13.2 of RMagick is now available on github as well as rubygems.
-
-This release will fix the installation issues due to ruby 1.9.3 and ImageMagick 6.8+. You can install it the usual way with bundle by adding to Gemfile:
-
-gem 'rmagick', '2.13.2'
-
-or if you want to be on edge:
-
-gem 'rmagick', '2.13.2', :git=>'http://github.com/rmagick/rmagick.git'
-
-You also install it directly by doing:
-
-gem install rmagick
-
-- Moncef Maiza.

data/README-Mac-OSX.txt

@@ -1 +0,0 @@
-For installation instructions see http://rmagick.rubyforge.org/install-osx.html

data/build_tarball.rake

@@ -1,215 +0,0 @@
-
-# Build the tar.gz, tar.bz2, and .gem files for an RMagick Release
-# Expects the CVS tag for release RMagick x.y.z to be in the form RMagick_x-y-z.
-# To use: cd to $HOME
-# run:    rake -f path/to/build_tarball.rake clean
-#         rake -f path/to/build_tarball.rake release=tag beta=whatever
-#
-# Specify the release as release=RMagick_x-y-z or nothing if release=HEAD
-# Specify a beta Release as beta=beta1
-
-require 'rubygems'
-require 'redcloth'
-require 'find'
-require 'fileutils'
-include FileUtils
-
-
-CVSSERVER = ":ext:rmagick@rubyforge.org/var/cvs/rmagick"
-
-
-# CVS_Tag is the CVS tag for this release. Dist_Directory is CVS_Tag,
-# modified for use as a directory name.
-if ENV.include?("release")
-  CVS_Tag = ENV["release"]
-  Dist_Directory = CVS_Tag.tr('_-','-.')
-else
-  CVS_Tag = "HEAD"
-  Dist_Directory = "RMagick-0.0.0"
-end
-
-
-# RMagick_Version is just X.Y.Z
-RMagick_Version = Dist_Directory.sub(/RMagick-/, "")
-
-# RMagick_Version2 is X.Y.Z + "-beta1" if beta=beta1
-RMagick_Version2 = RMagick_Version + (ENV.include?("beta") ? "-" + ENV["beta"] : "")
-
-# Release is RMagick-X.Y.Z, plus "-beta1" if beta=beta1
-Release = Dist_Directory + (ENV.include?("beta") ? "-" + ENV["beta"] : "")
-
-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\$}, RMagick_Version2)
-    line.gsub!(%r{0\.0\.0}, RMagick_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
-
-
-
-
-task :extconf do
-  Dir.chdir(Dist_Directory) { reversion_file "ext/RMagick/extconf.rb" }
-end
-
-
-
-
-task :gemspec do
-  Dir.chdir(Dist_Directory) { reversion_file "rmagick.gemspec" }
-end
-
-
-
-
-task "README.txt" do
-  Dir.chdir Dist_Directory do
-    reversion_file "README.rc"
-    body = File.readlines "README.rc"
-    body = RedCloth.new(body.join).to_html + "\n"
-    File.open("README.txt", "w") { |f| f.write body }
-  end
-end
-
-
-
-
-task README => "README.txt" do
-  puts "writing #{README}"
-  Dir.chdir Dist_Directory do
-    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 #{RMagick_Version2} 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
-end
-
-
-
-
-task :doc do
-  Dir.chdir(File.join(Dist_Directory, "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)
-task :fix_files do
-    Dir.chdir Dist_Directory do
-        rm_rf "test", :verbose => true
-        rm "lib/rvg/to_c.rb", :verbose => true
-        rm "README.rc", :verbose => true
-        rm "README.txt", :verbose => true
-        chmod 0644, FileList["doc/*.html", "doc/ex/*.rb", "doc/ex/images/*", "examples/*.rb"]
-    end
-end
-
-
-
-
-task :manifest do
-  now = Time.new
-  now = now.strftime("%H:%M:%S %m/%d/%y")
-  puts "generating #{MANIFEST}"
-
-  Dir.chdir Dist_Directory do
-    File.open(MANIFEST, "w") do |f|
-      f.puts "MANIFEST for #{Release} - #{now}\n\n"
-      Find.find('.') do |name|
-        next if File.directory? name
-        f.puts name[2..-1]    # remove leading "./"
-      end
-    end
-  end
-end
-
-
-
-
-task :export do
-  sh "cvs -d#{CVSSERVER}  export -r #{CVS_Tag} -d #{Dist_Directory} RMagick"
-end
-
-
-
-
-task :collateral => [README, :gemspec, :extconf, :doc]
-
-GEM = Dist_Directory.downcase + ".gem"
-
-task :default => [:export, :collateral, :fix_files, :manifest] do
-  sh "tar czf #{Release}.tar.gz #{Dist_Directory}"
-  sh "tar cjf #{Release}.tar.bz2 #{Dist_Directory}"
-  sh "tar c #{Release} | 7z a -t7z -m0=lzma -mx=9 -mfb=64 -ms=on -si#{Release}.tar #{Release}.tar.lzma"
-
-  # Extract with
-  #   7z e RMagick-x.y.z.tar.lzma -so | tar xv
-  #sh "tar cf  #{Release}.tar #{Dist_Directory}"
-  #sh "7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on #{Release}.tar.lzma #{Release}.tar"
-  #rm_rf Release+".tar", :verbose => true
-
-  Dir.chdir(Dist_Directory) do
-    sh "gem build rmagick.gemspec"
-    mv GEM, "../", :verbose => true
-  end
-end
-
-
-
-
-task :clean do
-  rm_rf Dist_Directory, :verbose => true
-  rm_rf Release+".tar.gz", :verbose => true
-  rm_rf Release+".tar.bz2", :verbose => true
-  rm_rf Release+".tar.lzma", :verbose => true
-  rm_rf GEM, :verbose => true
-end
-