scout-gear 7.3.0 → 8.0.0

data/lib/scout/meta_extension.rb

@@ -2,7 +2,7 @@ module MetaExtension
   def self.extended(base)
     meta = class << base; self; end
 
-    base.class_variable_set("@@extension_attrs", [])
+    base.class_variable_set("@@extension_attrs", []) unless base.class_variables.include?("@@extension_attrs")
 
     meta.define_method(:extension_attr) do |*attrs|
       self.class_variable_get("@@extension_attrs").concat attrs
@@ -11,6 +11,14 @@ module MetaExtension
       end
     end
 
+    meta.define_method(:extended) do |obj|
+      attrs = self.class_variable_get("@@extension_attrs")
+
+      obj.instance_variable_set(:@extension_attrs, []) unless obj.instance_variables.include?(:@extension_attrs)
+      extension_attrs = obj.instance_variable_get(:@extension_attrs)
+      extension_attrs.concat attrs
+    end
+
     meta.define_method(:setup) do |*args,&block|
       if block_given?
         obj, rest = block, args
@@ -18,7 +26,8 @@ module MetaExtension
         obj, *rest = args
       end
       obj = block if obj.nil?
-      obj.extend base
+      obj.extend base unless base === obj
+
       attrs = self.class_variable_get("@@extension_attrs")
 
       return if attrs.nil? || attrs.empty?
@@ -27,8 +36,6 @@ module MetaExtension
           ((! (rlkey = rlast.keys.first).nil? && attrs.include?(rlkey.to_sym)) ||
            (! attrs.length != 1 ))
 
-          
-
         pairs = rlast
       else
         pairs = attrs.zip(rest)
@@ -43,14 +50,14 @@ module MetaExtension
 
     base.define_method(:extension_attr_hash) do 
       attr_hash = {}
-      meta.class_variable_get("@@extension_attrs").each do |name|
+      @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|
+      attr_values = @extension_attrs.collect do |a|
         self.instance_variable_get("@#{a}")
       end
       base.setup(other, *attr_values)

data/lib/scout/misc/digest.rb

@@ -40,7 +40,7 @@ module Misc
   end
 
   def self.digest(obj)
-    str = Misc.digest_str(obj)
+    str = String === obj ? obj : Misc.digest_str(obj)
     Digest::MD5.hexdigest(str)
   end
 

data/lib/scout/misc/format.rb

@@ -25,6 +25,18 @@ module Misc
     str
   end
 
+  CHAR_SENCONDS = ENV["SCOUT_NOCOLOR"] == "true" ? "sec" : "″"
+  def self.format_seconds_short(time)
+    if time < 0.0001
+      "%.5g" % time + CHAR_SENCONDS
+    elsif time < 60
+      "%.2g" % time + CHAR_SENCONDS
+    else
+      format_seconds(time)
+    end
+  end
+
+
   
   MAX_WIDTH = 100
   def self.format_paragraph(text, size = nil, indent = nil, offset = nil)

data/lib/scout/misc/insist.rb

@@ -32,7 +32,7 @@ module Misc
       end
       raise $!
     rescue Exception
-      Log.exception $! if ENV["RBBT_LOG_INSIST"] == 'true'
+      Log.exception $! if ENV["SCOUT_LOG_INSIST"] == 'true'
       if msg
         Log.warn("Insisting after exception: #{$!.class} #{$!.message} -- #{msg}")
       elsif FalseClass === msg

data/lib/scout/misc/monitor.rb

@@ -41,4 +41,15 @@ module Misc
 
     res
   end
+
+  def self.exec_time(&block)
+    start = Time.now
+    eend = nil
+    begin
+      yield
+    ensure
+      eend = Time.now
+    end
+    eend - start
+  end
 end

data/lib/scout/misc/system.rb

@@ -12,4 +12,14 @@ module Misc
       end
     end
   end
+
+  def self.with_env(var, value, &block)
+    old_value = ENV[var]
+    begin
+      ENV[var] = value
+      yield
+    ensure
+      ENV[var] = old_value
+    end
+  end
 end

data/lib/scout/named_array.rb

@@ -1,13 +1,25 @@
 require_relative 'meta_extension'
 module NamedArray
   extend MetaExtension
-  extension_attr :fields
+  extension_attr :fields, :key
 
-  def self.identify_name(names, selected)
+  def self.field_match(field, name)
+    if (String === field) && (String === name)
+      field == name || 
+        field.start_with?(name) || field.include?("(" + name + ")") ||
+        name.start_with?(field) || name.include?("(" + field + ")")
+    else
+      field == name
+    end
+  end
+
+  def self.identify_name(names, selected, strict: false)
     res = (Array === selected ? selected : [selected]).collect do |field|
       case field
       when nil
         0
+      when Range
+        field
       when Integer
         field
       when Symbol
@@ -26,7 +38,8 @@ module NamedArray
         if field =~ /^\d+$/
           next identify_names(names, field.to_i)
         end
-        pos = names.index{|name| name.start_with?(field) }
+        next pos if strict
+        pos = names.index{|name| field_match(field, name) }
         next pos if pos
         nil
       else
@@ -37,6 +50,10 @@ module NamedArray
     Array === selected ? res : res.first
   end
 
+  def identify_name(selected)
+    NamedArray.identify_name(fields, selected)
+  end
+
   def positions(fields)
     if Array ==  fields
       fields.collect{|field|
@@ -49,6 +66,7 @@ module NamedArray
 
   def [](key)
     pos = NamedArray.identify_name(@fields, key)
+    return nil if pos.nil?
     super(pos)
   end
 
@@ -65,4 +83,48 @@ module NamedArray
     end
     IndiferentHash.setup hash
   end
+
+  def values_at(*positions)
+    super(*identify_name(positions))
+  end
+
+  def self._zip_fields(array, max = nil)
+    return [] if array.nil? or array.empty? or (first = array.first).nil?
+
+    max = array.collect{|l| l.length }.max if max.nil?
+
+    rest = array[1..-1].collect{|v|
+      v.length == 1 & max > 1 ? v * max : v
+    }
+
+    first = first * max if first.length == 1 and max > 1
+
+    first.zip(*rest)
+  end
+
+  def self.zip_fields(array)
+    if array.length < 10000
+      _zip_fields(array)
+    else
+      zipped_slices = []
+      max = array.collect{|l| l.length}.max
+      array.each_slice(10000) do |slice|
+        zipped_slices << _zip_fields(slice, max)
+      end
+      new = zipped_slices.first
+      zipped_slices[1..-1].each do |rest|
+        rest.each_with_index do |list,i|
+          new[i].concat list
+        end
+      end
+      new
+    end
+  end
+
+  def self.add_zipped(source, new)
+    source.zip(new).each do |s,n|
+      s.concat(n)
+    end
+    source
+  end
 end