scout-gear 2.0.0 → 5.2.0

data/lib/scout/log/color.rb

@@ -63,7 +63,7 @@ module Colorize
     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| n = v.to_f; } 
+      array = array.collect{|v| v.to_f } 
     end
     max = array.max
     min = array.min
@@ -103,7 +103,7 @@ module Colorize
 
     value_color = Hash[*array.uniq.zip(all_colors).flatten]
 
-    value_color.values_at *array
+    value_color.values_at(*array)
   end
 
   def self.tsv(tsv, options = {})

data/lib/scout/log/fingerprint.rb

@@ -19,8 +19,12 @@ module Log
       else 
         "'" << obj << "'"
       end
+    when ConcurrentStream
+      name = obj.inspect + " " + obj.object_id.to_s
+      name += " #{obj.filename}" if obj.filename
+      name
     when IO
-      (obj.respond_to?(:filename) and obj.filename ) ? "<IO:" + (obj.filename || obj.inspect + rand(100000)) + ">" : obj.inspect
+      (obj.respond_to?(:filename) and obj.filename ) ? "<IO:" + (obj.filename || obj.inspect + rand(100000)) + ">" : obj.inspect + " " + obj.object_id.to_s
     when File
       "<File:" + obj.path + ">"
     when Array
@@ -52,6 +56,12 @@ module Log
       else
         "%.6f" % obj
       end
+    when Thread
+      if obj["name"]
+        obj["name"]
+      else
+        obj.inspect
+      end
     else
       obj.to_s
     end

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

@@ -169,7 +169,6 @@ module Log
           bar = bars.sort_by{|b| b.depth }.first
           print(io, Log.color(:magenta ,bar.report_msg) << "\n") 
         else
-          length = Log::ProgressBar.cleanup_bars
           print(io, Log.color(:magenta, "···Progress\n"))
           bars.sort_by{|b| b.depth }.reverse.each do |bar|
             if SILENCED.include? bar

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

@@ -91,7 +91,7 @@ module Log
         error = true
         raise $!
       ensure
-        remove_bar(bar, error) if bar
+        remove_bar(bar, error) if bar && ! keep
       end
     end
   end

data/lib/scout/log/progress.rb

@@ -17,12 +17,12 @@ module Log
       attr_accessor :default_file
     end
 
-    attr_accessor :max, :ticks, :frequency, :depth, :desc, :file, :bytes, :process, :callback
+    attr_accessor :max, :ticks, :frequency, :depth, :desc, :file, :bytes, :process, :callback, :severity
 
     def initialize(max = nil, options = {})
-      depth, num_reports, desc, io, severity, file, bytes, frequency, process, callback = 
-        IndiferentHash.process_options options, :depth, :num_reports, :desc, :io, :severity, :file, :bytes, :frequency, :process, :callback,
-        :depth => 0, :num_reports => 100, :io => STDERR, :severity => Log.severity, :frequency => 2
+      depth, desc, file, bytes, frequency, process, callback = 
+        IndiferentHash.process_options options, :depth, :desc, :file, :bytes, :frequency, :process, :callback,
+        :depth => 0, :frequency => 2
 
       @max = max
       @ticks = 0

data/lib/scout/log.rb

@@ -14,8 +14,8 @@ module Log
                      end
 
   class << self
-    attr_accessor :logfile, :severity
-    attr_writer :tty_size
+    attr_accessor :severity
+    attr_writer :tty_size, :logfile
   end
 
 
@@ -360,3 +360,11 @@ def eef(obj=nil, file = $stdout)
   Log.log_obj_fingerprint(obj, :error, file)
 end
 
+def sss(level, &block)
+  if block_given?
+    Log.with_severity level, &block
+  else
+    Log.severity = level
+  end
+end
+

data/lib/scout/meta_extension.rb

@@ -11,15 +11,23 @@ module MetaExtension
       end
     end
 
-    meta.define_method(:setup) do |obj,*rest|
+    meta.define_method(:setup) do |*args,&block|
+      if block_given?
+        obj, rest = block, args
+      else
+        obj, *rest = args
+      end
+      obj = block if obj.nil?
       obj.extend base
       attrs = self.class_variable_get("@@extension_attrs")
 
       return if attrs.nil? || attrs.empty?
 
       if rest.length == 1 && Hash === (rlast = rest.last) && 
-          ! (rlkey = rlast.keys.first).nil? &&
-          attrs.include?(rlkey.to_sym)
+          ((! (rlkey = rlast.keys.first).nil? && attrs.include?(rlkey.to_sym)) ||
+           (! attrs.length != 1 ))
+
+          
 
         pairs = rlast
       else
@@ -33,6 +41,14 @@ module MetaExtension
       obj
     end
 
+    base.define_method(:extension_attr_hash) do 
+      attr_hash = {}
+      meta.class_variable_get("@@extension_attrs").each do |name|
+        attr_hash[name] = self.instance_variable_get("@#{name}")
+      end
+      attr_hash
+    end
+
     base.define_method(:annotate) do |other|
       attr_values = meta.class_variable_get("@@extension_attrs").collect do |a|
         self.instance_variable_get("@#{a}")

data/lib/scout/misc/digest.rb

@@ -0,0 +1,56 @@
+module Misc
+  def self.digest_str(obj)
+    if obj.respond_to?(:digest_str)
+      obj.digest_str
+    else
+      case obj
+      when String
+        #'\'' << obj << '\''
+        if Path === obj || ! Open.exists?(obj)
+          '\'' << obj << '\''
+        else
+          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) } << ']'
+      when Hash
+        '{' << obj.inject(""){|acc,p| s = Misc.digest_str(p.first) << "=" << Misc.digest_str(p.last); acc.empty? ? s : acc << ', ' << s } << '}'
+      when Integer
+        obj.to_s
+      when Float
+        if obj % 1 == 0
+          obj.to_i
+        elsif obj.abs > 10
+          "%.1f" % obj
+        elsif obj.abs > 1
+          "%.3f" % obj
+        else
+          "%.6f" % obj
+        end
+      when TrueClass
+        "true"
+      when FalseClass
+        "false"
+      else
+        obj.inspect
+      end
+    end
+  end
+
+  def self.digest(obj)
+    str = Misc.digest_str(obj)
+    hash = Digest::MD5.hexdigest(str)
+    Log.debug "Digest #{hash} - #{str}"
+    hash
+  end
+
+  def self.file_md5(file)
+    file = file.find if Path === file
+    #md5file = file + '.md5'
+    Persist.persist("MD5:#{file}", :string) do
+      Digest::MD5.file(file).hexdigest
+    end
+  end
+end

data/lib/scout/misc/filesystem.rb

@@ -0,0 +1,26 @@
+module Misc
+  def self.in_dir(dir)
+    old_pwd = FileUtils.pwd
+    begin
+      FileUtils.mkdir_p dir unless File.exist?(dir)
+      FileUtils.cd dir
+      yield
+    ensure
+      FileUtils.cd old_pwd
+    end
+  end
+
+  def self.path_relative_to(basedir, path)
+    path = File.expand_path(path) unless path.slice(0,1) == "/"
+    basedir = File.expand_path(basedir) unless basedir.slice(0,1) == "/"
+
+    basedir += "/" unless basedir.slice(-2,-1) == "/"
+
+    if path.index(basedir) == 0
+      return path[basedir.length..-1]
+    else
+      return nil
+    end
+  end
+
+end

data/lib/scout/misc/format.rb

@@ -25,7 +25,14 @@ module Misc
     str
   end
 
-  def self.format_paragraph(text, size = 80, indent = 0, offset = 0)
+  
+  MAX_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
+    indent ||= 0
+    offset ||= 0
+
     i = 0
     size = size + offset + indent
     re = /((?:\n\s*\n\s*)|(?:\n\s*(?=\*)))/
@@ -55,7 +62,10 @@ module Misc
       end*""
   end
 
-  def self.format_definition_list_item(dt, dd, size = 80, indent = 20, color = :yellow)
+  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
     dd = "" if dd.nil?
     dt = Log.color color, dt if color
     dt = dt.to_s  unless dd.empty?
@@ -73,10 +83,12 @@ module Misc
     text
   end
 
-  def self.format_definition_list(defs, size = 80, indent = 20, color = :yellow, sep = "\n\n")
+  def self.format_definition_list(defs, indent = nil, size = nil, color = :yellow, sep = "\n\n")
+    size ||= Log.tty_size || MAX_WIDTH
+    indent ||= 30
     entries = []
     defs.each do |dt,dd|
-      text = format_definition_list_item(dt,dd,size,indent,color)
+      text = format_definition_list_item(dt,dd,indent, size,color)
       entries << text
     end
     entries * sep 
@@ -101,7 +113,7 @@ module Misc
     string.
       gsub(/([A-Z]{2,})([A-Z][a-z])/,'\1_\2').
       gsub(/([a-z])([A-Z])/,'\1_\2').
-      gsub(/\s/,'_').gsub(/[^\w_]/, '').
+      gsub(/\s/,'_').gsub(/[^\w]/, '').
       split("_").collect{|p| p.match(/[A-Z]{2,}/) ? p : p.downcase } * "_"
   end
 
@@ -223,5 +235,4 @@ module Misc
     end
     values
   end
-
 end

data/lib/scout/misc/insist.rb

@@ -0,0 +1,56 @@
+module Misc
+  def self.insist(times = 4, sleep = nil, msg = nil)
+    sleep_array = nil
+
+    try = 0
+    begin
+      begin
+        yield
+      rescue Exception
+        if Array === times
+          sleep_array = times
+          times = sleep_array.length
+          sleep = sleep_array.shift
+        end
+
+        if sleep.nil?
+          sleep_array = ([0] + [0.001, 0.01, 0.1, 0.5] * (times / 3)).sort[0..times-1]
+          sleep = sleep_array.shift
+        end
+        raise $!
+      end
+    rescue TryAgain
+      sleep sleep
+      retry
+    rescue StopInsist
+      raise $!.exception
+    rescue Aborted, Interrupt
+      if msg
+        Log.warn("Not Insisting after Aborted: #{$!.message} -- #{msg}")
+      else
+        Log.warn("Not Insisting after Aborted: #{$!.message}")
+      end
+      raise $!
+    rescue Exception
+      Log.exception $! if ENV["RBBT_LOG_INSIST"] == 'true'
+      if msg
+        Log.warn("Insisting after exception: #{$!.class} #{$!.message} -- #{msg}")
+      elsif FalseClass === msg
+        nil
+      else
+        Log.warn("Insisting after exception:  #{$!.class} #{$!.message}")
+      end
+
+      if sleep and try > 0
+        sleep sleep
+        sleep = sleep_array.shift || sleep if sleep_array
+      else
+        Thread.pass
+      end
+
+      try += 1
+      retry if try < times
+      raise $!
+    end
+  end
+end

data/lib/scout/misc/monitor.rb

@@ -0,0 +1,23 @@
+module Misc
+  def self.benchmark(repeats = 1, message = nil)
+    require 'benchmark'
+    res = nil
+    begin
+      measure = Benchmark.measure do
+        repeats.times do
+          res = yield
+        end
+      end
+      if message
+        puts "#{message }: #{ repeats } repeats"
+      else
+        puts "Benchmark for #{ repeats } repeats"
+      end
+      puts measure
+    rescue Exception
+      puts "Benchmark aborted"
+      raise $!
+    end
+    res
+  end
+end

data/lib/scout/misc.rb

@@ -1,14 +1,8 @@
 require_relative 'misc/format'
-module Misc
-  def self.in_dir(dir)
-    old_pwd = FileUtils.pwd
-    begin
-      FileUtils.mkdir_p dir unless File.exist?(dir)
-      FileUtils.cd dir
-      yield
-    ensure
-      FileUtils.cd old_pwd
-    end
-  end
+require_relative 'misc/insist'
+require_relative 'misc/digest'
+require_relative 'misc/filesystem'
+require_relative 'misc/monitor'
 
+module Misc
 end

data/lib/scout/open/lock.rb

@@ -0,0 +1,61 @@
+require_relative '../path'
+require_relative '../log'
+require_relative '../exceptions'
+require 'lockfile'
+
+module Open
+  def self.lock(file, unlock = true, options = {})
+    unlock, options = true, unlock if Hash === unlock
+    return yield if file.nil? and not Lockfile === options[:lock]
+
+    if Lockfile === file
+      lockfile = file
+    else
+      file = file.find if Path === file
+      FileUtils.mkdir_p File.dirname(File.expand_path(file)) unless File.exist? File.dirname(File.expand_path(file))
+
+      case options[:lock]
+      when Lockfile
+        lockfile = options[:lock]
+      when FalseClass
+        lockfile = nil
+        unlock = false
+      when Path, String
+        lock_path = options[:lock].find
+        lockfile = Lockfile.new(lock_path, options)
+      else
+        lock_path = File.expand_path(file + '.lock')
+        lockfile = Lockfile.new(lock_path, options)
+      end
+    end
+
+    begin
+      lockfile.lock unless lockfile.nil? || lockfile.locked?
+    rescue Aborted, Interrupt
+      raise LockInterrupted
+    end
+
+    res = nil
+
+    begin
+      res = yield lockfile
+    rescue KeepLocked
+      unlock = false
+      res = $!.payload
+    ensure
+      if unlock 
+        begin
+          if lockfile.locked?
+            lockfile.unlock 
+          else
+          end
+        rescue Exception
+          Log.warn "Exception unlocking: #{lockfile.path}"
+          Log.exception $!
+        end
+      end
+    end
+
+    res
+  end
+end

data/lib/scout/open/remote.rb

@@ -0,0 +1,120 @@
+require_relative '../misc'
+require_relative '../path'
+require_relative '../cmd'
+
+module Open
+  class << self
+    attr_accessor :remote_cache_dir
+    
+    def remote_cache_dir
+      @remote_cache_dir ||= Path.setup("var/cache/open-remote/").find
+    end
+  end
+
+  def self.remote?(file)
+    !! (file =~ /^(?:https?|ftp|ssh):\/\//)
+  end
+
+  def self.ssh?(file)
+    !! (file =~ /^ssh:\/\//)
+  end
+
+  def self.ssh(file, options = {})
+    m = file.match(/ssh:\/\/([^:]+):(.*)/)
+    server = m[1]
+    file = m[2]
+    CMD.cmd("ssh '#{server}' cat '#{file}'", :pipe => true, :autojoin => true)
+  end
+
+  def self.wget(url, options = {})
+    if ! (options[:force] || options[:nocache]) && cache_file = in_cache(url, options)
+      return file_open(cache_file)
+    end
+
+    Log.low "WGET:\n -URL: #{ url }\n -OPTIONS: #{options.inspect}"
+    options = IndiferentHash.add_defaults options, "--user-agent=" => 'rbbt', :pipe => true, :autojoin => true
+
+    wait(options[:nice], options[:nice_key]) if options[:nice]
+    options.delete(:nice)
+    options.delete(:nice_key)
+
+    pipe  = options.delete(:pipe)
+    quiet = options.delete(:quiet)
+    post  = options.delete(:post)
+    cookies = options.delete(:cookies)
+    nocache = options.delete(:nocache)
+
+    options["--quiet"]     = quiet if options["--quiet"].nil?
+    options["--post-data="] ||= post if post
+
+    if cookies
+      options["--save-cookies"] = cookies
+      options["--load-cookies"] = cookies
+      options["--keep-session-cookies"] = true
+    end
+
+    stderr = case
+             when options['stderr']
+               options['stderr'] 
+             when options['--quiet']
+               false
+             else
+               nil
+             end
+
+    begin
+      wget_options = options.dup
+      wget_options = wget_options.merge( '-O' => '-') unless options.include?('--output-document')
+      wget_options[:pipe] = pipe unless pipe.nil?
+      wget_options[:stderr] = stderr unless stderr.nil?
+
+      io = CMD.cmd("wget '#{ url }'", wget_options)
+      if nocache && nocache.to_s != 'update'
+        io
+      else
+        add_cache(url, io, options)
+        open_cache(url, options)
+      end
+    rescue
+     STDERR.puts $!.backtrace.inspect
+     raise OpenURLError, "Error reading remote url: #{ url }.\n#{$!.message}"
+    end
+  end
+
+  def self.digest_url(url, options = {})
+    params = [url, options.values_at("--post-data", "--post-data="), (options.include?("--post-file")? Open.read(options["--post-file"]).split("\n").sort * "\n" : "")]
+    Misc.digest([url, params])
+  end
+
+  def self.cache_file(url, options)
+    File.join(self.remote_cache_dir, digest_url(url, options))
+  end
+
+  def self.in_cache(url, options = {})
+    filename = cache_file(url, options)
+    if File.exist? filename
+      return filename 
+    else
+      nil
+    end
+  end
+ 
+  def self.remove_from_cache(url, options = {})
+    filename = cache_file(url, options)
+    if File.exist? filename
+      FileUtils.rm filename 
+    else
+      nil
+    end
+  end
+  
+  def self.add_cache(url, data, options = {})
+    filename = cache_file(url, options)
+    Open.sensible_write(filename, data, :force => true)
+  end
+
+  def self.open_cache(url, options = {})
+    filename = cache_file(url, options)
+    Open.open(filename)
+  end
+end