rbbt-util 5.26.141 → 5.26.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58bced40c483ab601f0e5102ec48f4a0f437e50f119612ef37ce1e2e5ab4860e
-  data.tar.gz: 5b66741f2e524751eb19ca0ae7d138b3654cf9ba01a417a5b84a91e4e0ab67ce
+  metadata.gz: fddb36a8c680b822b0282e4de2e9742b892376fb2b10d9af36be70aa5ec466f9
+  data.tar.gz: c22a9b145937dc65edf98f7e6e5c97bb7441a73fed8df39437a402193df0b080
 SHA512:
-  metadata.gz: e9f57582295005dbee6cff4057431d2906d5502b2c92928abb2cb20afb541bcc6db8d5306bb46c7e4154056f03a0eed831802b37b96262460820c993449c8e9f
-  data.tar.gz: 7b190f88dd9b9da0be937855f3c68a23069af19b3bb34f814f885941acbb6be25ea402813153f5559b56cb1e238b9af07961f5e153ea5a91e09b7458a6e1c64d
+  metadata.gz: 8ed646c095003525fb0b91b8e81ebcfadcd51b730f3f273452565234e57f428ee6b93b3c8e83406673b70d8ed62e28deffc4c8300e30c0f460c4409fc07801de
+  data.tar.gz: 312a01dc5c7351b0838eebf93d0741f101fcea01760832a05ec47456b3d1d4501310cccd86f92aefb8b5e74d5ed3d2523c637601d6f5421d710c1d6dee0ff853

data/lib/rbbt/util/config.rb

@@ -69,6 +69,7 @@ module Rbbt::Config
     priorities = {}
     entries.each do |tokens, value|
       best_prio = nil
+      tokens = [tokens] unless Array === tokens
       tokens.each do |tok|
         tok, prio = token_priority tok
         best_prio = prio if best_prio.nil? or best_prio > prio
@@ -120,7 +121,10 @@ module Rbbt::Config
   end
 
   def self.with_config
-      saved_config = CACHE.dup
+      saved_config = {}
+      CACHE.each do |k,v|
+        saved_config[k] = v.dup
+      end
       saved_got_keys = GOT_KEYS.dup
     begin
       yield

data/lib/rbbt/util/log/progress.rb

@@ -2,6 +2,16 @@ require 'rbbt/util/log'
 require 'rbbt/util/log/progress/util'
 require 'rbbt/util/log/progress/report'
 module Log
+
+  def self.no_bar=(value)
+    @@no_bar = value
+  end
+
+  def self.no_bar
+    @@no_bar = false unless defined?(@@no_bar)
+    @@no_bar || ENV["RBBT_NO_PROGRESS"] == "true"
+  end
+
   class ProgressBar
 
     attr_accessor :max, :ticks, :frequency, :depth, :desc, :file, :bytes
@@ -34,7 +44,7 @@ module Log
     end
 
     def tick(step = 1)
-      return if ENV["RBBT_NO_PROGRESS"] == "true"
+      return if Log.no_bar
       @ticks += step
 
       time = Time.now

data/lib/rbbt/util/log/progress/report.rb

@@ -1,7 +1,7 @@
 module Log
   class ProgressBar
     def print(io, str)
-      return if ENV["RBBT_NO_PROGRESS"] == "true"
+      return if Log.no_bar
       LOG_MUTEX.synchronize do
         STDERR.print str
         Log.logfile.puts str unless Log.logfile.nil?

data/test/rbbt/util/test_config.rb

@@ -14,5 +14,21 @@ class TestConfig < Test::Unit::TestCase
   def test_prio
     assert_equal 5, Rbbt::Config.get(:cpus, :slow, :test)
   end
+
+  def test_with_config
+    Rbbt::Config.add_entry 'key', 'valueA', 'token'
+    assert_equal "valueA", Rbbt::Config.get('key', 'token')
+    assert_equal "default", Rbbt::Config.get('key2', 'token', :default => 'default')
+
+    Rbbt::Config.with_config do 
+      Rbbt::Config.add_entry 'key', 'valueB', 'token'
+      Rbbt::Config.add_entry 'key2', 'valueB2', 'token'
+      assert_equal "valueB", Rbbt::Config.get('key', 'token')
+      assert_equal "valueB2", Rbbt::Config.get('key2', 'token', :default => 'default')
+    end
+
+    assert_equal "valueA", Rbbt::Config.get('key', 'token')
+    assert_equal "default", Rbbt::Config.get('key2', 'token', :default => 'default')
+  end
 end
 

metadata

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