astro-collectd 0.0.11 → 0.0.12

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 11
+:patch: 12
 :major: 0
 :minor: 0

data/lib/collectd/interface.rb

@@ -16,8 +16,8 @@ module Collectd
     @@servers = []
 
     def add_server(interval, addr='ff18::efc0:4a42', port=25826)
-      if defined?(EM) && EM.running?
-        @@servers << EmServer.new
+      if defined?(EM) && EM.reactor_running?
+        @@servers << EmServer.new(interval, addr, port)
       else
         @@servers << Server.new(interval, addr, port)
       end

data/spec/interface_spec.rb

@@ -3,10 +3,12 @@ require 'collectd'
 
 describe Collectd do
   before(:each) do
-    Collectd.reset!
     @server = mock('Server')
     Collectd << @server
   end
+  after(:each) do
+    Collectd.reset!
+  end
 
   it 'should set_counter' do
     @server.should_receive(:set_counter).
@@ -74,12 +76,14 @@ end
 
 describe Collectd::ProcStats do
   before(:each) do
-    Collectd.reset!
     @server = StubServer.new
     Collectd << @server
     Collectd.plugin1(:plugin_instance1).with_full_proc_stats
     Collectd.run_pollables_for @server
   end
+  after(:each) do
+    Collectd.reset!
+  end
 
   context 'when polling memory' do
     it 'should report VmRSS' do
@@ -105,12 +109,14 @@ end
 
 describe Collectd::EmPlugin do
   before(:each) do
-    Collectd.reset!
     @server = StubServer.new
     Collectd << @server
     @df = EM::DefaultDeferrable.new
     Collectd.plugin1(:plugin_instance1).track_deferrable('df', @df)
   end
+  after(:each) do
+    Collectd.reset!
+  end
 
   context 'when succeeding' do
     it 'should callback' do
@@ -143,3 +149,49 @@ describe Collectd::EmPlugin do
     end
   end
 end
+
+describe Collectd::Server do
+  before :all do
+    Collectd.add_server(0.1)
+  end
+  after :all do
+    Collectd.reset!
+  end
+
+  it "should spawn a Collectd::Server" do
+    servers = []
+    Collectd.each_server { |s| servers << s }
+    servers.length.should == 1
+    servers[0].should be_kind_of(Collectd::Server)
+  end
+
+  it "should run for 2 seconds" do
+    sleep 2
+  end
+end
+
+describe Collectd::EmServer do
+  it "should spawn a Collectd::Server" do
+    EM.run {
+      Collectd.add_server 0.1
+      EM.next_tick {
+        EM.stop
+        servers = []
+        Collectd.each_server { |s| servers << s }
+        servers.length.should == 1
+        servers[0].should be_kind_of(Collectd::EmServer)
+        Collectd.reset!
+      }
+    }
+  end
+
+  it "should run for 2 seconds" do
+    EM.run {
+      Collectd.add_server 0.1
+      EM::Timer.new(2) {
+        EM.stop
+        Collectd.reset!
+      }
+    }
+  end
+end if defined?(EM)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-collectd
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Stephan Maka
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: []