drone 0.0.1 → 0.0.2

data/lib/drone/interfaces/console.rb

@@ -27,7 +27,6 @@ module Drone
             
           when Metrics::Timer
             puts "[Timer] #{m.name}"
-            print_meter(m)
             print_histogram(m)
             
           when Metrics::Meter

data/lib/drone/metrics/timer.rb

@@ -5,9 +5,11 @@ require File.expand_path('..//meter', __FILE__)
 module Drone
   module Metrics
     class Timer
+      attr_reader :name
+      
       def initialize(name = 'calls')
+        @name = name
         @histogram = Histogram.new(Histogram::TYPE_BIASED)
-        @meter = Meter.new(name)
         clear()
       end
       
@@ -15,12 +17,6 @@ module Drone
         @histogram.count
       end
       
-      [:fifteen_minutes_rate, :five_minutes_rate, :mean_rate, :one_minute_rate].each do |attr_name|
-        define_method(attr_name) do
-          @meter.send(attr_name)
-        end
-      end
-      
       # may requires a conversion... or not
       [:count, :min, :max, :mean, :stdDev, :percentiles, :values].each do |attr_name|
         define_method(attr_name) do |*args|
@@ -37,7 +33,6 @@ module Drone
       def update(duration)
         if duration >= 0
           @histogram.update(duration)
-          @meter.mark()
         end
       end
       
@@ -50,13 +45,6 @@ module Drone
         update(Time.now.to_f - started_at.to_f)
       end
       
-      
-      
-      
-      def name
-        @meter.name
-      end
-      
     end
   end
 end

data/lib/drone/version.rb

@@ -1,3 +1,3 @@
 module Drone
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/specs/all.rb

@@ -0,0 +1,11 @@
+# This file is a shortcut to run all tests in textmate
+
+ENV['COVERAGE'] = "1"
+require File.expand_path('../common', __FILE__)
+
+
+Dir.chdir( File.dirname(__FILE__) ) do
+  Dir["**/*_spec.rb"].each do |path|
+    load(path)
+  end
+end

data/specs/metrics/meter_spec.rb

@@ -7,6 +7,7 @@ include Drone
 EM.describe 'Meter Metrics' do
   before do
     Drone::init_drone()
+    Drone::start_monitoring()
   end
   
   describe "A meter metric with no events" do
@@ -23,6 +24,26 @@ EM.describe 'Meter Metrics' do
       @meter.mean_rate.should == 0.0
       done
     end
+    
+    should "have a mean rate of zero" do
+      @meter.mean_rate.should.be.close?(0, 0.001)
+      done
+    end
+    
+    should "have a one-minute rate of zero" do
+      @meter.one_minute_rate.should.be.close?(0, 0.001)
+      done
+    end
+    
+    should "have a five-minute rate of zero" do
+      @meter.five_minutes_rate.should.be.close?(0, 0.001)
+      done
+    end
+    
+    should "have a fifteen-minute rate of zero" do
+      @meter.fifteen_minutes_rate.should.be.close?(0, 0.001)
+      done
+    end
   end
 
   describe "A meter metric with three events" do

data/specs/metrics/timer_spec.rb

@@ -48,26 +48,6 @@ EM.describe 'Timer Metrics' do
       p999.should.be.close?(0, 0.001)
       done
     end
-
-    should "have a mean rate of zero" do
-      @timer.mean_rate.should.be.close?(0, 0.001)
-      done
-    end
-    
-    should "have a one-minute rate of zero" do
-      @timer.one_minute_rate.should.be.close?(0, 0.001)
-      done
-    end
-    
-    should "have a five-minute rate of zero" do
-      @timer.five_minutes_rate.should.be.close?(0, 0.001)
-      done
-    end
-    
-    should "have a fifteen-minute rate of zero" do
-      @timer.fifteen_minutes_rate.should.be.close?(0, 0.001)
-      done
-    end
     
     should "have no values" do
       @timer.values.should == []

metadata

@@ -2,7 +2,7 @@
 name: drone
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Julien Ammous
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 +02:00
+date: 2011-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - lib/drone/utils/exponentially_decaying_sample.rb
 - lib/drone/utils/uniform_sample.rb
 - lib/drone/version.rb
+- specs/all.rb
 - specs/common.rb
 - specs/metrics/counter_spec.rb
 - specs/metrics/gauge_spec.rb