phantom 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23e54afd7936bddad11560c655724526ade837c
-  data.tar.gz: 596f32e098dae1b9dc5f2fa386f8887a91257784
+  metadata.gz: 3843d810f05c3f9159e41ff4f91bdc64a88efd7d
+  data.tar.gz: 688af5a139288b798118b40ae342dca6e6aa1f5a
 SHA512:
-  metadata.gz: 005197660c0b984076ece07a3b4176e2f2ca028f2d923ba316025b1a09048b93a6eac1f857c93704eea0d05136ffe8b60aee316271a92390dc8d72771b299a51
-  data.tar.gz: 260787a370717231b31ec7d1c113e63eed032038ad03aa556459eaeab43277afaeba6abd97ccfd5671a23a2da3379e55695567ed85235f7d86ab97a823f89505
+  metadata.gz: 062578b6840e9f76f90cdafe086bdf9c03b3656e233b6a95a10d35021c4209b5f69c072fd32bb09a6414ba9fc6315c50fa48a03c3ea66e616ffcf8d4494ca21d
+  data.tar.gz: c9c3d8563f204aed151bdf3e3d79fc9204da82318b6d889e1b122fabeeca22c5f5fe1a854af9be7d28f31f0136a78094bb54249bd92aefea049a6bcf3bc1041b

data/lib/phantom/class_methods.rb

@@ -17,15 +17,18 @@ module Phantom
         at_exit do
           o.flush
           o.close
-          File.delete pid_file if pid_file
+          if pid_file and File.exists? pid_file
+            File.delete pid_file if Process.pid == File.read(pid_file).to_i
+          end
         end
         
         i.close
         begin
           block.call if block_given?
           Marshal.dump(Status::OK, o)
-        rescue StandardError => e
-          Marshal.dump(e, o)
+        rescue Exception => e
+          status = e.is_a?(SignalException) ? Status::OK : e
+          Marshal.dump(status, o)
         end
       end
 

data/lib/phantom/version.rb

@@ -1,3 +1,3 @@
 module Phantom
-  VERSION = "0.0.4"
+  VERSION = '0.1.0'
 end

data/spec/base_spec.rb

@@ -6,6 +6,7 @@ describe Phantom::Base do
 
   after(:each) do
     File.delete count_file if File.exists? count_file
+    @error = nil
   end
 
   it 'should kill the process when called on abort' do
@@ -19,8 +20,8 @@ describe Phantom::Base do
     phantom.status.should == Phantom::Status::DEAD
   end
 
-  it 'should be kill the process when called on terminate' do
-    phantom = Phantom.run do
+  it 'should kill the process when called on terminate' do
+    phantom = Phantom.run(on_error: lambda{|e| @error = e}) do
       sleep 3
       File.new(count_file, 'w').close
     end
@@ -28,6 +29,7 @@ describe Phantom::Base do
     sleep 5
     File.should_not exist(count_file)
     phantom.status.should == Phantom::Status::DEAD
+    @error.should be_nil
   end
 
   it 'should be able to pause and to resume the process' do

data/spec/phantom_spec.rb

@@ -2,9 +2,13 @@ require 'phantom'
 
 describe Phantom do
   pid_file = 'tmp/phantom.pid'
+  sub_pid_file = 'tmp/sub.pid'
 
   after(:each) do
-    File.delete pid_file if File.exist? pid_file
+    [pid_file, sub_pid_file].each do |file|
+      File.delete file if File.exist? file
+    end
+    @error = nil
   end
 
   it 'should remove the pid file when normally ends.' do
@@ -26,26 +30,23 @@ describe Phantom do
 
   it 'should call on_ok when sub processed normally ends' do
     i = 0
-    err = nil
-    Phantom.run(pid_file: pid_file, on_ok: lambda{i += 1}, on_error: lambda{|e| err = e}) do
+    Phantom.run(pid_file: pid_file, on_ok: lambda{i += 1}, on_error: lambda{|e| @error = e}) do
     end
     sleep 3
     i.should == 1
-    err.should == nil
+    @error.should be_nil
   end
 
   it 'should call on_error when sub process raises an unhandled error' do
-    err = nil
     i = 0
-    Phantom.run(pid_file: pid_file, on_ok: lambda{i += 1}, on_error: lambda{|e| err = e}) do
-      raise 'Wa ha ha!'
+    Phantom.run(pid_file: pid_file, on_ok: lambda{i += 1}, on_error: lambda{|e| @error = e}) do
+      raise SyntaxError
       i += 1
     end
 
     sleep 3
 
-    err.should be_an(StandardError)
-    err.message.should == 'Wa ha ha!'
+    @error.should be_a(SyntaxError)
     i.should == 0
   end
 
@@ -55,11 +56,31 @@ describe Phantom do
 
   it 'should return a Phantom::Base instance when run' do
     phantom = Phantom.run do end
-    phantom.should be_an(Phantom::Base)
+    phantom.should be_a(Phantom::Base)
   end
 
   it 'should do nothing if block is not given' do
     phantom = Phantom.run
     phantom.pid.should be_nil
   end
+
+  it 'should not call on_error if sub process calls exit' do
+    Phantom.run(on_error: lambda{|e| @error = e}) do
+      exit
+    end
+    @error.should be_nil
+  end
+
+  it 'should be able to fork sub-sub processes' do
+    Phantom.run(pid_file: pid_file, on_error: lambda{|e| @error = e}) do
+      Phantom.run(pid_file: sub_pid_file, on_error: lambda{|e| raise e}) do end
+      sleep 5
+    end
+    @error.should be_nil
+    sleep 1
+    File.should exist(pid_file)
+    File.should_not exist(sub_pid_file)
+    sleep 5
+    File.should_not exist(pid_file)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phantom
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Aetherus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler