scout-gear 1.2.0 → 5.1.1

data/test/scout/workflow/test_task.rb

@@ -0,0 +1,178 @@
+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 TestTask < Test::Unit::TestCase
+  def test_basic_task
+    task = Task.setup do |s=""|
+      (self + s).length
+    end
+
+    assert_equal 4, task.exec_on("1234")
+    assert_equal 6, task.exec_on("1234","56")
+  end
+
+  def test_step
+    task = Task.setup do |s=""|
+      s.length
+    end
+
+    s = task.job('test', ['12'])
+    assert_equal 2, s.run
+  end
+
+  def test_override_inputs
+    wf = Workflow.annonymous_workflow "TaskInputs" do
+      input :input1, :string
+      task :step1 => :string do |i| i end
+
+      dep :step1, :input1 => 1
+      input :input2, :string
+      task :step2 => :string do |i| i end
+    end
+
+    job = wf.job(:step2, :input1 => 2)
+    assert_equal Task::DEFAULT_NAME, job.name
+    assert_not_equal Task::DEFAULT_NAME, job.step(:step1).name
+  end
+
+  def test_override_inputs_block
+    Log.severity = 0
+    wf = Workflow.annonymous_workflow "TaskInputs" do
+      input :input1, :string
+      task :step1 => :string do |i| i end
+
+      dep :step1 do |id,options|
+        {:inputs => {:input1 => 1}}
+      end
+      input :input2, :string
+      task :step2 => :string do |i| i end
+    end
+
+    job = wf.job(:step2, :input1 => 2)
+    assert_equal Task::DEFAULT_NAME, job.name
+    assert_not_equal Task::DEFAULT_NAME, job.step(:step1).name
+  end
+
+  def test_task_override_dep
+    Log.severity = 0
+    wf = Workflow.annonymous_workflow "TaskInputs" do
+      input :input1, :integer
+      task :step1 => :integer do |i| i end
+
+      dep :step1
+      input :input2, :integer, "Integer", 3
+      task :step2 => :integer do |i| i * step(:step1).load end
+    end
+
+    assert_equal 6, wf.job(:step2, :input1 => 2, :input2 => 3).run
+
+    step1_job = wf.job(:step1, :input1 => 6)
+    assert_equal 18, wf.job(:step2, :input1 => 2, "TaskInputs#step1" => step1_job).run
+
+    assert_equal 18, wf.job(:step2, :input1 => 2, "TaskInputs#step1" => step1_job).run
+
+    assert_equal 18, wf.job(:step2, "TaskInputs#step1" => step1_job).run
+  end
+
+  def test_input_dep
+    wf = Workflow.annonymous_workflow "TaskInputs" do
+      input :v1, :integer
+      input :v2, :integer
+      task :sum => :integer do |v1,v2|
+        v1 + v2
+      end
+
+      input :input1, :integer
+      task :step1 => :integer do |i| i end
+
+      input :input2, :integer
+      task :step2 => :integer do |i| i end
+
+      dep :step1, :input1 => 2
+      dep :step2, :input2 => 3
+      dep :sum, :v1 => :step1, :v2 => :step2
+      task :my_sum => :integer do
+        dependencies.last.load
+      end
+
+      dep :my_sum
+      task :double => :integer do
+        step(:my_sum).load * 2 
+      end
+    end
+
+    job = wf.job(:my_sum)
+    assert_equal 5, job.run
+    assert_equal Task::DEFAULT_NAME, job.name
+
+    job = wf.job(:double)
+    assert_equal Task::DEFAULT_NAME, job.name
+
+    step1 = wf.job(:step1, :input1 => 3)
+    job = wf.job(:double, "TaskInputs#step1" => step1)
+    assert_equal 12, job.run
+    assert_not_equal Task::DEFAULT_NAME, job.name
+
+    step1 = wf.job(:step1, :input1 => 4)
+    job = wf.job(:double, "TaskInputs#step1" => step1)
+    assert_equal 14, job.run
+    assert_not_equal Task::DEFAULT_NAME, job.name
+  end
+
+  def test_input_dep_override
+    wf = Workflow.annonymous_workflow "TaskInputs" do
+      input :v1, :integer
+      input :v2, :integer
+      task :sum => :integer do |v1,v2|
+        v1 + v2
+      end
+
+      input :input1, :integer
+      task :step1 => :integer do |i| i end
+
+      input :input2, :integer
+      task :step2 => :integer do |i| i end
+
+      dep :step1
+      dep :step2
+      task :my_sum => :integer do
+        dependencies.inject(0){|acc,d| acc += d.load }
+      end
+    end
+
+    step2 = wf.job(:step2, :input2 => 4)
+    job = wf.job(:my_sum, :input1 => 2, :input2 => 3, "TaskInputs#step2"=> step2)
+    assert_equal 6, job.exec
+
+    job = wf.job(:my_sum, :input1 => 2, :input2 => 3)
+    assert_equal 5, job.run
+
+    TmpFile.with_file(4) do |file|
+      job = wf.job(:my_sum, :input1 => 2, :input2 => 3, "TaskInputs#step2"=> file)
+      assert_equal 6, job.run
+      assert_not_equal Task::DEFAULT_NAME, job.name
+    end
+  end
+
+  def test_input_rename
+    wf = Workflow.annonymous_workflow "TaskInputs" do
+      input :v1, :integer
+      input :v2, :integer
+      task :sum => :integer do |v1,v2|
+        v1 + v2
+      end
+
+      input :vv1, :integer
+      input :vv2, :integer
+      dep :sum, :v1 => :vv1, :v2 => :vv2
+      task :my_sum => :integer do
+        dependencies.last.load
+      end
+    end
+
+    Log.severity = 0
+    job = wf.job(:my_sum, :vv1 => 2, :vv2 => 3)
+    assert_equal 5, job.run
+  end
+end
+

data/test/scout/workflow/test_usage.rb

@@ -0,0 +1,26 @@
+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'
+class TestWorkflowUsage < Test::Unit::TestCase
+  module UsageWorkflow
+    extend Workflow
+
+    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
+    UsageWorkflow.tasks[:step1].doc
+    UsageWorkflow.doc
+  end
+end
+

data/test/scout/workflow/test_util.rb

@@ -0,0 +1,17 @@
+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'
+
+class TestWorkflowUtil < Test::Unit::TestCase
+  def test_annonymous_workflow
+    wf = Workflow.annonymous_workflow "TEST" do
+      task :length => :integer do
+        self.length
+      end
+    end
+    bindings = "12345"
+    assert_equal 5, wf.tasks[:length].exec_on(bindings)
+  end
+end
+

data/test/test_helper.rb

@@ -22,6 +22,23 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 #require 'scout/helper/misc/development'
 require 'scout/tmpfile'
 require 'scout/log'
+require 'scout/persist'
+require 'scout/workflow'
 
 class Test::Unit::TestCase
+
+  def tmpdir
+    @tmpdir = Path.setup('tmp/test_tmpdir').find
+  end
+
+  setup do
+    Persist.cache_dir = tmpdir.var.cache
+    Open.remote_cache_dir = tmpdir.var.cache
+    Workflow.directory = tmpdir.var.jobs
+    Workflow.workflows.each{|wf| wf.directory = Workflow.directory[wf.name] }
+  end
+  
+  teardown do
+    Open.rm_rf tmpdir
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-gear
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -90,6 +90,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".document"
+- ".gitmodules"
 - ".vimproject"
 - LICENSE.txt
 - README.rdoc
@@ -97,6 +98,9 @@ files:
 - VERSION
 - bin/scout
 - lib/scout-gear.rb
+- lib/scout.rb
+- lib/scout/cmd.rb
+- lib/scout/concurrent_stream.rb
 - lib/scout/exceptions.rb
 - lib/scout/indiferent_hash.rb
 - lib/scout/indiferent_hash/case_insensitive.rb
@@ -110,22 +114,91 @@ files:
 - lib/scout/log/progress/util.rb
 - lib/scout/meta_extension.rb
 - lib/scout/misc.rb
+- lib/scout/misc/digest.rb
+- lib/scout/misc/filesystem.rb
+- lib/scout/misc/format.rb
+- lib/scout/misc/insist.rb
+- lib/scout/open.rb
+- lib/scout/open/lock.rb
+- lib/scout/open/remote.rb
+- lib/scout/open/stream.rb
+- lib/scout/open/util.rb
 - lib/scout/path.rb
 - lib/scout/path/find.rb
+- lib/scout/path/tmpfile.rb
 - lib/scout/path/util.rb
+- lib/scout/persist.rb
+- lib/scout/persist/open.rb
+- lib/scout/persist/path.rb
+- lib/scout/persist/serialize.rb
+- lib/scout/resource.rb
+- lib/scout/resource/path.rb
+- lib/scout/resource/produce.rb
+- lib/scout/resource/produce/rake.rb
+- lib/scout/resource/scout.rb
+- lib/scout/simple_opt.rb
+- lib/scout/simple_opt/accessor.rb
+- lib/scout/simple_opt/doc.rb
+- lib/scout/simple_opt/get.rb
+- lib/scout/simple_opt/parse.rb
+- lib/scout/simple_opt/setup.rb
 - lib/scout/tmpfile.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/task.rb
+- lib/scout/workflow/task/inputs.rb
+- lib/scout/workflow/usage.rb
+- lib/scout/workflow/util.rb
+- lib/workflow-scout.rb
 - scout-gear.gemspec
+- scout_commands/alias
+- scout_commands/find
+- scout_commands/glob
+- scout_commands/rbbt
+- scout_commands/workflow/task
+- test/scout/indiferent_hash/test_case_insensitive.rb
 - test/scout/indiferent_hash/test_options.rb
 - test/scout/log/test_progress.rb
+- test/scout/misc/test_digest.rb
+- test/scout/misc/test_filesystem.rb
+- test/scout/misc/test_insist.rb
+- test/scout/open/test_lock.rb
+- test/scout/open/test_remote.rb
+- test/scout/open/test_stream.rb
+- test/scout/open/test_util.rb
 - test/scout/path/test_find.rb
 - test/scout/path/test_util.rb
+- test/scout/persist/test_open.rb
+- test/scout/persist/test_path.rb
+- test/scout/persist/test_serialize.rb
+- test/scout/resource/test_path.rb
+- test/scout/resource/test_produce.rb
+- test/scout/simple_opt/test_get.rb
+- test/scout/simple_opt/test_parse.rb
+- test/scout/simple_opt/test_setup.rb
+- test/scout/test_cmd.rb
+- test/scout/test_concurrent_stream.rb
 - test/scout/test_indiferent_hash.rb
 - test/scout/test_log.rb
 - test/scout/test_meta_extension.rb
 - test/scout/test_misc.rb
+- test/scout/test_open.rb
 - test/scout/test_path.rb
+- test/scout/test_persist.rb
+- test/scout/test_resource.rb
 - test/scout/test_tmpfile.rb
+- test/scout/test_workflow.rb
+- test/scout/workflow/step/test_info.rb
+- test/scout/workflow/task/test_inputs.rb
+- test/scout/workflow/test_step.rb
+- test/scout/workflow/test_task.rb
+- test/scout/workflow/test_usage.rb
+- test/scout/workflow/test_util.rb
 - test/test_helper.rb
+- test/test_scout-gear.rb
 homepage: http://github.com/mikisvaz/scout-gear
 licenses:
 - MIT
@@ -145,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.11
 signing_key: 
 specification_version: 4
 summary: basic gear for scouts