deputy 0.1.57 → 0.1.58

data/VERSION

@@ -1 +1 @@
-0.1.57
+0.1.58

data/deputy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "deputy"
-  s.version = "0.1.57"
+  s.version = "0.1.58"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2012-11-05"
+  s.date = "2012-11-21"
   s.email = "mirko@dawanda.com"
   s.executables = ["deputy"]
   s.files = [

data/lib/deputy.rb

@@ -146,6 +146,7 @@ module Deputy
     url = "http://#{url}" unless url =~ %r{://}
     options[:http_basic_authentication] = extract_auth_from_url!(url)
     url = add_host_to_url(url, options.delete(:host))
+    url = add_ip_to_url(url)
     puts "getting #{url} with options: #{options.inspect}" if options[:verbose]
 
     http_options = {}
@@ -228,6 +229,20 @@ module Deputy
 
   def self.add_host_to_url(url, host=nil)
     query = "hostname=#{host || Socket.gethostname}#{'&forced_host=true' if host}"
+    add_query_to_url(url, query)
+  end
+
+
+  def self.add_ip_to_url(url, ip=nil)
+    query = "ip=#{ip ||real_ip}"
+    add_query_to_url(url, query)
+  end
+
+  def self.real_ip
+    %x(host $(hostname))[/\d+.\d+.\d+.\d+/]
+  end
+
+  def self.add_query_to_url(url, query)
     separator = (url.include?('?') ? "&" : "?")
     url + separator + query
   end

data/spec/deputy_spec.rb

@@ -32,9 +32,15 @@ class OptionsPlugin < Scout::Plugin
 end
 
 describe Deputy do
+  def append_ip(url)
+    Deputy.add_query_to_url(url, "ip=10.10.10.10")
+  end
+
+
   before do
     srand(Time.now.to_f * 100000) # fixes rand in klass() not being random
     Socket.stub!(:gethostname).and_return 'my_host'
+    Deputy.stub!(:real_ip).and_return '10.10.10.10'
   end
 
   it "has a VERSION" do
@@ -165,16 +171,16 @@ describe Deputy do
 
     it "executes all plugins" do
       $notify = 0
-      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')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/plugins.rb?hostname=my_host"), :body => klass('C', :code => '$notify=1'))
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Deputies.finished&value=OK&hostname=my_host"), :body => 'OK')
       Deputy.run_plugins
       $notify.should == 1
     end
 
     it "does not execute not-running plugins" do
       $notify = 0
-      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb?hostname=my_host", :body => klass('C', :code => '$notify=1', :interval => 9999999))
-      FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=OK&hostname=my_host", :body => 'OK')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/plugins.rb?hostname=my_host"), :body => klass('C', :code => '$notify=1', :interval => 9999999))
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Deputies.finished&value=OK&hostname=my_host"), :body => 'OK')
       Deputy.run_plugins
       $notify.should == 0
     end
@@ -190,17 +196,17 @@ describe Deputy do
     end
 
     it "does not sleeps no_wait given" do
-      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')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/plugins.rb?hostname=my_host"), :body => '')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Deputies.finished&value=OK&hostname=my_host"), :body => 'OK')
       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?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')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/plugins.rb?hostname=my_host"), :body => klass('FooBar', :code => 'raise'))
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Deputies.finished&value=Error&hostname=my_host"), :body => 'OK')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Deputies.Error&value=FooBar&hostname=my_host"), :body => 'OK')
       lambda{
         Deputy.run_plugins
       }.should raise_error('FooBar')
@@ -208,9 +214,9 @@ describe Deputy do
 
     it "continues to run plugins when one fails" do
       $notify = 0
-      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')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/plugins.rb?hostname=my_host"), :body => klass('FooBar', :code => 'raise') + klass('C', :code => '$notify = 1'))
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Deputies.finished&value=Error&hostname=my_host"), :body => 'OK')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Deputies.Error&value=&hostname=my_host"), :body => 'OK')
       lambda{
         Deputy.run_plugins
       }.should raise_error
@@ -224,17 +230,17 @@ describe Deputy do
     end
 
     it "sends a report" do
-      FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Xxx.yyy&value=123&hostname=my_host", :body => 'OK')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Xxx.yyy&value=123&hostname=my_host"), :body => 'OK')
       Deputy.send_report('Xxx.yyy', '123').should == 'OK'
     end
 
     it "escapes metric names" do
-      FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Xxx.yy%3Fy&value=123&hostname=my_host", :body => 'OK')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Xxx.yy%3Fy&value=123&hostname=my_host"), :body => 'OK')
       Deputy.send_report('Xxx.yy?y', '123').should == 'OK'
     end
 
     it "overrides host, if specified in options" do
-      FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Xxx.yy%3Fy&value=123&hostname=general&forced_host=true", :body => 'OK')
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Xxx.yy%3Fy&value=123&hostname=general&forced_host=true"), :body => 'OK')
       Deputy.send_report('Xxx.yy?y', '123', {:host => 'general'}).should == 'OK'
     end
 
@@ -245,7 +251,7 @@ describe Deputy do
 
     it "does not reraise if silent_on_errors configured" do
       Deputy.config['silent_on_errors'] = true
-      FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Xxx.yy%3Fy&value=123&hostname=general&forced_host=true", :body => 'ERROR', :status => ["500", "Internal Server Error"])
+      FakeWeb.register_uri(:get, append_ip("http://sheri.ff/notify?group=Xxx.yy%3Fy&value=123&hostname=general&forced_host=true"), :body => 'ERROR', :status => ["500", "Internal Server Error"])
       Deputy.send_report('Xxx.yy?y', '123', {:host => 'general'}).should == nil
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deputy
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 111
   prerelease: 
   segments: 
   - 0
   - 1
-  - 57
-  version: 0.1.57
+  - 58
+  version: 0.1.58
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-05 00:00:00 Z
+date: 2012-11-21 00:00:00 Z
 dependencies: []
 
 description: