babysitter 0.0.12 → 0.0.14

data/lib/babysitter.rb

@@ -9,6 +9,7 @@ require_relative "babysitter/tracker"
 require_relative "babysitter/monitor"
 require_relative "babysitter/counter"
 require_relative "babysitter/exception_notifiers"
+require_relative "babysitter/logger_with_deprecation"
 require 'fozzie'
 
 module Babysitter

data/lib/babysitter/counter.rb

@@ -12,7 +12,7 @@ module Babysitter
       @log_every = log_every
       @stat_name = opts.delete(:stat_name)
       @counting = opts.delete(:counting)
-      @timer_start = Time.now
+      @timer_start = opts.delete(:timer_start) || Time.now
     end
 
     def inc( template, amount=1, opts={} )

data/lib/babysitter/logger_with_deprecation.rb

@@ -0,0 +1,53 @@
+module Babysitter
+
+  class LoggerWithDeprecation
+
+    attr_reader :delegate
+    
+    def initialize(opts={})
+      @delegate = opts.delete(:logger) || Babysitter.configuration.logger
+    end
+
+    def self.notice(caller)
+      return if caller_has_been_logged?(caller)
+      Kernel.warn("[DEPRECATED] You are using old style logging. Please use tracker (yielded by monitor.start) instead. Caller was #{caller.first}")
+      Kernel.warn("[DEPRECATED] See https://github.com/lonelyplanet/rowlf/blob/master/LOGGING.md for more info")
+    end
+
+    def warn(*args)
+      self.class.notice(caller)
+      delegate.warn(*args)
+    end
+
+    def error(*args)
+      self.class.notice(caller)
+      delegate.error(*args)
+    end
+
+    def info(*args)
+      delegate.info(*args)
+    end
+
+    def debug(*args)
+      delegate.debug(*args)
+    end
+
+    def fatal(*args)
+      delegate.fatal(*args)
+    end
+
+    private
+
+    def self.caller_has_been_logged?(caller)
+      return true if caller_seen.include?(caller.first)
+      caller_seen << caller.first
+      return false
+    end
+
+    def self.caller_seen
+      @caller_seen ||= []
+    end
+
+  end
+
+end

data/lib/babysitter/tracker.rb

@@ -2,18 +2,26 @@ module Babysitter
   class Tracker
     include Logging
 
-    attr_reader :counting, :stat_name, :counter
+    attr_reader :counting, :stat_name, :timer_start
     attr_accessor :log_every
 
     def initialize(log_every, stat_name=nil)
       @stat_name = stat_name
-      @counting = :iterations
+      @counting = default_counting
       @log_every = log_every
-      @counter = Counter.new(log_every, stat_name: stat_name, counting: counting)
+      @timer_start = Time.now
+      @counters = Hash.new do |h, k|
+        h[k] = Counter.new(log_every, stat_name: stat_name, counting: k, timer_start: timer_start)
+      end
     end
 
-    def inc(*args)
-      counter.inc(*args)
+    def inc(template, inc=1, opts={})
+      counting = opts[:counting] || default_counting
+      counter(counting).inc(template, inc, opts)
+    end
+
+    def counter(counting=default_counting)
+      @counters[counting]
     end
 
     def count
@@ -21,7 +29,9 @@ module Babysitter
     end
 
     def final_report
-      counter.log_counter_messsage if counter.final_report?
+      @counters.values.each do |counter|
+        counter.log_counter_messsage if counter.final_report?
+      end
     end
 
     def warn(topic_name, message)
@@ -33,7 +43,9 @@ module Babysitter
     end
 
     def send_total_stats
-      counter.send_total_stats
+      @counters.values.each do |counter|
+        counter.send_total_stats
+      end
     end
 
     def logger_with_stats_for(topic_name)
@@ -47,6 +59,10 @@ module Babysitter
       stat_name+[topic_name] 
     end
 
+    def default_counting
+      :iterations
+    end
+
   end
 
 end

data/lib/babysitter/version.rb

@@ -1,3 +1,3 @@
 module Babysitter
-  VERSION = "0.0.12"
+  VERSION = "0.0.14"
 end

data/spec/lib/babysitter/monitor_spec.rb

@@ -115,6 +115,24 @@ module Babysitter
           end
         end # context 'when logging every 10th call, and the block increments the counter 7 times, each with a count of 9, and identifies counted objects' do
 
+        context 'when the block logs 3 increments to oranges counter, and 5 increments to apples:' do 
+          let(:start_block_3_oranges_5_apples) do
+            Proc.new do |tracker|
+              3.times{ tracker.inc('{{count}} oranges counted', 1, counting: :orangey_things) }
+              5.times{ tracker.inc('{{count}} apples counted', 1, counting: :appley_things) }
+            end
+          end
+          
+          it 'calls logger with 3 oranges counted and 5 apples counted' do
+            Counter.any_instance.stub(:logger).and_return(logger)
+            logger.stub(:info).with(anything) 
+            logger.should_receive(:info).with(/3 oranges counted/)
+            logger.should_receive(:info).with(/5 apples counted/)
+            subject.start('short message', 10, &start_block_3_oranges_5_apples)
+          end
+
+        end # context 'when the block logs 3 increments to oranges counter, and 5 increments to apples:' do 
+
         context "when the block logs a warning" do 
           let(:start_block_with_warning) do
             Proc.new do |monitor|

data/spec/lib/babysitter/tracker_spec.rb

@@ -75,7 +75,68 @@ module Babysitter
 
     end # describe 'logger returned by logger_with_stats_for(:something)' do
 
-  end
+    describe 'counting:' do
+
+      context 'inc called 3 times, with no :counting' do
+        before(:each) do
+          subject.inc('some message', 3)
+          logger.stub(:info)
+        end
+
+        it 'the counter should be 3' do 
+          subject.counter.count.should == 3
+        end
+
+        context 'and then incremented by 5 with no :counting' do
+          before(:each) do
+            subject.inc('some message', 5)
+          end
+
+          it 'the counter should be 8' do 
+            subject.counter.count.should == 8
+          end
+        end
+
+        context 'and then incremented by 5 with :counting => apples' do
+          before(:each) do
+            subject.inc('some message', 5, counting: :apples)
+          end
+
+          it 'the counter should be 3' do 
+            subject.counter.count.should == 3
+          end
+
+          it 'the apples counter should be 5' do 
+            subject.counter(:apples).count.should == 5
+          end
+          
+          context 'and then incremented by 4 with :counting => oranges' do
+            before(:each) do
+              subject.inc('some message', 4, counting: :oranges)
+            end
+
+            it 'the counter should be 3' do 
+              subject.counter.count.should == 3
+            end
+
+            it 'the apples counter should be 5' do 
+              subject.counter(:apples).count.should == 5
+            end
+
+            it 'the oranges counter should be 4' do 
+              subject.counter(:oranges).count.should == 4
+            end
+            
+          end
+          
+        end
+
+      end
+
+    end # describe 'counting:' do
+
+  end # describe Tracker do
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babysitter
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fozzie
@@ -115,6 +115,7 @@ files:
 - lib/babysitter/counter.rb
 - lib/babysitter/exception_notifiers.rb
 - lib/babysitter/exception_notifiers/simple_notification_service.rb
+- lib/babysitter/logger_with_deprecation.rb
 - lib/babysitter/logger_with_stats.rb
 - lib/babysitter/logging.rb
 - lib/babysitter/monitor.rb
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Babysits long-running processes and reports progress or failures