gltail 0.1.0 → 0.1.1

data/History.txt

@@ -1,4 +1,9 @@
-== 0.1.0 / 2008-02-??
+== 0.1.1 / 2008-02-17
+
+* Correctly sort Total and Average Blocks
+* Repair Average blocks after breaking it with adaptive sizes
+
+== 0.1.0 / 2008-02-16
 
 * Only sort needed Elements when needed
 * Keep Element List mostly sorted

data/lib/gl_tail.rb

@@ -5,7 +5,7 @@
 #
 
 module GlTail
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 
 begin

data/lib/gl_tail/block.rb

@@ -37,7 +37,6 @@ class Block
     @max_rate = 1.0/599
 
     @sorted = []
-    @updated = false
   end
 
   def show=(value)
@@ -122,8 +121,7 @@ class Block
     else
       x = @elements[options[:name]]
     end
-    x.add_activity(options[:message], @color || options[:color], options[:size] || 0.01, options[:type] || 0 )
-    @updated = true
+    x.add_activity(options[:message], @color || options[:color], options[:size] || 0.01, options[:type] || 0, options[:real_size] || options[:size] )
   end
 
   def add_event(options = { })
@@ -142,7 +140,6 @@ class Block
     end
 
     x.add_event(options[:message], options[:color] || @color, options[:update_stats] || false)
-    @updated = true
   end
 
   def update
@@ -151,48 +148,76 @@ class Block
     @max_rate = @max_rate * 0.9999
 
     startTime = Time.now
-
     i = 1
+    @sorted[0].update
     @ordered = [@sorted[0]]
-    min = @sorted[0].update
+    min_pos = 0
     size = @sorted.size
 
-    while i < size
-      rate = @sorted[i].update
-      if rate > min
-        j = i - 1
-        while @ordered[j-1].rate < rate && j > 0
-          j -= 1
+    if @show == 0
+      min = @sorted[0].rate
+      while i < size
+        @sorted[i].update
+        rate = @sorted[i].rate
+        if rate > min
+          j = min_pos
+          while @ordered[j-1].rate < rate && j > 0
+            j -= 1
+          end
+          @ordered.insert(j, @sorted[i])
+        else
+          @ordered << @sorted[i]
+          if i < @size
+            min = rate
+            min_pos = i
+          end
         end
-        @ordered.insert(j, @sorted[i])
-      else
-        @ordered << @sorted[i]
-        min = rate if i < @size
+        i += 1
+      end
+    elsif @show == 1
+      min = @sorted[0].total
+      while i < size
+        @sorted[i].update
+        total = @sorted[i].total
+        if total > min
+          j = min_pos
+          while @ordered[j-1].total < total && j > 0
+            j -= 1
+          end
+          @ordered.insert(j, @sorted[i])
+        else
+          @ordered << @sorted[i]
+          if i < @size
+            min = total
+            min_pos = i
+          end
+        end
+        i += 1
       end
-      i += 1
+    elsif @show == 2
+      min = @sorted[0].average
+      while i < size
+        @sorted[i].update
+        average = @sorted[i].average
+        if average > min
+          j = min_pos
+          while @ordered[j-1].average < average && j > 0
+            j -= 1
+          end
+          @ordered.insert(j, @sorted[i])
+        else
+          @ordered << @sorted[i]
+          if i < @size
+            min = average
+            min_pos = i
+          end
+        end
+        i += 1
+      end
+
     end
 
     @sorted = @ordered
-
-#    puts "#{@name} [#{@sorted.size}]: [#{Time.now - startTime}]" if @name == "urls"
-
-    return
-
-    return unless @updated
-
-    sortTime = Time.now
-#    iSort( @sorted )
-
-#    @sorted = case @show
-#              when 0: @sorted.insertionSort
-#              when 1: @sorted.sort! { |k,v| "#{sprintf('%05d',v.total)} #{v.rate}" <=> "#{sprintf('%05d',k.total)} #{k.rate}" }
-#              when 2: @sorted.sort! { |k,v| "#{v.average} #{v.name}" <=> "#{k.average} #{k.name}" }
-#              end
-
-    puts "#{@name} [#{@sorted.size}]: [#{sortTime - startTime}] [#{Time.now - sortTime}]"
-
-    @updated = false
-
   end
 
 end

data/lib/gl_tail/config.rb

@@ -160,20 +160,23 @@ module GlTail
 
     #block, message, size
     def add_activity(source, options = { })
-      size = screen.min_blob_size
-      if options[:size]
-        size = options[:size].to_f
-        @max_size = size if size > @max_size
-        size = screen.min_blob_size + ((size / @max_size) * (screen.max_blob_size - screen.min_blob_size))
-        options[:size] = size
-      end
 
       if block = @blocks_by_name[options[:block]]
+
+        size = screen.min_blob_size
+        if options[:size]
+          size = options[:size].to_f
+
+          options[:real_size] = size
+          @max_size = size if size > @max_size
+          options[:size] = screen.min_blob_size + ((size / @max_size) * (screen.max_blob_size - screen.min_blob_size))
+        end
+
         block.add_activity({
-          :name => source.name,
-          :color => source.color,
-          :size => screen.min_blob_size
-          }.update(options) )
+                             :name => source.name,
+                             :color => source.color,
+                             :size => screen.min_blob_size
+                           }.update(options) )
       end
     end
 

data/lib/gl_tail/element.rb

@@ -40,7 +40,7 @@ class Element
 
   end
 
-  def add_activity(message, color, size,  type)
+  def add_activity(message, color, size,  type, real_size)
     @bar_color[0] = @bar_color[0] + (@color[0] - @bar_color[0]) / 5
     @bar_color[1] = @bar_color[1] + (@color[1] - @bar_color[1]) / 5
     @bar_color[2] = @bar_color[2] + (@color[2] - @bar_color[2]) / 5
@@ -48,7 +48,7 @@ class Element
     @pending.push Item.new(message, size, color, type) if(type != 3)
     @messages += 1
     @total += 1
-    @sum += size
+    @sum += real_size
     @color = color
 
     if @rate == 0
@@ -76,7 +76,7 @@ class Element
     @messages = 0
     size = @pending.size
     if size > 0
-      @average = @sum / @total
+      @average = @sum / @total.to_f
 
       @step = 1.0 / size * 1000.0
       @queue = @pending

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gltail
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ""
 authors: 
 - Erlend Simonsen
@@ -29,7 +29,7 @@ cert_chain:
   /UfNqVgtDGy57Xw9DBNRbUm92FVILwpudQs3SX1z2Gik08RrKReELwpRciY=
   -----END CERTIFICATE-----
 
-date: 2008-02-16 00:00:00 +01:00
+date: 2008-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency