elf 0.0.1 → 0.0.2

data/lib/elf.rb

@@ -5,5 +5,5 @@ require "elf/fork"
 require "elf/sync"
 
 module Elf
-  # Your code goes here...
+  
 end

data/lib/elf/child.rb

@@ -2,8 +2,9 @@ module Elf
   class Child
     attr_reader :success
 
-    def initialize(cmd)
+    def initialize(cmd, comment)
       @cmd = cmd
+      @comment = comment
     end
 
     def on_success(&blk)
@@ -14,18 +15,18 @@ module Elf
     end
 
     def fire_success
-      puts "Success: #{@cmd}"
+      puts "Success: #{@cmd} # #{@comment}"
       if @success
         @success.call
       end
     end
 
     def fire_error
-      puts "Failed: #{@cmd}"
+      puts "Failed: #{@cmd} # #{@comment}"
     end
 
     def fire
-      puts "Fired: #{@cmd}"
+      puts "Fired: #{@cmd} # #{@comment}"
       fork_pid = ::Process.fork do
         exec @cmd
       end

data/lib/elf/process.rb

@@ -1,20 +1,33 @@
 module Elf
   class Process
     def initialize(&blk)
-      pid = blk.call(self)
+      @pids = []
+      @pids << blk.call(self)
       ::Process.waitall
+    ensure
+      # killall!
     end
 
-    def fork(cmd)
-      elf = Elf::Fork.new(cmd)
+    def fork(cmd, comment=nil)
+      elf = Elf::Fork.new(cmd, comment)
       yield elf if block_given?
-      pid = elf.fire
+      @pids << elf.fire
     end
 
-    def sync(cmd)
-      elf = Elf::Sync.new(cmd)
+    def sync(cmd, comment=nil)
+      elf = Elf::Sync.new(cmd, comment)
       yield elf if block_given?
-      elf.fire
+      @pids << elf.fire
+    end
+
+    def killall!
+      @pids.each do |pid|
+        begin
+          ::Process.kill(9, pid)
+        rescue ::Errno::ESRCH
+          # ok
+        end
+      end
     end
   end
 end

data/lib/elf/version.rb

@@ -1,3 +1,3 @@
 module Elf
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/elf/process_spec.rb

@@ -95,4 +95,28 @@ describe Elf::Process do
     end
     (Time.now-start).to_i.must_equal(6)
   end
+
+  it "should work with sync jobs in success callback" do
+    start = Time.now
+    Elf::Process.new do |elf|
+      elf.fork("sleep 1", "first async") do |f|
+        f.on_success do
+          elf.sync("sleep 1", "first sync callback")
+          elf.sync("sleep 1", "second sync callback")
+        end
+      end
+      elf.fork("sleep 1", "second async") do |f|
+        f.on_success do
+          elf.fork("sleep 1", "first async callback") do |f1|
+            f1.on_success do
+              elf.fork("sleep 1", "one more async call")
+              elf.sync("sleep 1", "one more sync call")
+            end
+          end
+          elf.fork("sleep 1", "second async callback")
+        end
+      end
+    end
+    (Time.now-start).to_i.must_equal(4)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000Z
+date: 2012-04-19 00:00:00.000000000Z
 dependencies: []
 description: Elves are creatures to manage background processes
 email: