rbbt-util 5.12.2 → 5.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 957c675de87a163f988c6175828d6de03d346987
-  data.tar.gz: 937b879524577ae29d2b41a436ceb0a69e5ba285
+  metadata.gz: b7e5eb68b9212f47cb33b251ea8d4d0f9c878df1
+  data.tar.gz: 39ecf6d22cde5921db4011ca849d3b5c03ba2f13
 SHA512:
-  metadata.gz: 6d5959cd1b7e3a412f16f3a28379d8f1cda0e6677b6eefda51072b6b85095567cea8dee27fd9aaa661ff152e5c748a5c90d7f2c6c716c8b177cc57c2b9235c1e
-  data.tar.gz: 6ae212b12a951921efe4405568cf57d1bcb84f9a4393f7eec532e8131ae2e1526b8697540019a7bf98909cb0344c0bc82c7092f868bcea98d7840961a28b5087
+  metadata.gz: ca4f1549b877b62b6ae97d29b214c6bff957d626819ff14147f0eadaf63b9d394d3bb3e2db31c08f77329ed823d61afba9f44704dc975767a23f5f7fad7be793
+  data.tar.gz: 9e477fc7917df197279869c4bb4a754bf6e60be2d1695ca9f281f5406a1c51d29f311cebd8153430c8349abec29c529cac9e4481283387ef2929630cd5d9c914

data/lib/rbbt/entity.rb

@@ -139,7 +139,7 @@ module Entity
           persist_options = options
           persist_options = persist_options.merge(:other => {:args => args}) if args.any?
 
-          Persist.persist(persist_name, type, persist_options) do
+          Persist.persist(persist_name, type, persist_options.merge(:persist => true)) do
             self.send(orig_name, *args)
           end
         end

data/lib/rbbt/persist.rb

@@ -398,7 +398,7 @@ module Persist
         begin
 
           lock_filename = Persist.persistence_path(path + '.persist', {:dir => Persist.lock_dir})
-          Misc.lock lock_filename  do |lockfile|
+          Misc.lock lock_filename do |lockfile|
 
             if is_persisted?(path, persist_options)
               Log.low "Persist up-to-date (suddenly): #{ path } - #{Misc.fingerprint persist_options}"

data/lib/rbbt/tsv/attach.rb

@@ -88,75 +88,84 @@ module TSV
       file2 = CMD.cmd("sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file2.to_s(:sort, true), :pipe => true)
     end
 
-    output = File.open(output, 'w') if String === output
+    begin
+      output = File.open(output, 'w') if String === output
 
-    cols1 = nil
-    cols2 = nil
+      cols1 = nil
+      cols2 = nil
 
-    done1 = false
-    done2 = false
+      done1 = false
+      done2 = false
 
-    key1 = key2 = nil
-    while key1.nil?
-      while (line1 = file1.gets) =~ /^#/
-        key_field1, *fields1 = line1.strip.sub('#','').split(sep)
+      key1 = key2 = nil
+      while key1.nil?
+        while (line1 = file1.gets) =~ /^#/
+          key_field1, *fields1 = line1.strip.sub('#','').split(sep)
+        end
+        key1, *parts1 = line1.sub("\n",'').split(sep, -1)
+        cols1 = parts1.length
       end
-      key1, *parts1 = line1.sub("\n",'').split(sep, -1)
-      cols1 = parts1.length
-    end
 
-    while key2.nil?
-      while (line2 = file2.gets) =~ /^#/
-        key_field2, *fields2 = line2.strip.sub('#','').split(sep)
+      while key2.nil?
+        while (line2 = file2.gets) =~ /^#/
+          key_field2, *fields2 = line2.strip.sub('#','').split(sep)
+        end
+        key2, *parts2 = line2.sub("\n",'').split(sep, -1)
+        cols2 = parts2.length
       end
-      key2, *parts2 = line2.sub("\n",'').split(sep, -1)
-      cols2 = parts2.length
-    end
 
-    progress_monitor = Progress::Bar.new(size, 0, 100, "Merging fields") if monitor
+      progress_monitor = Progress::Bar.new(size, 0, 100, "Merging fields") if monitor
 
-    entry_hash = options
-    entry_hash.delete :sep if entry_hash[:sep] == "\t"
-    output.puts TSV.header_lines key_field1, fields1 + fields2, entry_hash if key_field1 and fields1 and fields2
+      entry_hash = options
+      entry_hash.delete :sep if entry_hash[:sep] == "\t"
+      output.puts TSV.header_lines key_field1, fields1 + fields2, entry_hash if key_field1 and fields1 and fields2
 
-    key = key1 < key2 ? key1 : key2
-    parts = [""] * (cols1 + cols2)
-    while not (done1 and done2)
-      while (not done1 and key1 == key)
-        parts1.each_with_index do |part, i|
-          parts[i] = (parts[i].nil? or parts[i].empty?) ? part : parts[i] << "|" << part
-        end
-        key1 = nil
-        while key1.nil? and not done1
-          if file1.eof?; done1 = true; else key1, *parts1 = file1.gets.sub("\n",'').split(sep, -1) end
-        end
-        progress_monitor.tick if monitor
-      end
-      while (not done2 and key2 == key)
-        parts2.each_with_index do |part, i|
-          i += cols1
-          parts[i] = (parts[i].nil? or parts[i].empty?) ? part : parts[i] << "|" << part
+      key = key1 < key2 ? key1 : key2
+      parts = [""] * (cols1 + cols2)
+      while not (done1 and done2)
+        while (not done1 and key1 == key)
+          parts1.each_with_index do |part, i|
+            parts[i] = (parts[i].nil? or parts[i].empty?) ? part : parts[i] << "|" << part
+          end
+          key1 = nil
+          while key1.nil? and not done1
+            if file1.eof?; done1 = true; else key1, *parts1 = file1.gets.sub("\n",'').split(sep, -1) end
+          end
+          progress_monitor.tick if monitor
         end
-        key2 = nil
-        while key2.nil? and not done2
-          if file2.eof?; done2 = true; else key2, *parts2 = file2.gets.sub("\n",'').split(sep, -1) end
+        while (not done2 and key2 == key)
+          parts2.each_with_index do |part, i|
+            i += cols1
+            parts[i] = (parts[i].nil? or parts[i].empty?) ? part : parts[i] << "|" << part
+          end
+          key2 = nil
+          while key2.nil? and not done2
+            if file2.eof?; done2 = true; else key2, *parts2 = file2.gets.sub("\n",'').split(sep, -1) end
+          end
         end
-      end
 
-      output.puts [key, parts].flatten * sep
-      parts = [""] * (cols1 + cols2)
+        output.puts [key, parts].flatten * sep
+        parts = [""] * (cols1 + cols2)
 
-      case
-      when done1
-        key = key2
-      when done2
-        key = key1
-      else
-        key = key1 < key2 ? key1 : key2
+        case
+        when done1
+          key = key2
+        when done2
+          key = key1
+        else
+          key = key1 < key2 ? key1 : key2
+        end
       end
-    end
 
-    output.close
+      output.close
+      file1.join if file1.respond_to? :join
+      file2.join if file2.respond_to? :join
+    rescue
+      file1.abort if file1.respond_to? :abort
+      file2.abort if file2.respond_to? :abort
+      file1.join if file1.respond_to? :join
+      file2.join if file2.respond_to? :join
+    end
   end
 
   # Merge columns from different files

data/lib/rbbt/tsv/dumper.rb

@@ -60,6 +60,7 @@ module TSV
       rescue IOError
       rescue Exception
         Log.exception $!
+        raise $!
       end
     end
 

data/lib/rbbt/tsv/parallel/traverse.rb

@@ -283,7 +283,7 @@ module TSV
   end
 
   def self.traverse_run(obj, threads, cpus, options = {}, &block)
-    if threads.nil? and cpus.nil? 
+    if ENV["RBBT_NO_MAP_REDUCE"] == "true" or (threads.nil? and cpus.nil?)
       traverse_obj obj, options, &block
     else
       if threads

data/lib/rbbt/tsv/util.rb

@@ -40,7 +40,7 @@ module TSV
     persist_options = Misc.pull_keys options, :persist
 
     filename = TSV === file ? file.filename : file
-    text = Persist.persist filename, :string, persist_options do
+    path = Persist.persist filename, :string, persist_options.merge(:no_load => true) do
       tsv = TSV === file ? file : TSV.open(file)
 
       text = ""
@@ -55,13 +55,11 @@ module TSV
       text
     end
 
-    path = Persist.persistence_path(filename, persist_options)
     TmpFile.with_file(values.uniq * "\n") do |value_file|
       cmd = "cat '#{ path }' | sed 's/\\t/\\tHEADERNOMATCH/' | grep -w -F -f '#{ value_file }' |cut -f 2 | sed 's/HEADERNOMATCH//' | sort|uniq -c|sed 's/^ *//;s/ /\t/'"
       begin
         TSV.open(CMD.cmd(cmd), :key_field => 1, :type => :single, :cast => :to_i)
       rescue
-        Log.exception $!
         TSV.setup({}, :type => :single, :cast => :to_i)
       end
     end

data/lib/rbbt/util/cmd.rb

@@ -3,8 +3,6 @@ require 'stringio'
 
 module CMD
 
-  class CMDError < StandardError; end
-
   module SmartIO 
     attr_accessor :pid, :cmd, :post, :in, :out, :err, :log
     def self.tie(io, pid = nil, cmd = "",  post = nil, sin = nil, out = nil, err = nil, log = true)
@@ -33,7 +31,7 @@ module CMD
 
         if $? and not $?.success?
           Log.debug{"Raising exception" if log}
-          exception = CMDError.new "Command [#{@pid}] '#{@cmd}' failed with error status #{$?.exitstatus}"
+          exception = ProcessFailed.new "Command [#{@pid}] '#{@cmd}' failed with error status #{$?.exitstatus}"
           begin
             original_close
           ensure
@@ -160,9 +158,9 @@ module CMD
 
         exit(-1)
       rescue Exception
-        Log.debug{ "CMDError: #{$!.message}" } if log
+        Log.debug{ "ProcessFailed: #{$!.message}" } if log
         Log.debug{ "Backtrace: \n" + $!.backtrace * "\n" } if log
-        raise CMDError, $!.message
+        raise ProcessFailed, $!.message
       end
     }
 
@@ -207,7 +205,8 @@ module CMD
         Thread.exit
       end
 
-      SmartIO.tie sout, pid, cmd, post, in_content, sin, serr
+      #SmartIO.tie sout, pid, cmd, post, in_content, sin, serr
+      ConcurrentStream.setup sout, :pids => [pid], :autojoin => true
 
       sout
     else
@@ -222,12 +221,12 @@ module CMD
 
       out = StringIO.new sout.read
       sout.close unless sout.closed?
-      SmartIO.tie out, pid, cmd, post, in_content, sin, serr
+      #SmartIO.tie out, pid, cmd, post, in_content, sin, serr
 
       Process.waitpid pid
 
       if not $?.success?
-        exception      = CMDError.new "Command [#{pid}] #{cmd} failed with error status #{$?.exitstatus}.\n#{err}"
+        exception      = ProcessFailed.new "Command [#{pid}] #{cmd} failed with error status #{$?.exitstatus}.\n#{err}"
         raise exception
       else
         Log.log err, stderr if Integer === stderr and log

data/lib/rbbt/util/concurrency/processes/worker.rb

@@ -18,6 +18,7 @@ class RbbtProcessQueue
           end
 
           Signal.trap(:INT){ raise Aborted; }
+
           loop do
             p = @queue.pop
             next if p.nil?
@@ -32,6 +33,7 @@ class RbbtProcessQueue
           Log.error "Worker #{Process.pid} aborted"
           Kernel.exit! -1
         rescue Exception
+          Log.exception $!
           @callback_queue.push($!) if @callback_queue
           Kernel.exit! -1
         ensure

data/lib/rbbt/util/concurrency/processes.rb

@@ -56,6 +56,7 @@ class RbbtProcessQueue
         end
       rescue Aborted
         @processes.each{|p| p.abort }
+        @processes.each{|p| p.join }
         Log.error "Process monitor aborted"
       rescue Exception
         Log.error "Process monitor exception: #{$!.message}"
@@ -78,7 +79,8 @@ class RbbtProcessQueue
   def join
     @processes.length.times do 
       @queue.push ClosedStream.new
-    end
+    end if @process_monitor.alive?
+
     begin
       @process_monitor.join
       close_callback if @callback
@@ -104,8 +106,8 @@ class RbbtProcessQueue
   end
 
   def abort
-    @process_monitor.raise Aborted.new if @process_monitor and @process_monitor.alive?
-    @callback_thread.raise Aborted.new if @callback_thread and @callback_thread.alive?
+    @process_monitor.raise(Aborted.new); @process_monitor.join if @process_monitor and @process_monitor.alive?
+    @callback_thread.raise(Aborted.new); @callback_thread.join if @callback_thread and @callback_thread.alive?
   end
 
   def process(*e)

data/lib/rbbt/util/misc/concurrent_stream.rb

@@ -1,14 +1,15 @@
 module ConcurrentStream
-  attr_accessor :threads, :pids, :callback, :abort_callback, :filename, :joined
+  attr_accessor :threads, :pids, :callback, :abort_callback, :filename, :joined, :autojoin
 
   def self.setup(stream, options = {}, &block)
-    threads, pids, callback, filename = Misc.process_options options, :threads, :pids, :callback, :filename
+    threads, pids, callback, filename, autojoin = Misc.process_options options, :threads, :pids, :callback, :filename, :autojoin
     stream.extend ConcurrentStream unless ConcurrentStream === stream
 
     stream.threads ||= []
     stream.pids ||= []
     stream.threads.concat(Array === threads ? threads : [threads]) unless threads.nil? 
     stream.pids.concat(Array === pids ? pids : [pids]) unless pids.nil? or pids.empty?
+    stream.autojoin = autojoin
 
     callback = block if block_given?
     if stream.callback and callback
@@ -33,6 +34,7 @@ module ConcurrentStream
     stream.callback = callback
     stream.abort_callback = abort_callback
     stream.filename = filename
+    stream.autojoin = autojoin
     stream.joined = joined
   end
 
@@ -61,7 +63,7 @@ module ConcurrentStream
       @pids.each do |pid| 
         begin
           Process.waitpid(pid, Process::WUNTRACED)
-          raise "Error joining process #{pid} in #{self.inspect}" unless $?.success?
+          raise ProcessFailed.new "Error joining process #{pid} in #{self.inspect}" unless $?.success?
         rescue Errno::ECHILD
         end
       end 
@@ -102,4 +104,19 @@ module ConcurrentStream
     @callback = nil
   end
 
+  def read(*args)
+    if autojoin
+      begin
+        super(*args)
+      rescue
+        self.abort
+        self.join 
+      ensure
+        self.join if self.closed? or self.eof? 
+      end
+    else
+      super(*args)
+    end
+  end
+
 end

data/lib/rbbt/util/misc/exceptions.rb

@@ -3,6 +3,7 @@ class FieldNotFoundError < Exception;end
 class Aborted < Exception; end
 class TryAgain < Exception; end
 class ClosedStream < Exception; end
+class ProcessFailed < Exception; end
 class KeepLocked < Exception
   attr_accessor :payload
   def initialize(payload)

data/lib/rbbt/util/open.rb

@@ -341,9 +341,14 @@ module Open
     io = gunzip(io) if ((String === url and gzip?(url)) and not options[:noz]) or options[:gzip]
 
     if block_given?
-      res = yield(io)
-      io.close unless io.closed?
-      return res
+      begin
+        return yield(io)
+      rescue
+        io.abort if io.respond_to? :abort
+        io.join if io.respond_to? :join
+      ensure
+        io.join if io.respond_to? :join
+      end
     else
       io
     end

data/lib/rbbt/workflow/step/run.rb

@@ -100,7 +100,6 @@ class Step
         dependency.relay_log self
         dependency.clean if not dependency.done? and (dependency.error? or dependency.aborted?)
         dependency.clean if dependency.streaming? and not dependency.running?
-        #dependency.run_dependencies(seen)
         dependency.run(ENV["RBBT_NO_STREAM"] != 'true') unless dependency.result or dependency.done?
         seen << dependency.path
         seen.concat dependency.rec_dependencies.collect{|d| d.path} 
@@ -159,12 +158,13 @@ class Step
             raise $!
           end
 
-          result = prepare_result result, @task.description, info if IO === result and ENV["RBBT_NO_STREAM"]
-          result = prepare_result result.stream, @task.description, info if TSV::Dumper === result and ENV["RBBT_NO_STREAM"]
+          if not no_load or ENV["RBBT_NO_STREAM"] == "true" 
+            result = prepare_result result, @task.description, info if IO === result 
+            result = prepare_result result.stream, @task.description, info if TSV::Dumper === result 
+          end
 
           case result
           when IO
-            result = Misc.read_stream(result) if ENV["RBBT_NO_STREAM"]
 
             log :streaming, "#{Log.color :magenta, "Streaming task result IO"} #{Log.color :yellow, task.name.to_s || ""} [#{Process.pid}]"
             ConcurrentStream.setup result do

data/lib/rbbt/workflow/task.rb

@@ -44,11 +44,7 @@ module Task
   def exec(*args)
     case
     when (args.length == 1 and not inputs.nil? and inputs.length > 1 and Hash === args.first)
-      begin
-        self.call *take_input_values(IndiferentHash.setup(args.first))
-      ensure
-        purge_stream_cache
-      end
+      self.call *take_input_values(IndiferentHash.setup(args.first))
     else
       self.call *args
     end

data/test/rbbt/test_entity.rb

@@ -27,7 +27,7 @@ module ReversableString
     self.reverse
   end
 
-  property :reverse_text_ary_p => :array do
+  property :reverse_text_ary_p => :array2single do
     $count += 1
     self.collect{|s| s.reverse}
   end
@@ -103,7 +103,7 @@ class TestEntity < Test::Unit::TestCase
     $count = 0
 
     assert_equal "2gnirtS", a.reverse_text_ary_p.last
-    assert_equal "2gnirtS", a[1].reverse_text_ary_p
+    assert_equal "2gnirtS", a.collect{|e| e.reverse_text_ary_p }[1]
     assert_equal 1, $count
   end
 

data/test/rbbt/tsv/parallel/test_traverse.rb

@@ -317,9 +317,13 @@ class TestTSVParallelThrough < Test::Unit::TestCase
         raise "STOP" if rand(100) < 1
         [k,v]
       end
-      dumper.stream.read
+      stream = dumper.stream
+      stream.read
+      stream.join
       rescue Exception
         Log.exception $!
+        stream.abort if stream.respond_to? :abort
+        stream.join if stream.respond_to? :join
         raise $!
       end
     end

data/test/rbbt/tsv/test_util.rb

@@ -21,7 +21,7 @@ row2    A    B    Id3
     end
   end
 
-  def _test_marshal
+  def test_marshal
    content =<<-EOF
 #Id    ValueA    ValueB    OtherID
 row1    a|aa|aaa    b    Id1|Id2

data/test/rbbt/util/misc/test_pipes.rb

@@ -5,7 +5,7 @@ require 'rbbt/util/misc'
 
 class TestMiscPipes < Test::Unit::TestCase
 
-  def test_collapse_stream
+  def _test_collapse_stream
     text=<<-EOF
 row1 A B C
 row1 a b c
@@ -19,7 +19,7 @@ row2 aa bb cc
     assert_equal ["BB", "bb"], tsv["row2"][1]
   end
 
-  def test_paste_stream
+  def _test_paste_stream
     text1=<<-EOF
 row1 A B C
 row2 AA BB CC
@@ -46,7 +46,7 @@ row3 ccc
     assert_equal ["AAA", "BBB", "CCC", "", "", "ccc"], tsv["row3"]
   end
 
-  def test_sort_stream
+  def _test_sort_stream
     text =<<-EOF
 #: :sep=" "
 #Row LabelA LabelB LabelC
@@ -60,7 +60,7 @@ row1 A B C
     assert_equal %w(#: #Row row1 row2 row3), sorted.read.split("\n").collect{|l| l.split(" ").first}
   end
 
-  def test_dup_stream
+  def _test_dup_stream
     text =<<-EOF
 #: :sep=" "
 #Row LabelA LabelB LabelC

data/test/rbbt/util/test_R.rb

@@ -2,11 +2,11 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'test_helpe
 require 'rbbt/util/R'
 
 class TestR < Test::Unit::TestCase
-  def _test_sum
+  def test_sum
     assert_equal "6", R.run('cat(3+3)').read.split(/\n/).last
   end
 
-  def _test_tsv_R
+  def test_tsv_R
     tsv = TSV.setup({:a => 1, :b => 2})
     tsv2 = tsv.R <<-EOF
 data = data + 1

data/test/rbbt/util/test_cmd.rb

@@ -29,17 +29,17 @@ class TestCmd < Test::Unit::TestCase
   end
 
   def test_error
-    assert_raise CMD::CMDError do CMD.cmd('fake-command') end
-    assert_raise CMD::CMDError do CMD.cmd('ls -fake_option') end
+    assert_raise ProcessFailed do CMD.cmd('fake-command') end
+    assert_raise ProcessFailed do CMD.cmd('ls -fake_option') end
 
-    assert_raise CMD::CMDError do CMD.cmd('fake-command', :stderr => true) end
-    assert_raise CMD::CMDError do CMD.cmd('ls -fake_option', :stderr => true) end
+    assert_raise ProcessFailed do CMD.cmd('fake-command', :stderr => true) end
+    assert_raise ProcessFailed do CMD.cmd('ls -fake_option', :stderr => true) end
  
-    assert_nothing_raised CMD::CMDError do CMD.cmd('fake-command', :stderr => false, :pipe => true) end
-    assert_nothing_raised CMD::CMDError do CMD.cmd('ls -fake_option', :stderr => false, :pipe => true) end
+    assert_nothing_raised ProcessFailed do CMD.cmd('fake-command', :stderr => false, :pipe => true) end
+    assert_nothing_raised ProcessFailed do CMD.cmd('ls -fake_option', :stderr => false, :pipe => true) end
  
-    assert_raise CMD::CMDError do CMD.cmd('fake-command', :stderr => true, :pipe => true).read end
-    assert_raise CMD::CMDError do CMD.cmd('ls -fake_option', :stderr => true, :pipe => true).read end
+    assert_raise ProcessFailed do CMD.cmd('fake-command', :stderr => true, :pipe => true).join end
+    assert_raise ProcessFailed do CMD.cmd('ls -fake_option', :stderr => true, :pipe => true).join end
   end
 
   def test_pipes
@@ -58,10 +58,7 @@ line33
       gz = CMD.cmd("gunzip", :in => File.open(file + '.gz'), :pipe => true)
       io = CMD.cmd('tail -n 10', :in => gz, :pipe => true)
       assert_equal 10, io.read.split(/\n/).length
-
-
     end
-
   end
 
 end

data/test/rbbt/util/test_misc.rb

@@ -115,15 +115,6 @@ eum fugiat quo voluptas nulla pariatur?"
     assert_equal 4, Misc.process_to_hash(list){|l| l.collect{|e| e * 2}}[2]
   end
 
-  def test_pipe
-    sout, sin = Misc.pipe
-    assert_equal 1, Misc::OPEN_PIPE_IN.reject{|p| p.closed? }.length
-    sin.close
-    assert sout.eof?
-    Misc.purge_pipes
-    assert_equal 0, Misc::OPEN_PIPE_IN.reject{|p| p.closed? }.length
-  end
-
   def test_pipe_fork
     sout, sin = Misc.pipe
     pid = Process.fork do

data/test/rbbt/util/test_open.rb

@@ -66,7 +66,6 @@ class TestOpen < Test::Unit::TestCase
       Open.read(file, :grep => ["1","3"]) do |line| sum += line.to_i end
       assert_equal(1 + 3, sum)
     end
-
   end
 
   def test_read_grep_invert

data/test/rbbt/util/test_tmpfile.rb

@@ -17,7 +17,6 @@ class TestTmpFile < Test::Unit::TestCase
 
   def test_extension
     TmpFile.with_file(nil, true, :extension => 'txt') do |file|
-      ddd file
       assert file =~ /\.txt$/
     end
 

data/test/rbbt/workflow/test_step.rb

@@ -62,7 +62,7 @@ class TestStep < Test::Unit::TestCase
       step2 = Step.new tmpfile + 'step2', task2, [], [step1]
 
       step2.run
-      assert step2.messages.include? "task1>Starting Task1"
+      assert step2.messages.include? "Starting Task1"
     end
   end
 
@@ -83,7 +83,8 @@ class TestStep < Test::Unit::TestCase
 
       Step.log_relay_step = step2
       step2.run
-      assert step2.messages.include? "task1>Starting Task1"
+
+      assert step2.messages.include? "Starting Task1"
     end
   end
 
@@ -99,7 +100,7 @@ class TestStep < Test::Unit::TestCase
   end
 
 
-  def test_fork
+  def __test_fork
     TmpFile.with_file do |lock|
       task  = Task.setup do while not File.exists?(lock) do sleep 1; end; "TEST" end
       TmpFile.with_file do |tmp|
@@ -115,19 +116,20 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def test_abort
+  def __test_abort
     TmpFile.with_file do |lock|
       task  = Task.setup do while not File.exists?(lock) do sleep 1; end; "TEST" end
       TmpFile.with_file do |tmp|
         step = Step.new tmp, task
         job = step.fork
         assert !job.done?
-        assert_raise RuntimeError do step.clean.fork end
-        sleep 1
-        while not job.abort do sleep 1 end
+        step.clean.fork 
+        job.abort 
+        assert_equal :aborted, job.status
         Open.write(lock, "open")
+        job.clean.fork 
         job.join
-        assert job.aborted?
+        assert job.done?
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.12.2
+  version: 5.12.3
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake