deputy 0.1.3 → 0.1.4

data/Readme.md

@@ -1,5 +1,7 @@
 Work in progress do not use.
 
+Install
+#######
 Use with [sheriff](http://github.com/dawanda/sheriff).
 
     sudo gem install deputy
@@ -7,5 +9,10 @@ Use with [sheriff](http://github.com/dawanda/sheriff).
 Put sheriff url into `~/.deputy.yml`
     sheriff_url: http://sheriff.mydomain.com
 
- - report something: `deputy Cronjob.ran 1`
- - TODO add plugins via sheriff && install deputy cron with deputy --install-cron
+Add deputy to cron with deputy --install-cron (logs to /tmp/deputy.log)
+
+Usage
+#####
+
+### Report something
+    deputy Cronjob.ran 1

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/deputy

@@ -11,11 +11,14 @@ Report to the sheriff
 
 Usage:
     deputy System.metric value
+    deputy [OPTION]
 
 Options:
 BANNER
   opts.on("-h", "--help","Show this.") { puts opts; exit }
   opts.on('-v', '--version','Show Version'){ puts Deputy::VERSION; exit}
+  opts.on('--install-cron','Install crontask'){ Deputy.install_cron; exit}
+  opts.on('--run-plugins','Run all plugins for this minute (belongs into crontask)'){ Deputy.run_plugins; exit}
 end.parse!
 
 metric, value = ARGV[0..1]

data/deputy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/lib/deputy.rb

@@ -19,17 +19,35 @@ class Scout
   end
 
   def self.plugins(code)
-    constants = eval_and_fetch_constants(code)
-    constants.select{|constant| constant.instance_methods.map{|m| m.to_sym }.include?(:build_report) }
+    eval_and_fetch_constants(code).map do |container|
+      interval = container.interval
+      next unless plugin = plugin_in_container(container)
+      [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
   end
 end
 
 module Deputy
+  START_MINUTE = (Time.now.to_i + 30) / 60 # we could start at 58..02 seconds -> always in middle of minute
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
 
+  def self.install_cron
+    `crontab -l | { cat; echo "* * * * * deputy --run-plugins 2>&1 >> /tmp/deputy.log"; } | crontab -`
+  end
+
   def self.run_plugins
     content = get("/plugins.rb")
-    Scout.plugins(content).each{|p| p.new.build_report }
+    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
   end
 
   def self.send_report(metric, value)

data/spec/deputy_spec.rb

@@ -5,13 +5,13 @@ describe Deputy do
     Deputy::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
 
-  def klass(name, code='')
-    "class #{name} < Scout::Plugin; def build_report; #{code}; end; end"
+  def klass(name, options={})
+    "class TEMP_#{options[:rand]||rand(11111)};def self.interval;60;end;class #{name} < Scout::Plugin; def build_report; #{options[:code]}; end; end; end"
   end
 
   describe Scout do
     it "finds plugins" do
-      Scout.plugins(klass('A')).inspect.should == '[A]'
+      Scout.plugins(klass('A', :rand => 1111)).inspect.should == '[[60, TEMP_1111::A]]'
     end
 
     it "does not show non-plugins" do
@@ -23,7 +23,7 @@ describe Deputy do
     it "executes all plugins" do
       $notify = 0
       Deputy.stub!(:sheriff_url).and_return 'http://sheri.ff'
-      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => klass('C', '$notify=1'))
+      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => klass('C', :code => '$notify=1'))
       Deputy.run_plugins
       $notify.should == 1
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Michael Grosser