quick_magick 0.6.0 → 0.6.1

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
  
-Echoe.new('quick_magick', '0.6.0') do |p|
+Echoe.new('quick_magick', '0.6.1') do |p|
   p.description    = "QuickMagick allows you to access ImageMagick command line functions using Ruby interface."
   p.url            = "http://quickmagick.rubyforge.org/"
   p.author         = "Ahmed ElDawy"

data/lib/quick_magick/image.rb

@@ -63,11 +63,19 @@ module QuickMagick
 
       # returns info for an image using <code>identify</code> command
       def identify(filename)
-        result = `identify #{filename} 2>&1`
+	    	error_file = Tempfile.new('identify_error')
+        result = `identify #{filename} 2>'#{error_file.path}'`
         unless $?.success?
-          raise QuickMagick::QuickMagickError, "Illegal file \"#{filename}\""
+		      error_message = <<-ERROR
+		        Error executing command: identify #{filename}
+		        Result is: #{result}
+		        Error is: #{error_file.read}
+		      ERROR
+          raise QuickMagick::QuickMagickError, error_message
         end
         result
+      ensure
+      	error_file.close
       end
 
     end
@@ -299,7 +307,8 @@ module QuickMagick
     # The polyline primitive requires three or more points to define their perimeters.
     # A polyline is simply a polygon in which the final point is not stroked to the start point.
     # When unfilled, this is a polygonal line. If the -stroke setting is none (the default), then a polyline is identical to a polygon.
-    #  points - A single array with each pair forming a coordinate in the form (x, y). e.g. [0,0,100,100,100,0] will draw a polyline between points (0,0)-(100,100)-(100,0)
+    #  points - A single array with each pair forming a coordinate in the form (x, y).
+    # e.g. [0,0,100,100,100,0] will draw a polyline between points (0,0)-(100,100)-(100,0)
     def draw_polyline(points, options={})
       append_to_operators("draw", "#{options_to_str(options)} polyline #{points_to_str(points)}")
     end
@@ -307,7 +316,8 @@ module QuickMagick
     # The polygon primitive requires three or more points to define their perimeters.
     # A polyline is simply a polygon in which the final point is not stroked to the start point.
     # When unfilled, this is a polygonal line. If the -stroke setting is none (the default), then a polyline is identical to a polygon.
-    #  points - A single array with each pair forming a coordinate in the form (x, y). e.g. [0,0,100,100,100,0] will draw a polygon between points (0,0)-(100,100)-(100,0)
+    #  points - A single array with each pair forming a coordinate in the form (x, y). 
+    # e.g. [0,0,100,100,100,0] will draw a polygon between points (0,0)-(100,100)-(100,0)
     def draw_polygon(points, options={})
       append_to_operators("draw", "#{options_to_str(options)} polygon #{points_to_str(points)}")
     end
@@ -353,7 +363,8 @@ module QuickMagick
     
     # saves the current image to the given filename
     def save(output_filename)
-      result = `convert #{command_line} "#{output_filename}" 2>&1`
+    	error_file = Tempfile.new('convert_error')
+      result = `convert #{command_line} '#{output_filename}' 2>'#{error_file.path}'`
       if $?.success?
       	if @pseudo_image
       		# since it's been saved, convert it to normal image (not pseudo)
@@ -365,9 +376,12 @@ module QuickMagick
         error_message = <<-ERROR
           Error executing command: convert #{command_line} "#{output_filename}"
           Result is: #{result}
+          Error is: #{error_file.read}
         ERROR
         raise QuickMagick::QuickMagickError, error_message
       end
+    ensure
+    	error_file.close
     end
     
     alias write save
@@ -376,7 +390,8 @@ module QuickMagick
     # saves the current image overwriting the original image file
     def save!
       raise QuickMagick::QuickMagickError, "Cannot mogrify a pseudo image" if @pseudo_image
-      result = `mogrify #{command_line}`
+     	error_file = Tempfile.new('mogrify_error')
+      result = `mogrify #{command_line} 2>'#{error_file.path}'`
       if $?.success?
         # remove all operations to avoid duplicate operations
         revert!
@@ -385,9 +400,12 @@ module QuickMagick
         error_message = <<-ERRORMSG
           Error executing command: mogrify #{command_line}
           Result is: #{result}
+          Error is: #{error_file.read}
         ERRORMSG
         raise QuickMagick::QuickMagickError, error_message
       end
+    ensure
+    	error_file.close if error_file
     end
 
     alias write! save!

data/quick_magick.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quick_magick}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ahmed ElDawy"]
-  s.date = %q{2009-09-16}
+  s.date = %q{2009-09-24}
   s.description = %q{QuickMagick allows you to access ImageMagick command line functions using Ruby interface.}
   s.email = %q{ahmed.eldawy@badrit.com}
   s.extra_rdoc_files = ["README", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb", "lib/quick_magick.rb"]
   s.files = ["README", "Rakefile", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb", "lib/quick_magick.rb", "Manifest", "quick_magick.gemspec", "test/image_test.rb", "test/badfile.xxx", "test/multipage.tif", "test/image_list_test.rb", "test/test_magick.rb", "test/9.gif"]
   s.homepage = %q{http://quickmagick.rubyforge.org/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Quick_magick", "--main", "README~"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Quick_magick", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quickmagick}
   s.rubygems_version = %q{1.3.5}

data/test/image_test.rb

@@ -22,6 +22,12 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 1, i.size
   end
   
+  def test_skip_warnings
+  	filename = File.join($base_dir, "warnings.tiff")
+  	i = QuickMagick::Image.read(filename)
+  	assert_equal 1, i.size
+  end
+  
   def test_create_from_blob
     blob = nil
     File.open(@logo_filename, "rb") do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quick_magick
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +02:00
+date: 2009-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -49,7 +49,7 @@ rdoc_options:
 - --title
 - Quick_magick
 - --main
-- README~
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement