averager 0.0.4 → 0.1.0

data/lib/averager.rb

@@ -2,11 +2,23 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 class Averager
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
+  
+  module ArrayExtensions
+    def each_with_avg(options = {})
+      options[:expected] ||= self.length
+      Averager.new(options) do |a|
+        self.each do |element|
+          yield(element)
+          a.avg
+        end
+      end
+    end
+  end
   
   def initialize(options = {})
     @started = Time.now
-    @every = options[:every] || 1000
+    @every = options[:every] || 1.0
     if @expected = options[:expected]
       @digits = @expected.to_i.to_s.length
     end
@@ -36,7 +48,12 @@ class Averager
   end
   
   def print_current?
-    @i % @every == 0
+    if @last_printed.nil? || (Time.now - @last_printed) >= @every
+      @last_printed = Time.now
+      true
+    else
+      false
+    end
   end
   
   def print_current(status = nil)
@@ -78,18 +95,21 @@ class Averager
     end
     if print_current?
       print_current(status)
-      true
+      @printed_last = true
     else
-      false
+      @printed_last = false
     end
+    @printed_last
   end
   
   def finish
-    if !print_current?
+    if !@printed_last && !print_current?
       print_current
     end
     @stream.puts "\n" if @progress_bar
     @stream.puts "finished in #{Time.now - @started}"
     @stream.close if ![$stdout, $stderr].include?(@stream)
   end
-end
+end
+
+Array.send(:include, Averager::ArrayExtensions)

data/spec/averager_spec.rb

@@ -9,29 +9,28 @@ describe "Place your specs here" do
     TimeTravel.freeze_to Time.local(2009, 9, 9, 11, 20, 0)
   end
   
-  it "should log to a specific logfile" do
-    avg = Averager.new(:log_path => @log_path, :every => 1, :digits => 3)
+  it "should print the first every time" do
+    avg = Averager.new(:log_path => @log_path, :every => 10, :digits => 3)
     TimeTravel.jump(1)
     avg.avg(100, "test")
-    TimeTravel.jump(1)
-    avg.avg(300, "test")
-    File.read(@log_path).should == %(100 (100.0): test\n300 (150.0): test\n)
+    File.read(@log_path).should == %(100 (100.0): test\n)
   end
   
-  it "should only log every x time" do
-    avg = Averager.new(:log_path => @log_path, :every => 600)
-    TimeTravel.jump(1)
-    avg.avg(100, "100")
+  it "should only print every x seconds" do
+    avg = Averager.new(:log_path => @log_path, :every => 10, :digits => 3)
     TimeTravel.jump(1)
-    avg.avg(300, "300")
+    avg.avg(100, "test")
+    File.read(@log_path).should == %(100 (100.0): test\n)
     TimeTravel.jump(1)
-    avg.avg(600, "600")
-    avg.avg(601, "601")
-    File.read(@log_path).should == %(    600 (200.0): 600\n)
+    avg.avg(200, "test")
+    File.read(@log_path).should == %(100 (100.0): test\n)
+    TimeTravel.jump(9)
+    avg.avg(1100, "test")
+    File.read(@log_path).should == %(100 (100.0): test\n1100 (100.0): test\n)
   end
   
   it "should include a percentage and estimated end time" do
-    avg = Averager.new(:log_path => @log_path, :expected => 1000, :every => 250)
+    avg = Averager.new(:log_path => @log_path, :expected => 1000, :every => 1.0)
     TimeTravel.jump(1)
     avg.avg(500, "500")
     TimeTravel.jump(1)
@@ -40,7 +39,7 @@ describe "Place your specs here" do
   end
   
   it "should print a progress when asked for" do
-    avg = Averager.new(:log_path => @log_path, :expected => 1000, :every => 250, :progress_bar => true)
+    avg = Averager.new(:log_path => @log_path, :expected => 1000, :every => 1.0, :progress_bar => true)
     TimeTravel.jump(1)
     avg.avg(500, "500")
     File.read(@log_path).should == %( 500/1000 50.0% (500.0): 500)
@@ -50,7 +49,7 @@ describe "Place your specs here" do
   end
   
   it "should not be mandatory to call with integer" do
-    avg = Averager.new(:log_path => @log_path, :expected => 2, :every => 1)
+    avg = Averager.new(:log_path => @log_path, :expected => 2, :every => 1.0)
     TimeTravel.jump(1)
     avg.avg
     TimeTravel.jump(1)
@@ -77,6 +76,13 @@ describe "Place your specs here" do
       TimeTravel.jump(1)
       avg.avg
     end
-    File.read(@log_path).should == %(3/3 100.0% (1.0)\nfinished in 3.0\n)
+    File.read(@log_path).should == %(1/3 33.3% (1.0)\n3/3 100.0% (1.0)\nfinished in 3.0\n)
+  end
+  
+  it "should be able to average over an array" do
+    [1, 2, 3, 4].each_with_avg(:log_path => @log_path) do |i|
+      TimeTravel.jump(1)
+    end
+    File.read(@log_path).should == %(1/4 25.0% (1.0)\n2/4 50.0% (1.0)\n3/4 75.0% (1.0)\n4/4 100.0% (1.0)\nfinished in 4.0\n)
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: averager
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +02:00
+date: 2010-10-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -42,12 +40,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id002
 description: RubyGem to track long running processes.
@@ -91,7 +88,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -100,7 +96,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"