pong 0.1.0 → 0.2.0

data/History.txt

@@ -1,4 +1,8 @@
-== 0.0.1 2007-09-04
+== 0.2.0 2007-09-23
+
+fill out ping arrays, so that a ping that's lasted more than one second counts as a miss (until it actually returns)
+
+== 0.1.0
+
+give buffer a maximum size (one hour)
 
-* 1 major enhancement:
-  * Initial release

data/config/hoe.rb

@@ -27,7 +27,6 @@ Run 'rubyforge setup' to prepare your env for access to Rubyforge
   RUBYFORGE_USERNAME.replace @config["username"]
 end
 
-
 REV = nil 
 # UNCOMMENT IF REQUIRED: 
 # REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil

data/lib/pong.rb

@@ -5,10 +5,32 @@ require "fileutils"
 
 module Pong
   class Series < Array
-    MAX = 32767
+    MAX = 3600  # only save an hour of pings
+
+    def initialize(max = MAX)
+      @max = max
+      @offset = 0
+    end
+
+    def squeeze
+      while size >= @max
+        shift
+        @offset += 1
+      end
+    end
+
+    def []=(i, val)
+      squeeze
+      super(i-@offset, val)
+    end
+
+    def [](i)
+      squeeze
+      super(i-@offset)
+    end
 
     def num(n)
-      n = MAX if n.nil?
+      n = @max if n.nil?
       [n, size].min
     end
 
@@ -24,7 +46,7 @@ module Pong
     end
 
     def mean(n = MAX)
-      size == 0 ? 0 : sum(n) / num(n)
+      size == 0 ? 0 : sum(n).to_f / num(n)
     end
 
     def nils(n = MAX)
@@ -70,6 +92,11 @@ module Pong
       end
     end
 
+    def at_least(n)
+      # this fills out the array with nils if it needs to
+      @pings[n] = @pings[n] unless n < 0
+    end
+
     def missing(n=nil)
       pings.nils(n)
     end
@@ -112,7 +139,8 @@ module Pong
     end
 
     def stats(n = nil)
-      puts n.nil? ? "Entire run (#{first.pings.size} sec):" : "Last #{n} seconds:"
+      n = first.pings.size if n.nil?
+      puts "Last #{n} seconds:"
       puts first.header
       self.each do |host|
         puts host.stats(n)
@@ -120,8 +148,11 @@ module Pong
     end
 
     def run
+      start = Time.now
       each {|host| host.start }
       while true
+        secs_since_starting = Time.now - start
+        each {|host| host.at_least(secs_since_starting - 1) }
         system("clear")
         stats(10)
         puts

data/lib/pong/version.rb

@@ -1,7 +1,7 @@
 module Pong #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/test/test_series.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+
+class TestSeries < Test::Unit::TestCase
+
+  def test_only_fill_up_to_max
+    series = Pong::Series.new(2)
+    series[0] = 1
+    series[1] = 2
+    series[2] = 3
+    assert_equal 2.5, series.mean
+  end
+
+  def test_sum
+    series = Pong::Series.new
+    series[0] = 3
+    assert_equal 3, series.sum
+    series[1] = 6
+    assert_equal 9, series.sum
+    series[2] = 9
+    assert_equal 18, series.sum
+    
+    assert_equal 15, series.sum(2)
+  end
+
+  def test_mean
+    series = Pong::Series.new
+    series[0] = 3
+    assert_equal 3, series.mean
+    series[1] = 6
+    assert_equal 4.5, series.mean
+    series[2] = 9
+    assert_equal 6, series.mean
+
+    assert_equal 7.5, series.mean(2)
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: pong
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-09-04 00:00:00 -07:00
+  version: 0.2.0
+date: 2007-09-23 00:00:00 -07:00
 summary: pong is a wrapper for ping that adds statistics over time, multiple hosts, etc.
 require_paths: 
 - lib
@@ -52,6 +52,7 @@ files:
 test_files: 
 - test/test_helper.rb
 - test/test_pong.rb
+- test/test_series.rb
 rdoc_options: 
 - --main
 - README.txt