deputy 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/deputy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-06-02}
+  s.date = %q{2010-06-03}
   s.default_executable = %q{deputy}
   s.email = %q{mirko@dawanda.com}
   s.executables = ["deputy"]

data/lib/deputy.rb

@@ -21,16 +21,16 @@ class Scout
   def self.plugins(code)
     eval_and_fetch_constants(code).map do |container|
       interval = container.interval
-      next unless plugin = plugin_in_container(container)
+      unless plugin = plugin_in_container(container)
+        Deputy.send_report "Deputies.Plugin not found", code
+        next
+      end
       [interval, plugin]
     end.compact
   end
 
   def self.plugin_in_container(container)
-    constants = container.constants.map{|constant_name| container.const_get(constant_name)}
-    constants.detect do |constant|
-      constant.instance_methods.map{|m| m.to_sym }.include?(:build_report)
-    end
+    container.constants.map{|constant_name| container.const_get(constant_name)}.first
   end
 end
 
@@ -44,10 +44,14 @@ module Deputy
 
   def self.run_plugins
     content = get("/plugins.rb")
+
     Scout.plugins(content).each do |interval, plugin|
       run_every_n_minutes = interval/60
       plugin.new.build_report if START_MINUTE % run_every_n_minutes == 0
     end
+  rescue Exception => e
+    send_report "Deputies.Error", e.message
+    raise e
   end
 
   def self.send_report(metric, value)

data/spec/deputy_spec.rb

@@ -1,5 +1,11 @@
 require 'spec/spec_helper'
 
+class ErrorPlugin < Scout::Plugin
+  def build_report
+    raise 'FOO'
+  end
+end
+
 describe Deputy do
   it "has a VERSION" do
     Deputy::VERSION.should =~ /^\d+\.\d+\.\d+$/
@@ -10,12 +16,15 @@ describe Deputy do
   end
 
   describe Scout do
-    it "finds plugins" do
-      Scout.plugins(klass('A', :rand => 1111)).inspect.should == '[[60, TEMP_1111::A]]'
-    end
+    describe :plugins do
+      it "finds plugins" do
+        Scout.plugins(klass('A', :rand => 1111)).inspect.should == '[[60, TEMP_1111::A]]'
+      end
 
-    it "does not show non-plugins" do
-      Scout.plugins(klass('B').sub('build_report','foo')).inspect.should == '[]'
+      it "reprots non-plugins" do
+        Deputy.should_receive(:send_report)
+        Scout.plugins("class Foo;def self.interval;11;end;end").inspect.should == '[]'
+      end
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 +02:00
+date: 2010-06-03 00:00:00 +02:00
 default_executable: deputy
 dependencies: []