quick_magick 0.7.2 → 0.7.3

data/Manifest

@@ -1,9 +1,10 @@
 Manifest
-README
+README.rdoc
 Rakefile
 lib/quick_magick.rb
 lib/quick_magick/image.rb
 lib/quick_magick/image_list.rb
+quick_magick.gemspec
 test/9.gif
 test/badfile.xxx
 test/image_list_test.rb

data/Rakefile

@@ -2,8 +2,9 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
  
-Echoe.new('quick_magick', '0.7.2') do |p|
+Echoe.new('quick_magick', '0.7.3') do |p|
   p.description    = "QuickMagick allows you to access ImageMagick command line functions using Ruby interface."
+  p.summary        = "A gem build by BadrIT to access ImageMagick command line functions easily and quickly"
   p.url            = "http://quickmagick.rubyforge.org/"
   p.author         = "Ahmed ElDawy"
   p.email          = "ahmed.eldawy@badrit.com"

data/lib/quick_magick.rb

@@ -150,12 +150,31 @@ module QuickMagick
     
     alias hsl_color hsla_color
     
-    # Escapes possible special chracters in command line by surrounding it with double quotes
+    # Escapes possible special chracters in command line
+    # by surrounding it with double quotes
     def escape_commandline(str)
       str =~ /^(\w|\s|\.)*$/ ? str : "\"#{str}\""
     end
     
     alias c escape_commandline
+
+    # Execute a command line and returns its results when it suceeds
+    # When the command fails, it throws QuickMagick::QuickMagickError
+    def exec3(command)
+      error_file = Tempfile.new('error')
+      error_filepath = error_file.path
+      error_file.close
+      result = `#{command} 2>"#{error_filepath}"`
+      unless $?.success?
+        error_message = <<-ERROR
+          Error executing command: command
+          Result is: #{result}
+          Error is: #{File.read(error_filepath)}
+        ERROR
+        raise QuickMagick::QuickMagickError, error_message
+      end
+      result
+    end
   end
 end
 

data/lib/quick_magick/image.rb

@@ -62,26 +62,14 @@ module QuickMagick
 
       # returns info for an image using <code>identify</code> command
       def identify(filename)
-	    	error_file = Tempfile.new('identify_error')
-        result = `identify #{filename} 2>'#{error_file.path}'`
-        unless $?.success?
-		      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
+        QuickMagick.exec3 "identify #{QuickMagick.c filename}"
       end
 
     end
 
     # append the given option, value pair to the settings of the current image
     def append_to_settings(arg, value=nil)
-      @arguments << %Q<-#{arg} #{QuickMagick::c value} >
+      @arguments << "-#{arg} #{QuickMagick.c value} "
       @last_is_draw = false
       self
     end
@@ -110,7 +98,7 @@ module QuickMagick
       if @last_is_draw && is_draw
         @arguments.insert(@arguments.rindex('"'), " #{value}")
       else
-        @arguments << %Q<-#{arg} #{QuickMagick::c value} >
+        @arguments << %Q<-#{arg} #{QuickMagick.c value} >
       end
       @last_is_draw = is_draw
       self
@@ -222,7 +210,7 @@ module QuickMagick
     
     # The command line so far that will be used to convert or save the image
     def command_line
-      %Q< "(" #{@arguments} #{QuickMagick::c(image_filename + (@pseudo_image ? "" : "[#{@index}]"))} ")" >
+      %Q< "(" #{@arguments} #{QuickMagick.c(image_filename + (@pseudo_image ? "" : "[#{@index}]"))} ")" >
     end
     
     # An information line about the image obtained using 'identify' command line
@@ -377,25 +365,13 @@ module QuickMagick
     
     # saves the current image to the given filename
     def save(output_filename)
-    	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)
-      		initialize(output_filename)
-		    	revert!
-      	end
-        return result 
-      else
-        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
+      result = QuickMagick.exec3 "convert #{command_line} #{QuickMagick.c output_filename}" 
+    	if @pseudo_image
+    		# since it's been saved, convert it to normal image (not pseudo)
+    		initialize(output_filename)
+	    	revert!
+    	end
+      return result 
     end
     
     alias write save
@@ -404,22 +380,10 @@ module QuickMagick
     # saves the current image overwriting the original image file
     def save!
       raise QuickMagick::QuickMagickError, "Cannot mogrify a pseudo image" if @pseudo_image
-     	error_file = Tempfile.new('mogrify_error')
-      result = `mogrify #{command_line} 2>'#{error_file.path}'`
-      if $?.success?
-        # remove all operations to avoid duplicate operations
-        revert!
-        return result 
-      else
-        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
+      result = QuickMagick.exec3 "mogrify #{command_line}"
+      # remove all operations to avoid duplicate operations
+      revert!
+      return result 
     end
 
     alias write! save!
@@ -481,20 +445,9 @@ module QuickMagick
     # WARNING: This is done through command line which is very slow.
     # It is not recommended at all to use this method for image processing for example.
     def get_pixel(x, y)
-    	error_file = Tempfile.new('identify_error')
-      result = `identify -verbose -crop #{QuickMagick::geometry(1,1,x,y)} #{QuickMagick::c(image_filename)}[#{@index}]  2>'#{error_file.path}'`
-      unless $?.success?
-	      error_message = <<-ERROR
-	        Error executing command: identify #{image_filename}
-	        Result is: #{result}
-	        Error is: #{error_file.read}
-	      ERROR
-        raise QuickMagick::QuickMagickError, error_message
-      end
+      result = QuickMagick.exec3("identify -verbose -crop #{QuickMagick::geometry(1,1,x,y)} #{QuickMagick.c image_filename}[#{@index}]")
       result =~ /Histogram:\s*\d+:\s*\(\s*(\d+),\s*(\d+),\s*(\d+)\)/
       return [$1.to_i, $2.to_i, $3.to_i]
-    ensure
-    	error_file.close
     end
     
     # displays the current image as animated image

data/quick_magick.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quick_magick}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ahmed ElDawy"]
-  s.date = %q{2010-01-30}
+  s.date = %q{2010-04-26}
   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.rdoc", "lib/quick_magick.rb", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/quick_magick.rb", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb", "test/9.gif", "test/badfile.xxx", "test/image_list_test.rb", "test/image_test.rb", "test/multipage.tif", "test/test_magick.rb", "test/warnings.tiff", "quick_magick.gemspec"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/quick_magick.rb", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb", "quick_magick.gemspec", "test/9.gif", "test/badfile.xxx", "test/image_list_test.rb", "test/image_test.rb", "test/multipage.tif", "test/test_magick.rb", "test/warnings.tiff"]
   s.homepage = %q{http://quickmagick.rubyforge.org/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Quick_magick", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quickmagick}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{QuickMagick allows you to access ImageMagick command line functions using Ruby interface.}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{A gem build by BadrIT to access ImageMagick command line functions easily and quickly}
   s.test_files = ["test/image_test.rb", "test/image_list_test.rb", "test/test_magick.rb"]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: quick_magick
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 +02:00
+date: 2010-04-26 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +36,7 @@ files:
 - lib/quick_magick.rb
 - lib/quick_magick/image.rb
 - lib/quick_magick/image_list.rb
+- quick_magick.gemspec
 - test/9.gif
 - test/badfile.xxx
 - test/image_list_test.rb
@@ -38,7 +44,6 @@ files:
 - test/multipage.tif
 - test/test_magick.rb
 - test/warnings.tiff
-- quick_magick.gemspec
 has_rdoc: true
 homepage: http://quickmagick.rubyforge.org/
 licenses: []
@@ -57,21 +62,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: quickmagick
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: QuickMagick allows you to access ImageMagick command line functions using Ruby interface.
+summary: A gem build by BadrIT to access ImageMagick command line functions easily and quickly
 test_files: 
 - test/image_test.rb
 - test/image_list_test.rb