drone 0.0.2 → 0.0.3

data/examples/simple.rb

@@ -14,12 +14,13 @@ class User
     @name = name
   end
   
-  monitor_rate("users:rename")
+  monitor_rate("users:rename:rate")
   def rename(new_name)
     @name = new_name
   end
   
-  monitor_time("users:do_something")
+  monitor_time("users:do_something:time")
+  monitor_rate("users:do_something:rate")
   def do_something
     # just eat some cpu
     0.upto(rand(2000)) do |n|

data/lib/drone/monitoring.rb

@@ -75,13 +75,13 @@ module Drone
         rate = @_rate_waiting
         @_rate_waiting = nil
         
-        define_method("instrumented_#{m}") do |*args, &block|
+        define_method("#{m}_with_meter") do |*args, &block|
           rate.mark()
-          send("original_#{m}", *args, &block)
+          send("#{m}_without_meter", *args, &block)
         end
         
-        alias_method "original_#{m}", m
-        alias_method m, "instrumented_#{m}"
+        alias_method "#{m}_without_meter", m
+        alias_method m, "#{m}_with_meter"
       end
       
       ##
@@ -91,14 +91,14 @@ module Drone
         timer = @_timer_waiting
         @_timer_waiting = nil
         
-        define_method("instrumented_#{m}") do |*args, &block|
+        define_method("#{m}_with_timer") do |*args, &block|
           timer.time do
-            send("original_#{m}", *args, &block)
+            send("#{m}_without_timer", *args, &block)
           end
         end
         
-        alias_method "original_#{m}", m
-        alias_method m, "instrumented_#{m}"
+        alias_method "#{m}_without_timer", m
+        alias_method m, "#{m}_with_timer"
       end
       
     end

data/lib/drone/schedulers/eventmachine.rb

@@ -56,6 +56,15 @@ module Drone
         
       end
       
+      ##
+      # @private
+      # 
+      def self.reset
+        @timers_once.clear()
+        @timers_periodic.clear()
+        @started = false
+      end
+      
     end
   end
 end

data/lib/drone/utils/exponentially_decaying_sample.rb

@@ -39,7 +39,7 @@ class ExponentiallyDecayingSample
     
     now = current_time()
     if now >= @next_scale_time
-      rescale(now, @next_scale_time)
+      rescale(now)
     end
   end
   

data/lib/drone/version.rb

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

data/specs/common.rb

@@ -4,8 +4,6 @@ require 'rubygems'
 
 puts "Testing with ruby #{RUBY_VERSION} and rubygems #{Gem::VERSION}"
 
-require 'bundler/setup'
-
 if (RUBY_VERSION >= "1.9") && ENV['COVERAGE']
   require 'simplecov'
   ROOT = File.expand_path('../../', __FILE__)
@@ -20,6 +18,8 @@ if (RUBY_VERSION >= "1.9") && ENV['COVERAGE']
   end
 end
 
+require 'bundler/setup'
+
 require 'bacon'
 require 'mocha'
 require 'delorean'

data/specs/schedulers/eventmachine_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../../common', __FILE__)
+
+require 'drone/schedulers/eventmachine'
+
+describe 'Eventmachine Scheduler' do
+  
+  describe 'in waiting state' do
+    before do
+      @scheduler = Drone::Schedulers::EMScheduler
+      class << @scheduler
+        def timers_periodic;  @timers_periodic; end
+        def timers_once;      @timers_once; end
+      end
+      
+      EM::reactor_running?.should == false
+      
+      @scheduler.reset()
+    end
+    
+    should "enqueue timers" do
+      n = 0
+      @scheduler.schedule_once(1){ n = 10 }
+      n.should == 0
+      @scheduler.timers_once.size.should == 1
+    end
+    
+    should "enqueue periodic timers" do
+      n = 0
+      @scheduler.schedule_periodic(1){ n = 10 }
+      n.should == 0
+      @scheduler.timers_periodic.size.should == 1
+    end
+    
+    should "start timers when started" do
+      EM::expects(:add_periodic_timer).once.with(12)
+      @scheduler.schedule_periodic(12){ }
+      
+      EM.expects(:add_timer).once.with(1)
+      @scheduler.schedule_once(1){ }
+      
+      @scheduler.timers_periodic.size.should == 1
+      @scheduler.timers_once.size.should == 1
+      
+      @scheduler.start
+    end
+    
+  end
+  
+  
+  EM.describe 'in started state' do
+    before do
+      @scheduler = Drone::Schedulers::EMScheduler
+      @scheduler.reset()
+      EM::reactor_running?.should == true
+      @scheduler.start()
+    end
+    
+    should 'start a timer when a job is scheduled' do
+      EM::expects(:add_timer).with(23)
+      @scheduler.schedule_once(23){}
+      done
+    end
+    
+    should 'start run the job and start a periodic timer when a periodic job is scheduled' do
+      n = 0
+      proc = lambda do
+        n+= 1
+        done if n == 2
+      end
+      
+      @scheduler.schedule_periodic(0.001, &proc)
+    end
+    
+  end
+  
+end

data/specs/unit/exponentially_decaying_sample_spec.rb

@@ -62,7 +62,7 @@ describe 'Exponentially Decaying Sample' do
     end
     
     should "rescale after 1 hour" do
-      @sample.expects(:rescale)
+      @sample.expects(:rescale).with(anything())
       
       Delorean.time_travel_to("2 hours from now") do
         @sample.update(1)

metadata

@@ -2,7 +2,7 @@
 name: drone
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Julien Ammous
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +02:00
-default_executable: 
+date: 2011-04-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -118,12 +117,12 @@ files:
 - specs/metrics/gauge_spec.rb
 - specs/metrics/meter_spec.rb
 - specs/metrics/timer_spec.rb
+- specs/schedulers/eventmachine_spec.rb
 - specs/unit/ewma_spec.rb
 - specs/unit/exponentially_decaying_sample_spec.rb
 - specs/unit/histogram_spec.rb
 - specs/unit/monitoring_spec.rb
 - specs/unit/uniform_sample_spec.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -147,9 +146,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: drone
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Drone is a monitoring library
 test_files: []
 
+has_rdoc: