rbbt-util 5.26.147 → 5.26.148

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1896ce13e6cb3eb66dae38e32281efd3e41d28812297eb03cbb0c70e568b1ea8
-  data.tar.gz: 81cd7eae5d7c4f9960a448bf9478c482061b215b5d050212a136078eb9dcf396
+  metadata.gz: bf3004b4e61c1bd21d810ca71531a16c1fdfc7f1378ad611066adc769889eb19
+  data.tar.gz: f2d1291cda6e4624a748fe183813ef1db0d5bba9839bb68da5925b7412728206
 SHA512:
-  metadata.gz: bb1cf75feadaf35b81d7af01d001dc7f5241d4c1ab5942318f40b94c9e7c0dd79fe0eec6c28bc1182270429874882af1fad2ba5b47559bba5cf1cf62417db66e
-  data.tar.gz: 991c0cc027d9f901eea39d691848d2846a4161676ff7f3cc08db337785019fa7195e358e82572c946ca56fd5cd00d5b24c34842124e8b8ee20c8ac9bcf39e454
+  metadata.gz: 613b76e53fd61498015a0a9d21a138235691e1d34caa099bd2c7704839901b8052283bba59aba507991aea2c0c346d7f611812221597caba2e651a832829d362
+  data.tar.gz: 4a42b2057154f9ffea5473d31516fb56eb5d2a5c591d15a5f303fb6da102b2b99b4af3ade7018cba14027e8672e5e5da104dc2589970ebe138dc05ae2fb1dc90

data/lib/rbbt/util/config.rb

@@ -8,6 +8,8 @@ module Rbbt::Config
   GOT_KEYS=[]
 
   def self.add_entry(key, value, tokens)
+    tokens = [tokens] unless Array === tokens
+    tokens << "key:#{key}" unless tokens.include?("key:#{key}")
     CACHE[key.to_s] ||= [] 
     CACHE[key.to_s] << [tokens, value]
   end
@@ -16,8 +18,7 @@ module Rbbt::Config
     Log.debug "Loading file: #{ file }"
     TSV.traverse file, :type => :array do |line|
       next if line =~ /^#/
-      key, value, *tokens = line.split(/\s/)
-      tokens << "key:#{key}"
+      key, value, *tokens = line.strip.split(/\s/)
 
       self.add_entry(key, value, tokens) if key
     end
@@ -65,16 +66,18 @@ module Rbbt::Config
     [token, priority]
   end
 
-  def self.match(entries, token)
+  def self.match(entries, give_token)
     priorities = {}
     entries.each do |tokens, value|
       best_prio = nil
       tokens = [tokens] unless Array === tokens
       tokens.each do |tok|
         tok, prio = token_priority tok
+        next unless tok == give_token
+
         best_prio = prio if best_prio.nil? or best_prio > prio
         next if prio > best_prio
-        next unless tok == token
+
         priorities[prio] ||= []
         priorities[prio].unshift value
       end

data/lib/rbbt/workflow/definition.rb

@@ -64,6 +64,7 @@ module Workflow
   end
 
   FORGET_DEP_TASKS = ENV["RBBT_FORGET_DEP_TASKS"] == "true"
+  REMOVE_DEP_TASKS = ENV["RBBT_REMOVE_DEP_TASKS"] == "true"
   def dep_task(name, workflow, oname, *rest, &block)
     dep(workflow, oname, *rest, &block) 
     extension workflow.tasks[oname].extension if workflow.tasks.include?(oname) unless @extension
@@ -73,11 +74,18 @@ module Workflow
       set_info :result_type, dep.info[:result_type]
       forget = config :forget_dep_tasks, :forget_dep_tasks, :default => FORGET_DEP_TASKS
       if forget
+        remove = config :remove_dep_tasks, :remove_dep_tasks, :default => REMOVE_DEP_TASKS
         self.archive_deps
         self.dependencies = self.dependencies - [dep]
         Open.rm_rf self.files_dir if Open.exist? self.files_dir
         FileUtils.cp_r dep.files_dir, self.files_dir if Open.exist? dep.files_dir
         Open.ln_h dep.path, self.tmp_path
+        case remove.to_s
+        when 'true'
+          dep.clean
+        when 'recursive'
+          dep.recursive_clean
+        end
       else
         Open.rm_rf self.files_dir 
         Open.link dep.files_dir, self.files_dir

data/test/rbbt/util/test_config.rb

@@ -4,13 +4,25 @@ require 'rbbt/util/config'
 class TestConfig < Test::Unit::TestCase
   def setup
     Rbbt::Config.set({:cpus => 30}, :test_config, :test)
-    Rbbt::Config.set(:cpus , 5, "slow::2", :test)
+    Rbbt::Config.set(:cpus, 5, "slow::2", :test)
+    Rbbt::Config.set({:token => "token"}, "token", "key:token")
+    Rbbt::Config.set(:notoken, "no_token")
   end
 
   def test_simple
     assert_equal 30, Rbbt::Config.get(:cpus, :test_config)
   end
 
+  def test_match
+    assert_equal({20 => ["token"]}, Rbbt::Config.match({["key:token"] => "token"}, "key:token"))
+  end
+
+  def test_simple_no_token
+    assert_equal "token", Rbbt::Config.get("token", "token")
+    assert_equal "token", Rbbt::Config.get("token")
+    assert_equal "no_token", Rbbt::Config.get("notoken")
+  end
+
   def test_prio
     assert_equal 5, Rbbt::Config.get(:cpus, :slow, :test)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.147
+  version: 5.26.148
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake