scout-gear 6.0.0 → 7.1.0

data/test/scout/test_tsv.rb

@@ -0,0 +1,34 @@
+require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
+require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
+
+class TestTSV < Test::Unit::TestCase
+  def test_open_with_data
+    content =<<-'EOF'
+#: :sep=/\s+/#:type=:double#:merge=:concat
+#Id    ValueA    ValueB    OtherID
+row1    a|aa|aaa    b    Id1|Id2
+row2    A    B    Id3
+row2    a    a    id3
+    EOF
+
+    content2 =<<-'EOF'
+#: :sep=/\s+/#:type=:double#:merge=:concat
+#Id    ValueA    ValueB    OtherID
+row3    a|aa|aaa    b    Id1|Id2
+row4    A    B    Id3
+row4    a    a    id3
+    EOF
+
+    tsv = TmpFile.with_file(content) do |filename|
+      TSV.open(filename)
+    end
+
+    TmpFile.with_file(content2) do |filename|
+      TSV.open(filename, :data => tsv)
+    end
+
+    assert_include tsv.keys, 'row4'
+    assert_include tsv.keys, 'row1'
+  end
+end
+

data/test/scout/test_work_queue.rb

@@ -89,5 +89,33 @@ class TestWorkQueue < Test::Unit::TestCase
 
     assert_equal 0, res.length
   end
+
+  def test_queue_error
+    num = 10
+    reps = 10_000
+
+    q = WorkQueue.new num do |obj|
+      raise ScoutException if rand < 1
+      [Process.pid.to_s, obj.to_s] * " "
+    end
+
+    res = []
+    q.process do |out|
+      res << out
+    end
+
+    pid = Process.fork do
+      reps.times do |i|
+        q.write i
+      end
+    end
+
+    Process.wait pid
+
+    assert_raise ScoutException do
+      q.close
+      q.join
+    end
+  end
 end
 

data/test/scout/tsv/test_parser.rb

@@ -0,0 +1,87 @@
+require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
+require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
+
+require 'scout/tsv'
+class TestTSVParser < Test::Unit::TestCase
+
+  def test_parse_line
+    line = (0..10).to_a * "\t"
+    key, values = TSV.parse_line(line)
+
+    assert_equal "0", key
+    assert_equal (1..10).collect{|v| v.to_s }, values
+  end
+
+  def test_parse_double
+    line = (0..10).collect{|v| v == 0 ? v : [v,v] * "|" } * "\t"
+    key, values = TSV.parse_line(line, type: :double, cast: :to_i)
+
+    assert_equal "0", key
+    assert_equal (1..10).collect{|v| [v,v] }, values
+  end
+
+  def __test_benchmark
+    num = 10_000
+    txt = num.times.inject(nil) do |acc,i|
+      (acc.nil? ? "" : acc << "\n") << (0..10).collect{|v| v == 0 ? i : [v,v] * "|" } * "\t"
+    end 
+
+    txt = StringIO.new(([txt] * (10))*"\n")
+    Misc.benchmark 1 do
+    #Misc.profile do
+      data = TSV.parse_stream(txt, fix: true, type: :double, bar: true, merge: :concat)
+      assert_equal num, data.size
+      assert_equal 20, data['1'][0].length
+    end
+  end
+
+  def test_parse_stream
+    lines =<<-EOF
+1 2 3 4 5
+11 12 13 14 15
+    EOF
+
+    lines = StringIO.new lines
+
+    data = TSV.parse_stream lines, sep: " "
+    assert_equal data["1"], %w(2 3 4 5)
+  end
+
+  def test_parse_stream_block
+    lines =<<-EOF
+1 2 3 4 5
+11 12 13 14 15
+    EOF
+
+    lines = StringIO.new lines
+
+    sum = 0
+    res = TSV.parse_stream(lines, sep: " ") do |k,values|
+      sum += values.inject(0){|acc,i| acc += i.to_i }
+    end
+    assert_equal 68, sum
+  end
+
+  def test_parse_header
+    header =<<-EOF
+#: :sep=" "
+#Key ValueA ValueB
+k A B
+    EOF
+    header = StringIO.new header
+
+    assert_equal "Key", TSV.parse_header(header)[1]
+  end
+
+  def test_parse
+    header =<<-EOF
+#: :sep=" "#:type=:double
+#Key ValueA ValueB
+k a|A b|B
+    EOF
+    header = StringIO.new header
+
+    tsv = TSV.parse(header)
+    assert_equal 'a', tsv['k'][0][0]
+  end
+end

data/test/scout/work_queue/test_worker.rb

@@ -95,5 +95,53 @@ class TestQueueWorker < Test::Unit::TestCase
     output.clean
   end
 
+  def test_process_exception
+    input = WorkQueue::Socket.new
+    output = WorkQueue::Socket.new
+
+    workers = 10.times.collect{ WorkQueue::Worker.new }
+    workers.each do |w|
+      w.process(input, output) do |obj|
+        raise ScoutException
+        [Process.pid, obj.inspect] * " "
+      end
+    end
+
+    read = Thread.new do 
+      Thread.current.report_on_exception = false
+      begin
+        while obj = output.read
+          if DoneProcessing === obj
+            pid = obj.pid
+            workers.delete_if{|w| w.pid = pid }
+            break if workers.empty?
+          end
+          raise obj if Exception === obj
+        end
+      end
+    end
+
+    write = Thread.new do
+      Thread.report_on_exception = false
+      100.times do |i|
+        input.write i
+      end
+      10.times do
+        input.write DoneProcessing.new
+      end
+      input.close_write
+    end
+
+    write.join
+
+    assert_raise ScoutException do
+      read.join
+    end
+
+    WorkQueue::Worker.join workers
+    input.clean
+    output.clean
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-gear
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-29 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -146,6 +146,8 @@ files:
 - lib/scout/simple_opt/parse.rb
 - lib/scout/simple_opt/setup.rb
 - lib/scout/tmpfile.rb
+- lib/scout/tsv.rb
+- lib/scout/tsv/parser.rb
 - lib/scout/work_queue.rb
 - lib/scout/work_queue/socket.rb
 - lib/scout/work_queue/worker.rb
@@ -206,8 +208,10 @@ files:
 - test/scout/test_resource.rb
 - test/scout/test_semaphore.rb
 - test/scout/test_tmpfile.rb
+- test/scout/test_tsv.rb
 - test/scout/test_work_queue.rb
 - test/scout/test_workflow.rb
+- test/scout/tsv/test_parser.rb
 - test/scout/work_queue/test_socket.rb
 - test/scout/work_queue/test_worker.rb
 - test/scout/workflow/step/test_info.rb