Skip to content
Browse files

merging

  • Loading branch information...
2 parents 30d3a81 + 24be725 commit 3bf8d735415c565d37fb1752b895121d1dcd9216 @hcatlin hcatlin committed Jul 29, 2010
Showing with 9 additions and 4 deletions.
  1. +3 −0 lib/mini_magick.rb
  2. +4 −4 mini_magick.gemspec
  3. +1 −0 test/command_builder_test.rb
  4. +1 −0 test/image_test.rb
View
3 lib/mini_magick.rb
@@ -188,6 +188,9 @@ def run_command(command, *args)
if output =~ /no decode delegate/i || output =~ /did not return an image/i
raise Invalid, output
else
+
+ # TODO: should we do something different if the command times out ...?
+ # its definitely better for logging.. otherwise we dont really know
raise Error, "Command (#{command.inspect}) failed: #{{:status_code => exit_status, :output => output}.inspect}"
end
else
View
8 mini_magick.gemspec
@@ -7,13 +7,13 @@ Gem::Specification.new do |s|
s.summary = "Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick"
s.description = ""
- s.authors = ["Corey Johnson", "Hampton Catlin", "Peter Kieltyka"]
- s.email = ["probablycorey@gmail.com", "hcatlin@gmail.com", "peter@nulayer.com"]
- s.homepage = "http://github.com/hcatlin/mini_magick"
+ s.authors = ["Corey Johnson", "Peter Kieltyka", "Hampton Catlin"]
+ s.email = ["probablycorey@gmail.com", "peter@nulayer.com", "hcatlin@gmail.com"]
+ s.homepage = "http://github.com/probablycorey/mini_magick"
s.files = Dir['README.rdoc', 'VERSION', 'MIT-LICENSE', 'Rakefile', 'lib/**/*']
s.test_files = Dir['test/**/*']
s.require_path = 'lib'
- s.add_runtime_dependency('subexec', ['~> 0.0.2'])
+ s.add_runtime_dependency('subexec', ['~> 0.0.4'])
end
View
1 test/command_builder_test.rb
@@ -1,3 +1,4 @@
+require 'rubygems'
require 'test/unit'
require File.expand_path('../../lib/mini_magick', __FILE__)
View
1 test/image_test.rb
@@ -1,3 +1,4 @@
+require 'rubygems'
require 'test/unit'
require File.expand_path('../../lib/mini_magick', __FILE__)

0 comments on commit 3bf8d73

Please sign in to comment.
Something went wrong with that request. Please try again.