nosey 0.0.3 → 0.0.4

data/README.md

@@ -36,15 +36,18 @@ Instrument your Ruby app with nosey.
         nosey.touch 'started_at'
       end
 
-      def growl
-        nosey.increment 'growls'
-        nosey.touch 'last_growled_at'
-        "Grrrrr!"
+      def growl(volume=1)
+        nosey.touch 'last-growled-at'
+        nosey.increment 'growl-count'
+        nosey.avg 'growl-volume-avg', volume
+        nosey.min 'growl-volume-min', volume
+        nosey.max 'growl-volume-max', volume
+        "G#{'r' * volume}!"
       end
     end
     
     princess = PandaBear.new
-    princess.growl
+    10.times {|n| princess.growl rand * 5 }
     princess.nosey.report  # Soon to be a fantastico report, prolly in YML
 
 When you fire Ruby this up, Nosey will open up a socket and report the stats.

data/lib/nosey/probe.rb

@@ -26,52 +26,42 @@ module Nosey
       end
     end
 
-    # Calulcates a min, max, and avg for a given number of samples
-    class Sampler < Base
-      attr_reader :min, :max, :sum, :count
-
-      def initialize(*args)
-        reset
-        super(*args)
-      end
-
+    class Average < Base
       def sample(value)
-        @min = @max = value unless @min and @max
-
-        @min = value if value < @min
-        @max = value if value > @max
+        @sum   ||= 0
+        @count ||= 0
         @sum   += value
         @count += 1
-
-        to_hash
       end
 
-      def avg
-        sum / count if count > 0 and sum
+      def value
+        @sum.to_f / @count.to_f if @sum and @count > 0
       end
+    end
 
-      def to_hash
-        {
-          'max' => max,
-          'min' => min,
-          'sum' => sum,
-          'avg' => avg,
-          'count' => count
-        }
+    class Minimum < Base
+      def sample(value)
+        @value ||= value
+        @value = value if value < @value
       end
+    end
 
-      def value
-        to_hash
+    class Maximum < Base
+      def sample(value)
+        @value ||= value
+        @value = value if value > @value
       end
+    end
 
-      def reset
-        @min = @max = nil
-        @sum = @count = 0
+    class Sum < Base
+      def sample(value)
+        @value ||= 0
+        @value += value
       end
     end
 
     # Count up/down values.
-    class Counter < Base
+    class Count < Base
       def increment(by=1)
         change by
       end
@@ -96,7 +86,7 @@ module Nosey
 
   # Contains a collection of probes that calculate velocities, counts, etc.
   class Probe::Set
-    attr_reader :name
+    attr_accessor :name
 
     def initialize(name)
       @name = name
@@ -106,17 +96,17 @@ module Nosey
 
     # Increment a counter probe
     def increment(key,by=1)
-      ensure_probe(Probe::Counter, key).increment(by)
+      ensure_probe(Probe::Count, key).increment(by)
     end
 
     # Decrement a counter probe
     def decrement(key,by=1)
-      ensure_probe(Probe::Counter, key).decrement(by)
+      ensure_probe(Probe::Count, key).decrement(by)
     end
 
     # Sample a number and get a sum/avg/count/min/max
-    def sample(key,val)
-      ensure_probe(Probe::Sampler, key).sample(val)
+    def avg(key,val)
+      ensure_probe(Probe::Average, key).sample(val)
     end
 
     # Touch a timestamp probe
@@ -124,6 +114,22 @@ module Nosey
       ensure_probe(Probe::Touch, key).touch
     end
 
+    def min(key,value)
+      ensure_probe(Probe::Minimum, key).sample(value)
+    end
+
+    def max(key,value)
+      ensure_probe(Probe::Maximum, key).sample(value)
+    end
+
+    def avg(key,value)
+      ensure_probe(Probe::Average, key).sample(value)
+    end
+
+    def sum(key,value)
+      ensure_probe(Probe::Sum, key).sample(value)
+    end
+
     # List of all the probes that are active
     def probes
       @probes ||= Hash.new

data/lib/nosey/version.rb

@@ -1,3 +1,3 @@
 module Nosey
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/nosey/munin_spec.rb

@@ -7,7 +7,10 @@ describe Nosey::Munin::Graph do
         r.probe_sets << Nosey::Probe::Set.new("Group #{n}") do |s|
           s.touch 'generated-at'
           s.increment 'hit'
-          s.sample 'chopper', 2
+          s.avg 'chopper-avg', 2
+          s.min 'chopper-min', 2
+          s.max 'chopper-max', 2
+          s.sum 'chopper-sum', 2
         end
       end
     end
@@ -36,7 +39,7 @@ describe Nosey::Munin::Graph do
     end
 
     it "should have labels" do
-      @text.scan(/[A-Za-z0-9_]+\.label .+\n/).should have(7).items
+      @text.scan(/[A-Za-z0-9_]+\.label .+\n/).should have(6).items
     end
   end
 
@@ -46,7 +49,7 @@ describe Nosey::Munin::Graph do
     end
 
     it "should have values" do
-      @text.scan(/[A-Za-z0-9_]+\.value .+\n/).should have(7).items
+      @text.scan(/[A-Za-z0-9_]+\.value .+\n/).should have(6).items
     end
   end
 end

data/spec/lib/nosey/probe_spec.rb

@@ -21,8 +21,20 @@ describe Nosey::Probe::Set do
     @probes.touch('touched-at').should be_instance_of(Time)
   end
 
-  it "should sample" do
-    @probes.sample('foobers', 1).should be_instance_of(Hash)
+  it "should avg" do
+    @probes.avg('foobers', 1)
+  end
+
+  it "should sum" do
+    @probes.sum('foobers', 1)
+  end
+
+  it "should max" do
+    @probes.max('foobers', 1)
+  end
+
+  it "should min" do
+    @probes.max('foobers', 1)
   end
 
   it "should get probe" do
@@ -35,9 +47,39 @@ describe Nosey::Probe::Set do
   end
 end
 
-describe Nosey::Probe::Counter do
+describe Nosey::Probe do
+  it "should calculate sum" do
+    sum = Nosey::Probe::Sum.new
+    sum.sample(1)
+    sum.sample(2)
+    sum.value.should eql(3)
+  end
+
+  it "should calculate max" do
+    max = Nosey::Probe::Maximum.new
+    max.sample(1)
+    max.sample(3)
+    max.value.should eql(3)
+  end
+
+  it "should calculate minimum" do
+    min = Nosey::Probe::Minimum.new
+    min.sample(1)
+    min.sample(2)
+    min.value.should eql(1)
+  end
+
+  it "should calculate average" do
+    avg = Nosey::Probe::Average.new
+    avg.sample(1)
+    avg.sample(2)
+    avg.value.should eql(1.5)
+  end
+end
+
+describe Nosey::Probe::Count do
   before(:all) do
-    @counter = Nosey::Probe::Counter.new
+    @counter = Nosey::Probe::Count.new
   end
 
   it "should init null" do
@@ -69,37 +111,4 @@ describe Nosey::Probe::Touch do
     @touch.touch
     @touch.value.should_not be_nil
   end
-end
-
-describe Nosey::Probe::Sampler do
-  before(:each) do
-    @counter = Nosey::Probe::Sampler.new
-    @counter.sample 1
-    @counter.sample 2
-    @counter.sample 3
-  end
-
-  it "should init hash" do
-    @counter.value.should be_instance_of(Hash)
-  end
-
-  it "should have avg" do
-    @counter.value['avg'].should eql(2)
-  end
-
-  it "should have sum" do
-    @counter.value['sum'].should eql(6)
-  end
-
-  it "should have min" do
-    @counter.value['min'].should eql(1)
-  end
-
-  it "should have max" do
-    @counter.value['max'].should eql(3)
-  end
-
-  it "should have count" do
-    @counter.value['count'].should eql(3)
-  end
 end

data/spec/lib/nosey_spec.rb

@@ -9,7 +9,7 @@ describe EventMachine::Nosey::SocketServer do
         r.probe_sets << Nosey::Probe::Set.new("Group #{n}") do |set|
           set.increment 'hit'
           set.touch 'generated-at'
-          set.sample 'zie-number', 1
+          set.avg 'zie-number-avg', 1
         end
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Brad Gessler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 -07:00
+date: 2011-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency