scout-gear 8.0.0 → 8.1.0

data/test/scout/workflow/test_task.rb

@@ -21,292 +21,5 @@ class TestTask < Test::Unit::TestCase
     assert_equal 2, s.run
   end
 
-  def test_task_override_dep
-    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)
-    assert_equal 3, step1.run
-    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)
-    assert_equal 4, step1.run
-    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
-
-    job = wf.job(:my_sum, :vv1 => 2, :vv2 => 3)
-    assert_equal 5, job.run
-  end
-
-  def test_defaults_in_dep_block
-    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, nil, 3
-      dep :sum, :v1 => :placeholder, :v2 => :placeholder do |jobname,options,dependencies|
-        raise "Non-numeric value where integer expected" unless Numeric === options[:vv1]
-        {inputs: {v1: options[:vv1], v2: options[:vv2]} }
-      end
-      task :my_sum => :integer do
-        dependencies.last.load
-      end
-    end
-
-    job = wf.job(:my_sum, :vv1 => "2")
-    assert_equal 5, job.run
-  end
-
-  def test_dependency_jobname
-    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, :jobname => "OTHER_NAME"
-      task :my_sum => :integer do
-        dependencies.last.load
-      end
-    end
-
-    job = wf.job(:my_sum, "TEST_NAME", :vv1 => 2, :vv2 => 3)
-    assert_equal 5, job.run
-    assert_equal "TEST_NAME", job.clean_name
-    assert_equal "OTHER_NAME", job.step(:sum).clean_name
-  end
-
-  def test_no_param_last_job
-    wf = Workflow.annonymous_workflow "TaskInputs" do
-      input :v1, :integer
-      input :v2, :integer
-      task :sum => :integer do |v1,v2|
-        v1 + v2
-      end
-
-      dep :sum
-      task :my_sum => :integer do
-        dependencies.last.load
-      end
-    end
-
-    job = wf.job(:my_sum, :v1 => 2, :v2 => "3")
-    assert_equal 5, job.run
-    refute_equal Task::DEFAULT_NAME, job.name
-  end
-
-  def test_no_param_last_job_block
-    wf = Workflow.annonymous_workflow "TaskInputs" do
-      input :v1, :integer
-      input :v2, :integer
-      task :sum => :integer do |v1,v2|
-        v1 + v2
-      end
-
-      dep :sum do |jobname,options|
-        {inputs: options}
-      end
-      task :my_sum => :integer do
-        dependencies.last.load
-      end
-    end
-
-    job = wf.job(:my_sum, :v1 => 2, :v2 => "3")
-    assert_equal 5, job.run
-    refute_equal Task::DEFAULT_NAME, job.name
-  end
-
-
-  def test_override_inputs_block
-    wf = Workflow.annonymous_workflow "TaskInputs" do
-      input :input1, :string
-      task :step1 => :string do |i| i end
-
-      dep :step1, :input1 => 1  do |id,options|
-        {:inputs => options}
-      end
-      input :input2, :string
-      task :step2 => :string do |i| step(:step1).load end
-    end
-
-    job = wf.job(:step2, :input1 => 2)
-    assert_equal 1, job.run
-    assert_equal Task::DEFAULT_NAME, job.name
-    assert_not_equal Task::DEFAULT_NAME, job.step(:step1).name
-  end
-
-  def test_override_inputs_block_array
-    wf = Workflow.annonymous_workflow "TaskInputs" do
-      input :input1, :string
-      task :step1 => :string do |i| i end
-
-      dep :step1, :input1 => 1  do |id,options|
-        [{:inputs => options}]
-      end
-      input :input2, :string
-      task :step2 => :string do |i| step(:step1).load end
-    end
-
-    job = wf.job(:step2, :input1 => 2)
-    assert_equal 1, job.run
-    assert_equal Task::DEFAULT_NAME, job.name
-    assert_not_equal Task::DEFAULT_NAME, job.step(:step1).name
-  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| step(:step1).load end
-    end
-
-    job = wf.job(:step2, :input1 => 2)
-    assert_equal 1, job.run
-    assert_equal Task::DEFAULT_NAME, job.name
-    assert_not_equal Task::DEFAULT_NAME, job.step(:step1).name
-  end
-
-  def test_non_default_inputs
-    wf = Workflow.annonymous_workflow "TaskInputs" do
-      input :input1, :integer, "", 1
-      input :input2, :integer, "", 0
-      task :step1 => :string do |i1,i2| i1 + i2 end
-
-      dep :step1, :input2 => 1
-      task :step2 => :string do |i| step(:step1).load end
-
-      dep :step2
-      task :step3 => :string do |i| step(:step1).load end
-    end
-
-    job = wf.job(:step3, :input1 => 1)
-    assert_equal Task::DEFAULT_NAME, job.name
-    assert_not_equal Task::DEFAULT_NAME, job.step(:step1).name
-    assert_equal 2, job.run
-
-    job = wf.job(:step3, :input1 => 2)
-    assert_equal 3, job.run
-
-
-    job = wf.job(:step3)
-    assert_equal Task::DEFAULT_NAME, job.name
-    assert_not_equal Task::DEFAULT_NAME, job.step(:step1).name
-  end
-
 end
 

data/test/test_scout.rb

@@ -0,0 +1,9 @@
+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 TestScout < Test::Unit::TestCase
+  def test_version
+    assert_equal 3, Scout.version.split(".").length
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-gear
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -24,6 +24,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: RubyInline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +136,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Temporary files, logs, etc.
+description: Temporary files, logs, path, resources, persistence, workflows, TSV,
+  etc.
 email: mikisvaz@gmail.com
 executables:
 - scout
@@ -97,6 +154,8 @@ files:
 - Rakefile
 - VERSION
 - bin/scout
+- doc/lib/scout/path.md
+- doc/lib/scout/workflow/task.md
 - lib/rbbt-scout.rb
 - lib/scout-gear.rb
 - lib/scout.rb
@@ -125,6 +184,10 @@ files:
 - lib/scout/misc/monitor.rb
 - lib/scout/misc/system.rb
 - lib/scout/named_array.rb
+- lib/scout/offsite.rb
+- lib/scout/offsite/ssh.rb
+- lib/scout/offsite/step.rb
+- lib/scout/offsite/sync.rb
 - lib/scout/open.rb
 - lib/scout/open/lock.rb
 - lib/scout/open/lock/lockfile.rb
@@ -167,6 +230,7 @@ files:
 - lib/scout/tsv/persist/fix_width_table.rb
 - lib/scout/tsv/persist/serialize.rb
 - lib/scout/tsv/persist/tokyocabinet.rb
+- lib/scout/tsv/stream.rb
 - lib/scout/tsv/transformer.rb
 - lib/scout/tsv/traverse.rb
 - lib/scout/tsv/util.rb
@@ -180,6 +244,8 @@ files:
 - lib/scout/work_queue/worker.rb
 - lib/scout/workflow.rb
 - lib/scout/workflow/definition.rb
+- lib/scout/workflow/deployment.rb
+- lib/scout/workflow/deployment/orchestrator.rb
 - lib/scout/workflow/documentation.rb
 - lib/scout/workflow/step.rb
 - lib/scout/workflow/step/config.rb
@@ -191,19 +257,23 @@ files:
 - lib/scout/workflow/step/provenance.rb
 - lib/scout/workflow/step/status.rb
 - lib/scout/workflow/task.rb
+- lib/scout/workflow/task/dependencies.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/doc
 - scout_commands/find
 - scout_commands/glob
+- scout_commands/offsite
 - scout_commands/rbbt
+- scout_commands/update
 - scout_commands/workflow/info
+- scout_commands/workflow/install
 - scout_commands/workflow/list
 - scout_commands/workflow/task
-- scout_commands/workflow/task_old
 - share/color/color_names
 - share/color/diverging_colors.hex
 - share/software/install_helpers
@@ -215,6 +285,10 @@ files:
 - test/scout/misc/test_filesystem.rb
 - test/scout/misc/test_insist.rb
 - test/scout/misc/test_system.rb
+- test/scout/offsite/test_ssh.rb
+- test/scout/offsite/test_step.rb
+- test/scout/offsite/test_sync.rb
+- test/scout/offsite/test_task.rb
 - test/scout/open/test_lock.rb
 - test/scout/open/test_remote.rb
 - test/scout/open/test_stream.rb
@@ -259,6 +333,7 @@ files:
 - test/scout/tsv/test_open.rb
 - test/scout/tsv/test_parser.rb
 - test/scout/tsv/test_persist.rb
+- test/scout/tsv/test_stream.rb
 - test/scout/tsv/test_transformer.rb
 - test/scout/tsv/test_traverse.rb
 - test/scout/tsv/test_util.rb
@@ -269,11 +344,13 @@ files:
 - test/scout/tsv/util/test_unzip.rb
 - test/scout/work_queue/test_socket.rb
 - test/scout/work_queue/test_worker.rb
+- test/scout/workflow/deployment/test_orchestrator.rb
 - test/scout/workflow/step/test_dependencies.rb
 - test/scout/workflow/step/test_info.rb
 - test/scout/workflow/step/test_load.rb
 - test/scout/workflow/step/test_provenance.rb
 - test/scout/workflow/step/test_status.rb
+- test/scout/workflow/task/test_dependencies.rb
 - test/scout/workflow/task/test_inputs.rb
 - test/scout/workflow/test_definition.rb
 - test/scout/workflow/test_documentation.rb
@@ -283,6 +360,7 @@ files:
 - test/scout/workflow/test_util.rb
 - test/test_helper.rb
 - test/test_scout-gear.rb
+- test/test_scout.rb
 homepage: http://github.com/mikisvaz/scout-gear
 licenses:
 - MIT
@@ -302,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.11
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: basic gear for scouts