rbbt-util 5.44.1 → 6.0.3

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

@@ -1,99 +1,99 @@
-module Log
-  class ProgressBar
-    BAR_MUTEX = Mutex.new
-    BARS = []
-    REMOVE = []
-    SILENCED = []
-
-    def self.add_offset(value = 1)
-      value = 1 if TrueClass === value
-      @@offset = offset + value.to_i
-      @@offset = 0 if @@offset < 0
-      @@offset
-    end
-
-    def self.remove_offset(value = 1)
-      value = 1 if TrueClass === value
-      @@offset = offset - value.to_i
-      @@offset = 0 if @@offset < 0
-      @@offset
-    end
-
-
-    def self.offset
-      @@offset ||= 0
-      @@offset = 0 if @@offset < 0
-      @@offset
-    end
-
-    def self.new_bar(max, options = {})
-      cleanup_bars
-      BAR_MUTEX.synchronize do
-        Log::LAST.replace "new_bar" if Log::LAST == "progress"
-        options = Misc.add_defaults options, :depth => BARS.length + Log::ProgressBar.offset
-        BARS << (bar = ProgressBar.new(max, options))
-        bar
-      end
-    end
-
-    def self.cleanup_bars
-      BAR_MUTEX.synchronize do
-        REMOVE.each do |bar|
-          index = BARS.index bar
-          if index
-            BARS.delete_at index
-            BARS.each_with_index do |bar,i|
-              bar.depth = i
-            end
-          end
-          index = SILENCED.index bar
-          if index
-            SILENCED.delete_at index
-            SILENCED.each_with_index do |bar,i|
-              bar.depth = i
-            end
-          end
-        end
-        REMOVE.clear
-        BARS.length
-      end
-    end
-
-    def self.remove_bar(bar, error = false)
-      BAR_MUTEX.synchronize do
-        return if REMOVE.include? bar
-      end
-      if error
-        bar.error if bar.respond_to? :error
-      else
-        bar.done if bar.respond_to? :done
-      end
-      BAR_MUTEX.synchronize do
-        REMOVE << bar
-      end
-      Log::LAST.replace "remove_bar" if Log::LAST == "progress"
-    end
-
-    def remove(error = false)
-      Log::ProgressBar.remove_bar self, error
-    end
-
-    def self.with_bar(max, options = {})
-      bar = new_bar(max, options)
-      res = nil
-      begin
-        error = false
-        keep = false
-        yield bar
-      rescue KeepBar
-        keep = true
-      rescue
-        error = true
-        raise $!
-      ensure
-        remove_bar(bar, error) if bar
-      end
-    end
-  end
-end
-
+#module Log
+#  class ProgressBar
+#    BAR_MUTEX = Mutex.new
+#    BARS = []
+#    REMOVE = []
+#    SILENCED = []
+#
+#    def self.add_offset(value = 1)
+#      value = 1 if TrueClass === value
+#      @@offset = offset + value.to_i
+#      @@offset = 0 if @@offset < 0
+#      @@offset
+#    end
+#
+#    def self.remove_offset(value = 1)
+#      value = 1 if TrueClass === value
+#      @@offset = offset - value.to_i
+#      @@offset = 0 if @@offset < 0
+#      @@offset
+#    end
+#
+#
+#    def self.offset
+#      @@offset ||= 0
+#      @@offset = 0 if @@offset < 0
+#      @@offset
+#    end
+#
+#    def self.new_bar(max, options = {})
+#      cleanup_bars
+#      BAR_MUTEX.synchronize do
+#        Log::LAST.replace "new_bar" if Log::LAST == "progress"
+#        options = Misc.add_defaults options, :depth => BARS.length + Log::ProgressBar.offset
+#        BARS << (bar = ProgressBar.new(max, options))
+#        bar
+#      end
+#    end
+#
+#    def self.cleanup_bars
+#      BAR_MUTEX.synchronize do
+#        REMOVE.each do |bar|
+#          index = BARS.index bar
+#          if index
+#            BARS.delete_at index
+#            BARS.each_with_index do |bar,i|
+#              bar.depth = i
+#            end
+#          end
+#          index = SILENCED.index bar
+#          if index
+#            SILENCED.delete_at index
+#            SILENCED.each_with_index do |bar,i|
+#              bar.depth = i
+#            end
+#          end
+#        end
+#        REMOVE.clear
+#        BARS.length
+#      end
+#    end
+#
+#    def self.remove_bar(bar, error = false)
+#      BAR_MUTEX.synchronize do
+#        return if REMOVE.include? bar
+#      end
+#      if error
+#        bar.error if bar.respond_to? :error
+#      else
+#        bar.done if bar.respond_to? :done
+#      end
+#      BAR_MUTEX.synchronize do
+#        REMOVE << bar
+#      end
+#      Log::LAST.replace "remove_bar" if Log::LAST == "progress"
+#    end
+#
+#    def remove(error = false)
+#      Log::ProgressBar.remove_bar self, error
+#    end
+#
+#    def self.with_bar(max, options = {})
+#      bar = new_bar(max, options)
+#      res = nil
+#      begin
+#        error = false
+#        keep = false
+#        yield bar
+#      rescue KeepBar
+#        keep = true
+#      rescue
+#        error = true
+#        raise $!
+#      ensure
+#        remove_bar(bar, error) if bar
+#      end
+#    end
+#  end
+#end
+#

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

@@ -1,102 +1,102 @@
-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"]).to_s == "true"
-  end
-
-  class ProgressBar
-
-    class << self
-      attr_accessor :default_file
-    end
-
-    attr_accessor :max, :ticks, :frequency, :depth, :desc, :file, :bytes, :process, :callback
-
-    def initialize(max = nil, options = {})
-      options = Misc.add_defaults options, :depth => 0, :num_reports => 100, :io => STDERR, :severity => Log.severity, :frequency => 2
-      depth, num_reports, desc, io, severity, file, bytes, frequency, process, callback = Misc.process_options options, :depth, :num_reports, :desc, :io, :severity, :file, :bytes, :frequency, :process, :callback
-
-      @max = max
-      @ticks = 0
-      @frequency = frequency
-      @last_time = nil
-      @last_count = nil
-      @last_percent = nil
-      @depth = depth
-      @desc = desc.nil? ? "" : desc.gsub(/\n/,' ')
-      @file = file
-      @bytes = bytes
-      @process = process
-      @callback = callback
-    end
-
-    def percent
-      return 0 if @ticks == 0
-      return 100 if @max == 0
-      (@ticks * 100) / @max
-    end
-
-    def file
-      @file || ProgressBar.default_file
-    end
-
-    def init
-      @ticks, @bytes = 0
-      @last_time = @last_count = @last_percent = nil
-      @history, @mean_max, @max_history = nil
-      @start = @last_time = Time.now
-      @last_count = 0
-      report
-    end
-
-    def tick(step = 1)
-      return if Log.no_bar
-      @ticks += step
-
-      time = Time.now
-      if @last_time.nil?
-        @last_time = time
-        @last_count = @ticks
-        @start = time
-        return
-      end
-
-      diff = time - @last_time
-      report and return if diff >= @frequency
-      return unless max and max > 0
-
-      percent = self.percent
-      if @last_percent.nil?
-        @last_percent = percent
-        return
-      end
-      report and return if percent > @last_percent and diff > 0.3
-    end
-
-    def pos(pos)
-      step = pos - (@ticks || 0)
-      tick(step)
-    end
-
-    def process(elem)
-      case res = @process.call(elem)
-      when FalseClass
-        nil
-      when TrueClass
-        tick
-      when Integer
-        pos(res)
-      when Float
-        pos(res * max)
-      end
-    end
-  end
-end
+#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
+#
+#    class << self
+#      attr_accessor :default_file
+#    end
+#
+#    attr_accessor :max, :ticks, :frequency, :depth, :desc, :file, :bytes, :process, :callback
+#
+#    def initialize(max = nil, options = {})
+#      options = Misc.add_defaults options, :depth => 0, :num_reports => 100, :io => STDERR, :severity => Log.severity, :frequency => 2
+#      depth, num_reports, desc, io, severity, file, bytes, frequency, process, callback = Misc.process_options options, :depth, :num_reports, :desc, :io, :severity, :file, :bytes, :frequency, :process, :callback
+#
+#      @max = max
+#      @ticks = 0
+#      @frequency = frequency
+#      @last_time = nil
+#      @last_count = nil
+#      @last_percent = nil
+#      @depth = depth
+#      @desc = desc.nil? ? "" : desc.gsub(/\n/,' ')
+#      @file = file
+#      @bytes = bytes
+#      @process = process
+#      @callback = callback
+#    end
+#
+#    def percent
+#      return 0 if @ticks == 0
+#      return 100 if @max == 0
+#      (@ticks * 100) / @max
+#    end
+#
+#    def file
+#      @file || ProgressBar.default_file
+#    end
+#
+#    def init
+#      @ticks, @bytes = 0
+#      @last_time = @last_count = @last_percent = nil
+#      @history, @mean_max, @max_history = nil
+#      @start = @last_time = Time.now
+#      @last_count = 0
+#      report
+#    end
+#
+#    def tick(step = 1)
+#      return if Log.no_bar
+#      @ticks += step
+#
+#      time = Time.now
+#      if @last_time.nil?
+#        @last_time = time
+#        @last_count = @ticks
+#        @start = time
+#        return
+#      end
+#
+#      diff = time - @last_time
+#      report and return if diff >= @frequency
+#      return unless max and max > 0
+#
+#      percent = self.percent
+#      if @last_percent.nil?
+#        @last_percent = percent
+#        return
+#      end
+#      report and return if percent > @last_percent and diff > 0.3
+#    end
+#
+#    def pos(pos)
+#      step = pos - (@ticks || 0)
+#      tick(step)
+#    end
+#
+#    def process(elem)
+#      case res = @process.call(elem)
+#      when FalseClass
+#        nil
+#      when TrueClass
+#        tick
+#      when Integer
+#        pos(res)
+#      when Float
+#        pos(res * max)
+#      end
+#    end
+#  end
+#end

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

@@ -0,0 +1,49 @@
+module Log
+
+  def self._ignore_stderr
+    begin
+      File.open('/dev/null', 'w') do |f|
+        backup_stderr = STDERR.dup
+        STDERR.reopen(f)
+        begin
+          yield
+        ensure
+          STDERR.reopen backup_stderr
+          backup_stderr.close
+        end
+      end
+    rescue Errno::ENOENT
+      yield
+    end
+  end
+
+
+  def self.ignore_stderr(&block)
+    _ignore_stderr &block
+  end
+
+  def self._ignore_stdout
+    begin
+      File.open('/dev/null', 'w') do |f|
+        backup_stdout = STDOUT.dup
+        STDOUT.reopen(f)
+        begin
+          yield
+        ensure
+          STDOUT.reopen backup_stdout
+          backup_stdout.close
+        end
+      end
+    rescue Errno::ENOENT
+      yield
+    end
+  end
+
+
+  def self.ignore_stdout(&block)
+    _ignore_stdout &block
+  end
+
+end
+
+Rbbt.relay_module_method Misc, :fingerprint, Log, :fingerprint