deputy 0.1.48 → 0.1.49

data/VERSION

@@ -1 +1 @@
-0.1.48
+0.1.49

data/deputy.gemspec

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

data/lib/deputy.rb

@@ -16,7 +16,8 @@ class Scout
     OPTIONS = {}.to_yaml
 
     def self.clean_class_name
-      to_s.split('::')[1..-1].join('::')
+      parts = to_s.split('::')
+      parts.size == 1 ? parts.first : parts[1..-1].join('::')
     end
 
     protected
@@ -84,13 +85,12 @@ class Scout
 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
   DEFAULT_VALUE = 'OK'
 
   def self.install_cron
     executable = `which deputy`.strip
-    unless (`crontab -l`).include?(executable) 
+    unless (`crontab -l`).include?(executable)
       `crontab -l | { cat; echo "* * * * * #{executable} --run-plugins >> /tmp/deputy.log 2>&1"; } | crontab -`
       if executable !~ %r{^/usr/}
         puts "make deputy globally available! or e.g. calls from inside cronjobs do not know deputy"
@@ -100,20 +100,20 @@ module Deputy
   end
 
   def self.run_plugins(options={})
+    start_time = Time.now.to_i
     sleep_random_interval unless options[:no_wait]
 
     content = get("/plugins.rb")
 
     exceptions = []
     Scout.plugins(content).each do |interval, plugin|
-      run_every_n_minutes = interval/60
-      minutes_to_wait = run_every_n_minutes - (START_MINUTE % run_every_n_minutes)
-      if minutes_to_wait == run_every_n_minutes
+      wait = minutes_to_wait(start_time, interval)
+      if wait == 0
         puts "#{plugin.clean_class_name}: running"
         begin
           plugin.new.build_report
         rescue Object => e # catch and report plugin-specific errors
-          e.message[0..0] = plugin.to_s.split('::')[1..-1].join
+          e.message[0..0] = plugin.clean_class_name
           puts e
           exceptions << e
         end
@@ -131,15 +131,14 @@ module Deputy
 
   def self.send_report(group, value, options = {})
     raise "separate #{group} with a ." unless group.split('.',2).size == 2
-    host = options[:host] || Socket.gethostname
-    
-    get "/notify?group=#{CGI.escape group}&value=#{CGI.escape value.to_s}&hostname=#{host}#{'&forced_host=true' if options[:host]}"
+    get "/notify?group=#{CGI.escape group}&value=#{CGI.escape value.to_s}", options
   end
 
   def self.get(path, options = {})
     url = "#{sheriff_url}#{path}"
     url = "http://#{url}" unless url =~ %r{://}
     options[:http_basic_authentication] = extract_auth_from_url!(url)
+    url = add_host_to_url(url, options.delete(:host))
 
     Timeout.timeout(config['timeout']||10) do
       open(url, options).read
@@ -161,6 +160,12 @@ module Deputy
     raise "No deputy.yml found in /etc or #{home}"
   end
 
+  def self.minutes_to_wait(start_time, interval)
+    start_minute = start_time / 60
+    run_every_n_minutes = interval / 60
+    start_minute % run_every_n_minutes
+  end
+
   def self.sleep_random_interval
     if max = config['max_random_start_delay']
       constant_number = Socket.gethostname.sum{|x| x[0]}
@@ -202,4 +207,10 @@ module Deputy
     auth = [$1, $2].compact
     auth.empty? ? nil : auth
   end
+
+  def self.add_host_to_url(url, host=nil)
+    query = "hostname=#{host || Socket.gethostname}#{'&forced_host=true' if host}"
+    separator = (url.include?('?') ? "&" : "?")
+    url + separator + query
+  end
 end

data/spec/deputy_spec.rb

@@ -146,6 +146,16 @@ describe Deputy do
         defined?(FasterCSV).should == "constant"
       end
     end
+
+    describe :clean_class_name do
+      it "is simple name for simple e.g. from irb" do
+        FooPlugin.clean_class_name.should == 'FooPlugin'
+      end
+
+      it "is last parts for namespaced" do
+        FooPlugin::NestedPlugin.clean_class_name.should == 'NestedPlugin'
+      end
+    end
   end
 
   describe :run_plugins do
@@ -155,7 +165,7 @@ describe Deputy do
 
     it "executes all plugins" do
       $notify = 0
-      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => klass('C', :code => '$notify=1'))
+      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb?hostname=my_host", :body => klass('C', :code => '$notify=1'))
       FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=OK&hostname=my_host", :body => 'OK')
       Deputy.run_plugins
       $notify.should == 1
@@ -172,16 +182,15 @@ describe Deputy do
     end
 
     it "does not sleeps no_wait given" do
-      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => '')
+      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb?hostname=my_host", :body => '')
       FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=OK&hostname=my_host", :body => 'OK')
-      Socket.stub!(:gethostname).and_return 'foo'
       Deputy.stub!(:send_report)
       Deputy.should_not_receive(:sleep)
       Deputy.run_plugins
     end
 
     it "fails with nice backtrace" do
-      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => klass('FooBar', :code => 'raise'))
+      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb?hostname=my_host", :body => klass('FooBar', :code => 'raise'))
       FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=Error&hostname=my_host", :body => 'OK')
       FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.Error&value=FooBar&hostname=my_host", :body => 'OK')
       lambda{
@@ -191,7 +200,7 @@ describe Deputy do
 
     it "continues to run plugins when one fails" do
       $notify = 0
-      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => klass('FooBar', :code => 'raise') + klass('C', :code => '$notify = 1'))
+      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb?hostname=my_host", :body => klass('FooBar', :code => 'raise') + klass('C', :code => '$notify = 1'))
       FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=Error&hostname=my_host", :body => 'OK')
       FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.Error&value=&hostname=my_host", :body => 'OK')
       lambda{

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deputy
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 121
   prerelease: 
   segments: 
   - 0
   - 1
-  - 48
-  version: 0.1.48
+  - 49
+  version: 0.1.49
 platform: ruby
 authors: 
 - Michael Grosser