osxscreenshot 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.4 / 2010-02-19
+
+* Kill pid properly on timeout
+* Throw OSX::Screenshot::CommandFailed if any command returns nonzero.
+
 === 0.0.2 / 2010-02-16
 
 * Added simple usage example.

data/lib/osxscreenshot.rb

@@ -2,8 +2,10 @@ require 'open4'
 
 module OSX
   class Screenshot
-    VERSION = '0.0.3'
-
+    VERSION = '0.0.4'
+    
+    class CommandFailed < StandardError; end
+    
     ##
     # Takes a screenshot of a website, optionally resizes it, and writes
     # it to a temporary directory. Returns the file path to the
@@ -109,9 +111,9 @@ module OSX
       end
       
       # Error
-      system "kill -9 #{pid}"
-      raise "Command failed: #{cmd}"
+      raise CommandFailed, "Command failed: #{cmd}"
     rescue Timeout::Error => e
+      Process.kill "KILL", pid
       return nil
     end
 

data/test/test_osxscreenshot.rb

@@ -30,6 +30,15 @@ class TestOsxscreenshot < Test::Unit::TestCase
     assert_nil @tmpfile
   end
 
+  def test_handles_error_when_exiting
+    @tmpfile = nil
+    assert_raise OSX::Screenshot::CommandFailed do
+      OSX::Screenshot.capture("http://example.com", {
+                                :webkit2png => "exit 1;"
+                              })
+    end
+  end
+
   def teardown
     if @tmpfile
       FileUtils.rm @tmpfile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: osxscreenshot
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -08:00
+date: 2010-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency