deputy 0.1.14 → 0.1.15

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/deputy.gemspec

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

data/lib/deputy.rb

@@ -13,11 +13,15 @@ class Scout
   class Plugin
     OPTIONS = {}.to_yaml
 
+    def self.clean_class_name
+      to_s.split('::')[1..-1].join('::')
+    end
+
     protected
 
     def report(metrics)
       metrics.each do |key, value|
-        Deputy.send_report "#{clean_class_name}.#{key}", value
+        Deputy.send_report "#{self.class.clean_class_name}.#{key}", value
       end
     end
 
@@ -46,11 +50,7 @@ class Scout
     end
 
     def memory_file
-      "/tmp/deputy.memory.#{clean_class_name}.yml"
-    end
-
-    def clean_class_name
-      self.class.to_s.split('::')[1..-1].join('::')
+      "/tmp/deputy.memory.#{self.class.clean_class_name}.yml"
     end
 
     # stub options for now...
@@ -89,8 +89,15 @@ module Deputy
 
     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
+      minutes_to_wait = START_MINUTE % run_every_n_minutes
+      if minutes_to_wait == 0
+        puts "#{plugin.clean_class_name}: running"
+        plugin.new.build_report
+      else
+        puts "#{plugin.clean_class_name}: waiting another #{minutes_to_wait} minutes"
+      end
     end
+    send_report 'Deputies', 'finished'
   rescue Exception => e
     send_report "Deputies.Error", e.message
     raise e

data/spec/deputy_spec.rb

@@ -123,6 +123,7 @@ describe Deputy do
       $notify = 0
       Deputy.stub!(:sheriff_url).and_return 'http://sheri.ff'
       FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => klass('C', :code => '$notify=1'))
+      FakeWeb.register_uri(:get, "http://sheri.ff/report/Deputies?value=finished", :body => 'OK')
       Deputy.run_plugins
       $notify.should == 1
     end

metadata

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