scout-gear 8.0.0 → 9.0.0

data/lib/scout/log/color.rb

@@ -10,8 +10,8 @@ module Colorize
 
   def self.colors
     @colors ||= IndiferentHash.setup(Hash[<<-EOF.split("\n").collect{|l| l.split(" ")}])
-green #00cd00 
-red #cd0000 
+green #00cd00
+red #cd0000
 yellow #ffd700
 blue #0000cd
 path blue
@@ -49,26 +49,26 @@ EOF
     when "black"
       '#fff'
     when 'green'
-      colors["green3"] 
+      colors["green3"]
     when 'red'
-      colors["red3"] 
+      colors["red3"]
     when 'yellow'
-      colors["gold1"] 
+      colors["gold1"]
     when 'blue'
-      colors["RoyalBlue"] 
+      colors["RoyalBlue"]
     else
       colors[color.to_s] || color.to_s
     end
   end
 
-  def self.continuous(array, start = "#40324F", eend = "#EABD5D", 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)
 
     if percent
       array = array.collect{|v| n = v.to_f; n = n > 100 ? 100 : n; n < 0.001 ? 0.001 : n}
     else
-      array = array.collect{|v| v.to_f } 
+      array = array.collect{|v| v.to_f }
     end
     max = array.max
     min = array.min
@@ -157,7 +157,7 @@ module Log
     :workflow => yellow,
   })
   HIGHLIGHT = "\033[1m"
-  
+
   def self.uncolor(str)
     "" << Term::ANSIColor.uncolor(str)
   end
@@ -167,7 +167,7 @@ module Log
   end
 
   def self.color(color, str = nil, reset = false)
-    return str.dup || "" if nocolor 
+    return str.dup || "" if nocolor
 
     if (color == :integer || color == :float) && Numeric === str
       color = if str < 0
@@ -179,7 +179,7 @@ module Log
               end
     end
 
-    if color == :status 
+    if color == :status
       color = case str.to_sym
               when :done
                 :green

data/lib/scout/log/progress/report.rb

@@ -4,8 +4,7 @@ module Log
     def print(io, str)
       return if self.severity && self.severity < Log.severity
       return if Log.no_bar
-      STDERR.print str
-      Log.logfile.puts str unless Log.logfile.nil?
+      Log.log_write str
       Log::LAST.replace "progress"
     end
 
@@ -57,9 +56,12 @@ module Log
         thr = short_mean
       else
         thr = begin
-                (@ticks || 1) / (Time.now - @start) 
-              rescue
-                1
+                d = Time.now - @start
+                if d == 0
+                  1
+                else
+                  (@ticks || 1) / d
+                end
               end
       end
 
@@ -159,6 +161,7 @@ module Log
     def save
       info = {:start => @start, :last_time => @last_time, :last_count => @last_count, :last_percent => @last_percent, :desc => @desc, :ticks => @ticks, :max => @max, :mean => @mean}
       info.delete_if{|k,v| v.nil?}
+      FileUtils.mkdir_p File.dirname(file) unless File.exist?(File.dirname(file))
       File.write(file, info.to_yaml)
     end
 

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

@@ -74,6 +74,7 @@ module Log
       BAR_MUTEX.synchronize do
         REMOVE << bar
       end
+      cleanup_bars
       Log::LAST.replace "remove_bar" if Log::LAST == "progress"
     end
 
@@ -128,6 +129,8 @@ module Log
             nil
           end
         end
+      rescue Interrupt
+        raise $!
       rescue Exception
         nil
       end

data/lib/scout/log/trap.rb

@@ -1,7 +1,7 @@
 module Log
   def self.trap_std(msg = "STDOUT", msge = "STDERR", severity = 0, severity_err = nil)
-    sout, sin = Misc.pipe
-    soute, sine = Misc.pipe
+    sout, sin = Open.pipe
+    soute, sine = Open.pipe
     backup_stderr = STDERR.dup
     backup_stdout = STDOUT.dup
     old_logfile = Log.logfile
@@ -38,7 +38,7 @@ module Log
   end
 
   def self.trap_stderr(msg = "STDERR", severity = 0)
-    sout, sin = Misc.pipe
+    sout, sin = Open.pipe
     backup_stderr = STDERR.dup
     old_logfile = Log.logfile
     Log.logfile(backup_stderr)

data/lib/scout/log.rb

@@ -12,9 +12,9 @@ module Log
   end
 
   SEVERITY_NAMES ||= begin
-                       names = %w(DEBUG LOW MEDIUM HIGH INFO WARN ERROR NONE ) 
+                       names = %w(DEBUG LOW MEDIUM HIGH INFO WARN ERROR NONE )
                        names.each_with_index do |name,i|
-                         eval "#{ name } = #{ i }" 
+                         eval "#{ name } = #{ i }"
                        end
                        names
                      end
@@ -32,14 +32,14 @@ module Log
     @@default_severity
   end
 
-  case ENV['SCOUT_LOG'] 
-  when 'DEBUG' 
+  case ENV['SCOUT_LOG']
+  when 'DEBUG'
     self.severity = DEBUG
-  when 'LOW' 
+  when 'LOW'
     self.severity = LOW
-  when 'MEDIUM' 
+  when 'MEDIUM'
     self.severity = MEDIUM
-  when 'HIGH' 
+  when 'HIGH'
     self.severity = HIGH
   when nil
     self.severity = default_severity
@@ -50,23 +50,29 @@ module Log
 
 
   def self.tty_size
-    @tty_size = begin
-                  IO.console.winsize.last
-                rescue
-                  begin
-                    `tput li`
-                  rescue
-                    80
-                  end
-                end
+    @@tty_size ||= Log.ignore_stderr do
+      size = begin
+               IO.console.winsize.last
+             rescue Exception
+               begin
+                 res = `tput li`
+                 res = nil if res == ""
+                 res || ENV["TTY_SIZE"] || 80
+               rescue Exception
+                 ENV["TTY_SIZE"] || 80
+               end
+             end
+      size = size.to_i if String === size
+      size
+    end
   end
 
 
   def self.last_caller(stack)
     line = nil
     pos ||= 0
-    while line.nil? or line =~ /scout\/log\.rb/ and stack.any? 
-      line = stack.shift 
+    while line.nil? or line =~ /scout\/log\.rb/ and stack.any?
+      line = stack.shift
     end
     line ||= caller.first
     line.gsub('`', "'")
@@ -129,9 +135,36 @@ module Log
     out.puts Log.return_line << " " * (Log.tty_size || 80) << Log.return_line unless nocolor
   end
 
+  MUTEX = Mutex.new
+  def self.log_write(str)
+    MUTEX.synchronize do
+      if logfile.nil?
+        begin
+          STDERR.write str
+        rescue
+        end
+      else
+        logfile.write str
+      end
+    end
+  end
+
+  def self.log_puts(str)
+    MUTEX.synchronize do
+      if logfile.nil?
+        begin
+          STDERR.puts str
+        rescue
+        end
+      else
+        logfile.puts str
+      end
+    end
+  end
+
   LAST = "log"
   def self.logn(message = nil, severity = MEDIUM, &block)
-    return if severity < self.severity 
+    return if severity < self.severity
     message ||= block.call if block_given?
     return if message.nil?
 
@@ -147,17 +180,14 @@ module Log
     message = "" << highlight << message << color(0) if severity >= INFO
     str = prefix << " " << message.to_s
 
-    if logfile.nil?
-      STDERR.write str
-    else
-      logfile.write str 
-    end
+    log_write str
+
     Log::LAST.replace "log"
     nil
   end
 
   def self.log(message = nil, severity = MEDIUM, &block)
-    return if severity < self.severity 
+    return if severity < self.severity
     message ||= block.call if block_given?
     return if message.nil?
     message = message + "\n" unless message[-1] == "\n"
@@ -241,6 +271,7 @@ module Log
       line = line.sub('`',"'")
       color = :green if line =~ /workflow/
       color = :blue if line =~ /scout-/
+      color = :cyan if line =~ /rbbt-/
       if color
         Log.color color, line
       else
@@ -250,9 +281,9 @@ module Log
   end
 
   def self.tsv(tsv, example = false)
-    STDERR.puts Log.color :magenta, "TSV log: " << Log.last_caller(caller).gsub('`',"'")
-    STDERR.puts Log.color(:blue, "=> "<< Log.fingerprint(tsv), true) 
-    STDERR.puts Log.color(:cyan, "=> " << tsv.summary)
+    log_puts Log.color :magenta, "TSV log: " << Log.last_caller(caller).gsub('`',"'")
+    log_puts Log.color(:blue, "=> "<< Log.fingerprint(tsv), true)
+    log_puts Log.color(:cyan, "=> " << tsv.summary)
     if example && ! tsv.empty?
       key = case example
             when TrueClass, :first, "first"
@@ -266,11 +297,11 @@ module Log
       values = tsv[key]
       values = [values] if tsv.type == :flat || tsv.type == :single
       if values.nil?
-        STDERR.puts Log.color(:blue, "Key (#{tsv.key_field}) not present: ") + key
+        log_puts Log.color(:blue, "Key (#{tsv.key_field}) not present: ") + key
       else
-        STDERR.puts Log.color(:blue, "Key (#{tsv.key_field}): ") + key
+        log_puts Log.color(:blue, "Key (#{tsv.key_field}): ") + key
         tsv.fields.zip(values).each do |field,value|
-          STDERR.puts Log.color(:magenta, field + ": ") + (Array === value ? value * ", " : value.to_s)
+          log_puts Log.color(:magenta, field + ": ") + (Array === value ? value * ", " : value.to_s)
         end
       end
     end
@@ -278,14 +309,14 @@ module Log
 
   def self.stack(stack)
     if ENV["SCOUT_ORIGINAL_STACK"] == 'true'
-      STDERR.puts Log.color :magenta, "Stack trace [#{Process.pid}]: " << Log.last_caller(caller)
+      log_puts Log.color :magenta, "Stack trace [#{Process.pid}]: " << Log.last_caller(caller)
       color_stack(stack).each do |line|
-        STDERR.puts line
+        log_puts line
       end
     else
-      STDERR.puts Log.color :magenta, "Stack trace [#{Process.pid}]: " << Log.last_caller(caller)
+      log_puts Log.color :magenta, "Stack trace [#{Process.pid}]: " << Log.last_caller(caller)
       color_stack(stack.reverse).each do |line|
-        STDERR.puts line
+        log_puts line
       end
     end
   end
@@ -293,7 +324,7 @@ module Log
   def self.count_stack
     if ! $count_stacks
       Log.debug "Counting stacks at: " << caller.first
-      return 
+      return
     end
     $stack_counts ||= {}
     head = $count_stacks_head

data/lib/scout/meta_extension.rb

@@ -62,5 +62,39 @@ module MetaExtension
       end
       base.setup(other, *attr_values)
     end
+
+    base.define_method(:purge) do
+      new = self.dup
+
+      if new.instance_variables.include?(:@extension_attrs)
+        new.instance_variable_get(:@extension_attrs).each do |a|
+          new.remove_instance_variable("@#{a}")
+        end
+        new.remove_instance_variable("@extension_attrs")
+      end
+
+      new
+    end
+  end
+
+  def self.is_extended?(obj)
+    obj.respond_to?(:extension_attr_hash)
+  end
+
+  def self.purge(obj)
+    case obj
+    when nil
+      nil
+    when Array
+      obj.collect{|e| purge(e) }
+    when Hash
+      new = {}
+      obj.each do |k,v|
+        new[k] = purge(v)
+      end
+      new
+    else
+      is_extended?(obj) ? obj.purge : obj
+    end
   end
 end

data/lib/scout/misc/digest.rb

@@ -1,4 +1,5 @@
 module Misc
+  MAX_ARRAY_DIGEST_LENGTH = 100_000
   def self.digest_str(obj)
     if obj.respond_to?(:digest_str)
       obj.digest_str
@@ -9,12 +10,19 @@ module Misc
         if Path === obj || ! Open.exists?(obj)
           '\'' << obj << '\''
         else
-          Misc.file_md5(obj)
+          "File MD5: #{Misc.file_md5(obj)}"
         end
       when Integer, Symbol
         obj.to_s
       when Array
-        '[' << obj.inject(""){|acc,o| acc.empty? ? Misc.digest_str(o) : acc << ', ' << Misc.digest_str(o) } << ']'
+        if obj.length > MAX_ARRAY_DIGEST_LENGTH
+          length = obj.length
+          mid = length/2
+          sample_pos = [1, 2, mid, length-2, length-1]
+          "[#{length}:" << obj.values_at(*sample_pos).inject(""){|acc,o| acc.empty? ? Misc.digest_str(o) : acc << ', ' << Misc.digest_str(o) } << ']'
+        else
+          '[' << obj.inject(""){|acc,o| acc.empty? ? Misc.digest_str(o) : acc << ', ' << Misc.digest_str(o) } << ']'
+        end
       when Hash
         '{' << obj.inject(""){|acc,p| s = Misc.digest_str(p.first) << "=" << Misc.digest_str(p.last); acc.empty? ? s : acc << ', ' << s } << '}'
       when Integer
@@ -46,6 +54,7 @@ module Misc
 
   def self.file_md5(file)
     file = file.find if Path === file
+    file = File.expand_path(file)
     #md5file = file + '.md5'
     Persist.persist("MD5:#{file}", :string) do
       Digest::MD5.file(file).hexdigest

data/lib/scout/misc/filesystem.rb

@@ -16,11 +16,10 @@ module Misc
 
     basedir += "/" unless basedir.slice(-2,-1) == "/"
 
-    if path.index(basedir) == 0
-      return path[basedir.length..-1]
+    if path.start_with?(basedir)
+      return path.slice(basedir.length, basedir.length)
     else
       return nil
     end
   end
-
 end

data/lib/scout/misc/format.rb

@@ -38,10 +38,10 @@ module Misc
 
 
   
-  MAX_WIDTH = 100
+  MAX_TTY_LINE_WIDTH = 100
   def self.format_paragraph(text, size = nil, indent = nil, offset = nil)
-    size ||= Log.tty_size || MAX_WIDTH
-    size = MAX_WIDTH if size > MAX_WIDTH
+    size ||= Log.tty_size || MAX_TTY_LINE_WIDTH
+    size = MAX_TTY_LINE_WIDTH if size > MAX_TTY_LINE_WIDTH
     indent ||= 0
     offset ||= 0
 
@@ -75,9 +75,14 @@ module Misc
   end
 
   def self.format_definition_list_item(dt, dd,  indent = nil, size = nil, color = :yellow)
-    size ||= Log.tty_size || MAX_WIDTH
-    size = MAX_WIDTH if size > MAX_WIDTH
-    indent ||= size / 3
+    if size.nil?
+      base_size = MAX_TTY_LINE_WIDTH
+      base_indent = indent || (base_size / 3)
+      size = base_size - base_indent
+    end
+
+    indent ||= base_indent || size / 3
+
     dd = "" if dd.nil?
     dt = Log.color color, dt if color
     dt = dt.to_s  unless dd.empty?
@@ -96,8 +101,8 @@ module Misc
   end
 
   def self.format_definition_list(defs, indent = nil, size = nil, color = :yellow, sep = "\n\n")
-    size ||= Log.tty_size || MAX_WIDTH
     indent ||= 30
+    size ||= (Log.tty_size || MAX_TTY_LINE_WIDTH) - indent
     entries = []
     defs.each do |dt,dd|
       text = format_definition_list_item(dt,dd,indent, size,color)

data/lib/scout/misc/monitor.rb

@@ -2,6 +2,7 @@ module Misc
   def self.pid_alive?(pid)
     !! Process.kill(0, pid) rescue false
   end
+
   def self.benchmark(repeats = 1, message = nil)
     require 'benchmark'
     res = nil
@@ -52,4 +53,14 @@ module Misc
     end
     eend - start
   end
+
+  def self.wait_for_interrupt
+    while true
+      begin
+        sleep 1
+      rescue Interrupt
+        break
+      end
+    end
+  end
 end

data/lib/scout/misc/system.rb

@@ -1,4 +1,18 @@
+require 'sys/proctable'
+
 module Misc
+
+  def self.hostname
+    @@hostname ||= begin
+                     `hostname`.strip
+                   end
+  end
+
+  def self.children(ppid = nil)
+    ppid ||= Process.pid
+    Sys::ProcTable.ps.select{ |pe| pe.ppid == ppid }
+  end
+
   def self.env_add(var, value, sep = ":", prepend = true)
     if ENV[var].nil?
       ENV[var] = value
@@ -22,4 +36,38 @@ module Misc
       ENV[var] = old_value
     end
   end
+  
+  def self.update_git(gem_name = 'scout-gear')
+    gem_name = 'scout-gear' if gem_name.nil?
+    dir = File.join(__dir__, '../../../../', gem_name)
+    return unless Open.exist?(dir)
+    Misc.in_dir dir do
+      begin
+        begin
+          CMD.cmd_log('git pull')
+        rescue
+          raise "Could not update #{gem_name}"
+        end
+
+        begin
+          CMD.cmd_log('git submodule update')
+        rescue
+          raise "Could not update #{gem_name} submodules"
+        end
+
+
+        begin
+          CMD.cmd_log('rake install')
+        rescue
+          raise "Could not install updated #{gem_name}"
+        end
+      rescue
+        Log.warn $!.message
+      end
+    end
+  end
+
+  def self.processors
+    Etc.nprocessors
+  end
 end

data/lib/scout/named_array.rb

@@ -127,4 +127,12 @@ module NamedArray
     end
     source
   end
+
+  def method_missing(name, *args)
+    if identify_name(name)
+      return self[name]
+    else
+      return super(name, *args)
+    end
+  end
 end