rbbt-util 5.21.104 → 5.21.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0ffcca0065a417f82428c347e4283ec03ccfd75
-  data.tar.gz: 65a8de0c4d9e0bca0e23a8d0c27e7c2b89d9ca9c
+  metadata.gz: 91cdec79d533941095ae1221a6048d03d0e64eb2
+  data.tar.gz: 3309d8b5e05b8d29f99b541d0b44d07bf9dfade3
 SHA512:
-  metadata.gz: 871b8ef7151a8a47f91994061603859b7dfa57402b4631f74eb4f6e5f747524bb48a91ff6e1bef7abe27fb7194b3ac4c6416686c63de4c7531cf052d75b6ad7f
-  data.tar.gz: 1db58bc5d69b28a0d58b6913cce05dae2a113c8a7723fa3bc34f08532a8886b4a2079ebd806292d92d8977c9d09591306ff7840d171473f4ff504a572ddee898
+  metadata.gz: 4e8af0810a521f6222f457c4193f6ba35f9727476b843c11e117737b118ca881cda79f7ebb8f7af7e7000128fafceeb8ba60e16e1afb6d4f201ed8892b159e00
+  data.tar.gz: c3cd43a48a8974a9a402ba268960c1359b5ea843102c72c37531d1e2b763008513596643920203a68c7e0f015fc71d38ab332a4b1e41ce82bbfca3f13261db15

data/lib/rbbt/tsv/util.rb

@@ -320,7 +320,7 @@ module TSV
         new[k] = v.first
       end
     when :single
-      self
+      return self
     when :list
       through do |k,v|
         new[k] = v.first

data/lib/rbbt/util/colorize.rb

@@ -22,7 +22,7 @@ module Colorize
     end
   end
 
-  def self.continuous(array, start = "#EABD5D", eend = "#40324F", percent = false) 
+  def self.continuous(array, start = "#40324F", eend = "#EABD5D", percent = false) 
     start_color = Color.new from_name(start)
     end_color = Color.new from_name(eend)
 

data/lib/rbbt/util/misc/inspect.rb

@@ -258,6 +258,8 @@ module Misc
               obj + " (file missing)"
             end
           when String
+
+            obj = obj.chomp if String === obj
             if obj.length > HASH2MD5_MAX_STRING_LENGTH
               sample_large_obj(obj, HASH2MD5_MAX_STRING_LENGTH) << "--" << txt_digest_str(obj)
             else

data/lib/rbbt/workflow/step/run.rb

@@ -85,14 +85,22 @@ class Step
     (no_load or ENV["RBBT_NO_STREAM"]) ? @result : prepare_result(@result, @task.result_description)
   end
 
-  def checks
-    #rec_dependencies.collect{|dependency| (defined? WorkflowRESTClient and WorkflowRESTClient::RemoteStep === dependency) ? nil : dependency.path }.compact.uniq
+  def dependency_checks
     rec_dependencies.
       select{|dependency| ! (defined? WorkflowRESTClient and WorkflowRESTClient::RemoteStep === dependency) }.
       select{|dependency| ! dependency.error? }.
       collect{|dependency| dependency.path }.uniq
   end
 
+  def input_checks
+    inputs.select{|i| Step === i && i.done?}.
+      collect{|dependency| dependency.path }.uniq
+  end
+
+  def checks
+    dependency_checks + input_checks
+  end
+
   def updated?
     done? and checks.select{|path| File.mtime(path) > File.mtime(self.path)  }.empty?
   end

data/test/rbbt/test_workflow.rb

@@ -83,14 +83,46 @@ Returns numer * 2 lines containing TEST
     end
   end
 
+  input :name, :string, "Name"
+  task :input_dep => :text do |name|
+    <<-EOF
+Hi #{name}:
+This is the input text
+for this dependency
+    EOF
+  end
 
+  input :text, :text, "Input text"
+  task :reverse_input_text => :text do |text|
+    text.reverse
+  end
 
+  dep :input_dep
+  dep :reverse_input_text, :text => :input_dep
+  task :send_input_dep_to_reverse => :text do
+    TSV.get_stream step(:reverse_input_text)
+  end
 end
 
 TestWF.workdir = Rbbt.tmp.test.workflow
 
 class TestWorkflow < Test::Unit::TestCase
 
+  def test_update_on_input_dependency_update
+    send_input_dep_to_reverse_job = TestWF.job(:send_input_dep_to_reverse, nil, :name => "Miguel")
+    send_input_dep_to_reverse_job.clean
+    send_input_dep_to_reverse_job.run
+    input_dep_job = send_input_dep_to_reverse_job.step(:input_dep)
+    input_dep_job.clean
+    input_dep_job.run
+    send_input_dep_to_reverse_job = TestWF.job(:send_input_dep_to_reverse, nil, :name => "Miguel")
+    mtime_orig = File.mtime send_input_dep_to_reverse_job.step(:reverse_input_text).path
+    send_input_dep_to_reverse_job.run
+    mtime_new = File.mtime send_input_dep_to_reverse_job.step(:reverse_input_text).path
+    assert mtime_orig < mtime_new
+
+  end
+
   def test_helper
     assert_equal "User", TestWF.job(:user, "Default", :number => 3).run
   end

data/test/test_helper.rb

@@ -24,6 +24,7 @@ class Test::Unit::TestCase
   end
 
   def teardown
+    FileUtils.rm_rf Rbbt.tmp.test.workflow.find
     #if defined? Persist
     #  FileUtils.rm_rf Path.setup("", 'rbbt').tmp.test.find :user
     #  Persist::CONNECTIONS.values.each do |c| c.close end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.104
+  version: 5.21.106
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake