scout-gear 10.11.4 → 10.11.7

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

@@ -9,7 +9,7 @@ class TestStepProvenance < Test::Unit::TestCase
       s.length
     end
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       step1 = dependencies.first
       step1.inputs.first + " has " + step1.load.to_s + " characters"
     end

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

@@ -8,7 +8,7 @@ class TestStepStatus < Test::Unit::TestCase
       s.length
     end
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       step1 = dependencies.first
       step1.inputs.first + " has " + step1.load.to_s + " characters"
     end
@@ -26,5 +26,37 @@ class TestStepStatus < Test::Unit::TestCase
     end
   end
 
+  def test_updated_file
+    TmpFile.with_file 'foo' do |tmpfile|
+      s = Step.new tmpfile
+      assert s.updated?
+    end
+  end
+
+  def test_deleted_dependency
+    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]
+
+    Misc.with_env "SCOUT_UPDATE", "true" do
+      step2.run
+      assert step2.updated?
+
+      sleep 0.1
+      step1.clean
+      assert step2.updated?
+      step1.run
+      refute step2.updated?
+    end
+  end
+
 end
 

data/test/scout/workflow/task/test_dependencies.rb

@@ -20,7 +20,7 @@ class TestTaskDependencies < Test::Unit::TestCase
 
     assert_equal 18, wf.job(:step2, :input1 => 2, "TaskInputs#step1" => step1_job).exec
 
-    assert_equal [step1_job.path], wf.job(:step2, :input1 => 2, "TaskInputs#step1" => step1_job).overriden_deps.collect{|d| d.path }
+    assert_equal [step1_job.path], wf.job(:step2, :input1 => 2, "TaskInputs#step1" => step1_job).overrider_deps.collect{|d| d.path }
 
     assert_equal 18, wf.job(:step2, "TaskInputs#step1" => step1_job).exec
   end
@@ -68,7 +68,7 @@ class TestTaskDependencies < Test::Unit::TestCase
 
       dep :my_sum
       task :double => :integer do
-        step(:my_sum).load * 2 
+        step(:my_sum).load * 2
       end
     end
 
@@ -90,6 +90,8 @@ class TestTaskDependencies < Test::Unit::TestCase
     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
@@ -330,7 +332,7 @@ class TestTaskDependencies < Test::Unit::TestCase
   def test_can_fail
     wf = Workflow.annonymous_workflow "TaskInputs" do
       input :input1, :integer, "", 1
-      task :step1 => :string do |i1| 
+      task :step1 => :string do |i1|
         if i1 < 0
           raise ScoutException
         else
@@ -343,7 +345,7 @@ class TestTaskDependencies < Test::Unit::TestCase
         if step(:step1).error?
           "0"
         else
-          step(:step1).load 
+          step(:step1).load
         end
       end
     end
@@ -356,7 +358,7 @@ class TestTaskDependencies < Test::Unit::TestCase
   def test_jobname_input
     wf = Workflow.annonymous_workflow "JobnameInput" do
       input :input1, :string, "", nil, jobname: true
-      task :step1 => :string do |i1| 
+      task :step1 => :string do |i1|
         i1
       end
 
@@ -381,7 +383,7 @@ class TestTaskDependencies < Test::Unit::TestCase
   def test_jobname_input_reset
     wf = Workflow.annonymous_workflow "JobnameInput" do
       input :input1, :string, "", nil, jobname: true
-      task :step1 => :string do |i1| 
+      task :step1 => :string do |i1|
         i1
       end
 
@@ -404,7 +406,7 @@ class TestTaskDependencies < Test::Unit::TestCase
   def test_non_default_inputs_ignore_hidden
     wf = Workflow.annonymous_workflow "JobnameInput" do
       input :input1, :string, "", nil, jobname: true
-      task :step1 => :string do |i1| 
+      task :step1 => :string do |i1|
         i1
       end
 

data/test/scout/workflow/task/test_inputs.rb

@@ -38,7 +38,7 @@ class TestTaskInput < Test::Unit::TestCase
     task = self.example_task
 
     assert_equal [:integer], task.assign_inputs(:string => "String", :integer => 2, :integer_array => %w(1 2))[1]
-    
+
     TmpFile.with_file("1\n2") do |integer_array_file|
       assert_equal [:integer], task.assign_inputs(:string => "String", :integer => 2, :integer_array => integer_array_file)[1]
     end

data/test/scout/workflow/test_definition.rb

@@ -56,7 +56,7 @@ class TestWorkflowDefinition < Test::Unit::TestCase
     end
 
     old_cache = Scout::Config::CACHE.dup
-    Scout::Config.set({:forget_dep_tasks => true, :remove_dep_tasks => true}, 'task:CallName#call_miguel') 
+    Scout::Config.set({:forget_dep_tasks => true, :remove_dep_tasks => true}, 'task:CallName#call_miguel')
     job = wf.job(:call_miguel)
     dep_path = job.step(:call_name).path
     assert_equal "Hi Miguel", job.run

data/test/scout/workflow/test_documentation.rb

@@ -4,7 +4,7 @@ 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"

data/test/scout/workflow/test_entity.rb

@@ -39,7 +39,7 @@ class TestWorkflowEntity < Test::Unit::TestCase
 
   def test_list
     ewf = get_EWF
-    
+
     l = ewf.setup(["Miki", "Clei"])
 
     assert_equal 2, l.hi.length
@@ -49,7 +49,7 @@ class TestWorkflowEntity < Test::Unit::TestCase
 
   def test_multiple
     ewf = get_EWF
-    
+
     l = ewf.setup(["Miki", "Clei"])
 
     assert_equal 2, l.bye.length

data/test/scout/workflow/test_step.rb

@@ -20,7 +20,7 @@ class TestWorkflowStep < Test::Unit::TestCase
       s.length
     end
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       step1 = dependencies.first
       step1.inputs.first + " has " + step1.load.to_s + " characters"
     end
@@ -37,7 +37,7 @@ class TestWorkflowStep < Test::Unit::TestCase
       s.length
     end
 
-    step2 = Step.new tmpdir.test_task2.step2 do 
+    step2 = Step.new tmpdir.test_task2.step2 do
       step1 = dependencies.first
       step1.inputs.first + " has " + step1.load.to_s + " characters"
     end
@@ -86,7 +86,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     assert res.nil?
     step1.clean
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       step1 = dependencies.first
       stream = step1.stream
 
@@ -145,7 +145,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     end
     step1.type = :array
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       step1 = dependencies.first
       stream = step1.stream
 
@@ -160,7 +160,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     step2.type = :array
     step2.dependencies = [step1]
 
-    step3 = Step.new tmpfile.step3 do 
+    step3 = Step.new tmpfile.step3 do
       step1, step2 = dependencies
       stream = step2.stream
 
@@ -201,7 +201,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     end
     step1.type = :array
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       step1 = dependencies.first
       stream = step1.stream
 
@@ -216,7 +216,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     step2.type = :array
     step2.dependencies = [step1]
 
-    step3 = Step.new tmpfile.step3 do 
+    step3 = Step.new tmpfile.step3 do
       step1 = dependencies.first
       stream = step1.stream
 
@@ -232,7 +232,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     step3.dependencies = [step1]
 
 
-    step4 = Step.new tmpfile.step4 do 
+    step4 = Step.new tmpfile.step4 do
       step2, step3 = dependencies
 
       mutex = Mutex.new
@@ -288,7 +288,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     step1.type = :array
 
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       step1 = dependencies.first
       stream = step1.stream
 
@@ -303,7 +303,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     step2.type = :array
     step2.dependencies = [step1]
 
-    step3 = Step.new tmpfile.step3 do 
+    step3 = Step.new tmpfile.step3 do
       step1 = dependencies.first
       stream = step1.stream
 
@@ -319,7 +319,7 @@ class TestWorkflowStep < Test::Unit::TestCase
     step3.dependencies = [step1]
 
 
-    step4 = Step.new tmpfile.step4 do 
+    step4 = Step.new tmpfile.step4 do
       step2, step3 = dependencies
 
       mutex = Mutex.new
@@ -356,7 +356,7 @@ class TestWorkflowStep < Test::Unit::TestCase
       s.length
     end
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       step1 = dependencies.first
       step1.inputs.first + " has " + step1.load.to_s + " characters"
     end
@@ -375,7 +375,7 @@ class TestWorkflowStep < Test::Unit::TestCase
       "done1"
     end
 
-    step2 = Step.new tmpfile.step2 do 
+    step2 = Step.new tmpfile.step2 do
       sleep 2
       "done2"
     end

data/test/scout/workflow/test_usage.rb

@@ -5,7 +5,7 @@ require 'scout/workflow'
 class TestWorkflowUsage < Test::Unit::TestCase
   module UsageWorkflow
     extend Workflow
-    
+
     self.name = "UsageWorkflow"
 
     self.title = "Workflow to test documentation"

data/test/test_helper.rb

@@ -54,7 +54,7 @@ class Test::Unit::TestCase
     Workflow.job_cache.clear
     SchedulerJob.batch_base_dir = tmpdir.batch
   end
-  
+
   teardown do
     Open.rm_rf tmpdir
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-gear
 version: !ruby/object:Gem::Version
-  version: 10.11.4
+  version: 10.11.7
 platform: ruby
 authors:
 - Miguel Vazquez
@@ -252,6 +252,7 @@ files:
 - scout_commands/template
 - scout_commands/update
 - scout_commands/workflow/cmd
+- scout_commands/workflow/example
 - scout_commands/workflow/info
 - scout_commands/workflow/install
 - scout_commands/workflow/list
@@ -381,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 3.7.2
 specification_version: 4
 summary: basic gear for scouts
 test_files: []