scout-gear 5.1.1 → 6.0.0

data/test/scout/work_queue/test_socket.rb

@@ -0,0 +1,46 @@
+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 TestSocket < Test::Unit::TestCase
+  def test_simple
+    socket = WorkQueue::Socket.new 
+
+    socket.write 1
+    socket.write 2
+    socket.write "STRING"
+    socket.write :string
+
+    assert_equal 1, socket.read
+    assert_equal 2, socket.read
+    assert_equal "STRING", socket.read
+    assert_equal :string, socket.read
+
+    socket.close_write
+    assert_raise ClosedStream do
+      socket.read
+    end
+  end
+
+  def __test_speed
+    sss 0
+    socket = WorkQueue::Socket.new 
+
+    num = 10_000
+
+    Thread.new do
+      num.times do |i|
+        socket.write nil
+      end
+      socket.write DoneProcessing.new 
+    end
+
+    bar = Log::ProgressBar.new num
+    while true
+      i = socket.read
+      bar.tick
+      break if DoneProcessing === i
+    end
+    bar.done
+  end
+end
+

data/test/scout/work_queue/test_worker.rb

@@ -0,0 +1,99 @@
+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/semaphore'
+require 'scout/work_queue/socket'
+class TestQueueWorker < Test::Unit::TestCase
+  def test_simple
+    worker = WorkQueue::Worker.new
+    TmpFile.with_file do |file|
+      worker.run do
+        Open.write file, "TEST"
+      end
+      worker.join
+
+      assert_equal "TEST", Open.read(file)
+    end
+  end
+
+  def test_semaphore
+    ScoutSemaphore.with_semaphore 1 do |sem|
+
+      TmpFile.with_file do |outfile|
+        2.times do
+          sout = Open.open_pipe do |sin|
+            workers = 100.times.collect{ WorkQueue::Worker.new }
+            workers.each do |w|
+              w.run do
+                ScoutSemaphore.synchronize(sem) do
+                  10.times do
+                    sin.puts Process.pid
+                  end
+                end
+              end
+            end
+
+            WorkQueue::Worker.join(workers)
+          end
+          Open.consume_stream(sout, false, outfile)
+          pid_list = Open.read(outfile).split("\n")
+
+          assert_nothing_raised do
+            seen = []
+            current = nil
+            pid_list.each do |pid|
+              if pid != current
+                raise "Out of order" if seen.include? pid
+              end
+              current = pid
+              seen << pid
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def test_process
+    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|
+        [Process.pid, obj.inspect] * " "
+      end
+    end
+
+    read = Thread.new do 
+      begin
+        while obj = output.read
+          if DoneProcessing === obj
+            pid = obj.pid
+            workers.delete_if{|w| w.pid = pid }
+            break if workers.empty?
+          end
+        end
+      end
+    end
+
+    write = Thread.new do
+      100.times do |i|
+        input.write i
+      end
+      10.times do
+        input.write DoneProcessing.new
+      end
+      input.close_write
+    end
+
+    write.join
+    read.join
+
+    WorkQueue::Worker.join workers
+    input.clean
+    output.clean
+  end
+
+end
+

data/test/scout/workflow/step/test_info.rb

@@ -4,25 +4,27 @@ require 'scout/workflow'
 
 class TestStepInfo < Test::Unit::TestCase
   def test_dependency
-    Log.with_severity 0 do
-      tmpfile = tmpdir.test_step
-      step1 = Step.new tmpfile.step1, ["12"] do |s|
-        s.length
-      end
+    sss 0 do
+      TmpFile.with_file do |tmpdir|
+        Path.setup(tmpdir)
+        tmpfile = tmpdir.test_step
+        step1 = Step.new tmpfile.step1, ["12"] do |s|
+          s.length
+        end
 
-      assert_equal 2, step1.exec
-      assert_equal 2, step1.run
+        assert_equal 2, step1.exec
+        assert_equal 2, step1.run
 
-      step2 = Step.new tmpfile.step2 do 
-        step1 = dependencies.first
-        step1.inputs.first + " has " + step1.load.to_s + " characters"
-      end
+        step2 = Step.new tmpfile.step2 do 
+          step1 = dependencies.first
+          step1.inputs.first + " has " + step1.load.to_s + " characters"
+        end
 
-      step2.dependencies = [step1]
+        step2.dependencies = [step1]
 
-      assert_equal "12 has 2 characters", step2.run
-      assert_equal "12 has 2 characters", step2.run
+        assert_equal "12 has 2 characters", step2.run
+        assert_equal "12 has 2 characters", step2.run
+      end
     end
   end
 end
-

data/test/scout/workflow/step/test_load.rb

@@ -0,0 +1,65 @@
+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/workflow/step'
+
+class TestStepLoad < Test::Unit::TestCase
+  def test_dependency
+    sss 0 do
+      tmpfile = tmpdir.test_step
+      step1 = Step.new tmpfile.step1, ["12"] do |s|
+        s.length
+      end
+
+      step2 = Step.new tmpfile.step2 do 
+        step1 = dependencies.first
+        step1.inputs.first + " has " + step1.load.to_s + " characters"
+      end
+
+      step2.dependencies = [step1]
+
+      step2.recursive_clean
+      step2.run
+
+      new_step2 = Step.load(step2.path)
+
+      assert_equal "12 has 2 characters", new_step2.load
+      assert_equal "12 has 2 characters", new_step2.run
+      assert_equal 2, new_step2.dependencies.first.run
+      assert_equal "12", new_step2.dependencies.first.inputs.first
+    end
+  end
+
+  def test_relocate
+    wf = Workflow.annonymous_workflow "RelocateWorkflow" do
+      input :input1, :string
+      task :step1 => :string do |input1|
+        input1
+      end
+
+      dep :step1
+      task :step2 => :string do
+        step(:step1).load.reverse
+      end
+    end
+
+    step2 = wf.job(:step2, :input1 => "TEST")
+    step1 = step2.step(:step1)
+
+    step2.run
+    new_step2 = Step.load(step2.path)
+    TmpFile.with_file do |dir|
+      Misc.in_dir dir do
+        Path.setup(dir)
+        Open.mv step1.path, dir.var.jobs.RelocateWorkflow.step1[File.basename(step1.path)]
+        Open.mv step1.info_file, dir.var.jobs.RelocateWorkflow.step1[File.basename(step1.info_file)]
+
+        new_step2 = Step.load(step2.path)
+        assert_equal "TEST".reverse, new_step2.load
+        assert_equal "TEST", new_step2.dependencies.first.load
+      end
+    end
+
+  end
+end
+

data/test/scout/workflow/test_documentation.rb

@@ -0,0 +1,30 @@
+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 TestWorkflowDocumentation < Test::Unit::TestCase
+  module UsageWorkflow
+    extend Workflow
+    
+    self.name = "UsageWorkflow"
+
+    self.title = "Workflow to test documentation"
+    self.description = "Use this workflow to test if the documentation is correctly presented"
+
+    desc "Desc"
+    input :array, :array, "Array"
+    task :step1 => :string do
+    end
+
+    dep :step1
+    desc "Desc2"
+    input :float, :float, "Float"
+    task :step2 => :string do
+    end
+  end
+
+  def test_usage
+    assert_match 'test', UsageWorkflow.documentation[:title]
+    assert_match 'presented', UsageWorkflow.documentation[:description]
+  end
+end
+

data/test/scout/workflow/test_task.rb

@@ -17,6 +17,7 @@ class TestTask < Test::Unit::TestCase
     end
 
     s = task.job('test', ['12'])
+    s.clean
     assert_equal 2, s.run
   end
 

data/test/scout/workflow/test_usage.rb

@@ -5,6 +5,11 @@ require 'scout/workflow'
 class TestWorkflowUsage < Test::Unit::TestCase
   module UsageWorkflow
     extend Workflow
+    
+    self.name = "UsageWorkflow"
+
+    self.title = "Workflow to test documentation"
+    self.description = "Use this workflow to test if the documentation is correctly presented."
 
     desc "Desc"
     input :array, :array, "Array"
@@ -18,9 +23,13 @@ class TestWorkflowUsage < Test::Unit::TestCase
     end
   end
 
-  def __test_usage
-    UsageWorkflow.tasks[:step1].doc
-    UsageWorkflow.doc
+
+  def test_workflow_usage
+    assert_match "test if the documentation", UsageWorkflow.usage
+  end
+
+  def test_task_usage
+    assert_match "Desc2", UsageWorkflow.tasks[:step2].usage
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-gear
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -118,6 +118,7 @@ files:
 - lib/scout/misc/filesystem.rb
 - lib/scout/misc/format.rb
 - lib/scout/misc/insist.rb
+- lib/scout/misc/monitor.rb
 - lib/scout/open.rb
 - lib/scout/open/lock.rb
 - lib/scout/open/remote.rb
@@ -136,6 +137,8 @@ files:
 - lib/scout/resource/produce.rb
 - lib/scout/resource/produce/rake.rb
 - lib/scout/resource/scout.rb
+- lib/scout/resource/util.rb
+- lib/scout/semaphore.rb
 - lib/scout/simple_opt.rb
 - lib/scout/simple_opt/accessor.rb
 - lib/scout/simple_opt/doc.rb
@@ -143,11 +146,15 @@ files:
 - lib/scout/simple_opt/parse.rb
 - lib/scout/simple_opt/setup.rb
 - lib/scout/tmpfile.rb
+- lib/scout/work_queue.rb
+- lib/scout/work_queue/socket.rb
+- lib/scout/work_queue/worker.rb
 - lib/scout/workflow.rb
 - lib/scout/workflow/definition.rb
 - lib/scout/workflow/documentation.rb
 - lib/scout/workflow/step.rb
 - lib/scout/workflow/step/info.rb
+- lib/scout/workflow/step/load.rb
 - lib/scout/workflow/task.rb
 - lib/scout/workflow/task/inputs.rb
 - lib/scout/workflow/usage.rb
@@ -158,9 +165,15 @@ files:
 - scout_commands/find
 - scout_commands/glob
 - scout_commands/rbbt
+- scout_commands/workflow/info
+- scout_commands/workflow/list
 - scout_commands/workflow/task
+- scout_commands/workflow/task_old
+- share/color/color_names
+- share/color/diverging_colors.hex
 - test/scout/indiferent_hash/test_case_insensitive.rb
 - test/scout/indiferent_hash/test_options.rb
+- test/scout/log/test_color.rb
 - test/scout/log/test_progress.rb
 - test/scout/misc/test_digest.rb
 - test/scout/misc/test_filesystem.rb
@@ -176,6 +189,8 @@ files:
 - test/scout/persist/test_serialize.rb
 - test/scout/resource/test_path.rb
 - test/scout/resource/test_produce.rb
+- test/scout/resource/test_util.rb
+- test/scout/simple_opt/test_doc.rb
 - test/scout/simple_opt/test_get.rb
 - test/scout/simple_opt/test_parse.rb
 - test/scout/simple_opt/test_setup.rb
@@ -189,10 +204,17 @@ files:
 - test/scout/test_path.rb
 - test/scout/test_persist.rb
 - test/scout/test_resource.rb
+- test/scout/test_semaphore.rb
 - test/scout/test_tmpfile.rb
+- test/scout/test_work_queue.rb
 - test/scout/test_workflow.rb
+- test/scout/work_queue/test_socket.rb
+- test/scout/work_queue/test_worker.rb
 - test/scout/workflow/step/test_info.rb
+- test/scout/workflow/step/test_load.rb
 - test/scout/workflow/task/test_inputs.rb
+- test/scout/workflow/test_definition.rb
+- test/scout/workflow/test_documentation.rb
 - test/scout/workflow/test_step.rb
 - test/scout/workflow/test_task.rb
 - test/scout/workflow/test_usage.rb