rbbt-util 5.26.146 → 5.26.147

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8d0361a7bc2ba9a9f0592163c75412323e05f8176fccfc2b26449222a755c7
-  data.tar.gz: '031648bb9feb9b389f8d79f1a0b9fbe2975417116a30449165f09edf34cb627d'
+  metadata.gz: 1896ce13e6cb3eb66dae38e32281efd3e41d28812297eb03cbb0c70e568b1ea8
+  data.tar.gz: 81cd7eae5d7c4f9960a448bf9478c482061b215b5d050212a136078eb9dcf396
 SHA512:
-  metadata.gz: '094371d751166f66599f75f7e9199602130110343df39a0872327650b1198a042abcbf469da8ea78945323aeee5a7cfbd4ab8f7ad3a62cd97c9760bc4be5a7db'
-  data.tar.gz: 364b2612168f4223cd3752409c5dd8e6e678b6dc0d047c47c95579588f097ff8bc2b40f9caacc034bb2a0aceb52eacf5d174a88429ad4dd6c16014f128c5087c
+  metadata.gz: bb1cf75feadaf35b81d7af01d001dc7f5241d4c1ab5942318f40b94c9e7c0dd79fe0eec6c28bc1182270429874882af1fad2ba5b47559bba5cf1cf62417db66e
+  data.tar.gz: 991c0cc027d9f901eea39d691848d2846a4161676ff7f3cc08db337785019fa7195e358e82572c946ca56fd5cd00d5b24c34842124e8b8ee20c8ac9bcf39e454

data/lib/rbbt/util/config.rb

@@ -76,7 +76,7 @@ module Rbbt::Config
         next if prio > best_prio
         next unless tok == token
         priorities[prio] ||= []
-        priorities[prio] << value
+        priorities[prio].unshift value
       end
     end if entries
     priorities
@@ -111,7 +111,7 @@ module Rbbt::Config
       end
     end
 
-    value = priorities.empty? ? default : priorities.collect{|p| p }.sort_by{|p,v| p}.first.last.last
+    value = priorities.empty? ? default : priorities.collect{|p| p }.sort_by{|p,v| p}.first.last.first
     value = false if value == 'false'
 
     Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}"

data/test/rbbt/util/test_config.rb

@@ -30,5 +30,18 @@ class TestConfig < Test::Unit::TestCase
     assert_equal "valueA", Rbbt::Config.get('key', 'token')
     assert_equal "default", Rbbt::Config.get('key2', 'token', :default => 'default')
   end
+
+  def test_order
+    Rbbt::Config.add_entry 'key', 'V1', 'token1'
+    Rbbt::Config.add_entry 'key', 'V2', 'token2'
+    Rbbt::Config.add_entry 'key', 'V3', 'token2'
+
+    assert_equal "V3", Rbbt::Config.get('key', 'token2')
+    assert_equal "V1", Rbbt::Config.get('key', 'token1')
+    assert_equal "V3", Rbbt::Config.get('key', 'token2', 'token1')
+    assert_equal "V1", Rbbt::Config.get('key', 'token1', 'token2')
+  end
+
+
 end
 

metadata

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