deputy 0.1.44 → 0.1.45

data/Readme.md

@@ -19,4 +19,5 @@ Usage
 
 ### Report something
     deputy Cronjob.ran
-    deputy Cronjob.users_found 123
+    deputy Cronjob.users_found 123
+    Cron: xxx 2>&1 ; deputy Cron.success $?

data/VERSION

@@ -1 +1 @@
-0.1.44
+0.1.45

data/bin/deputy

@@ -4,6 +4,8 @@ require 'optparse'
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
 require 'deputy'
 
+options = {}
+
 OptionParser.new do |opts|
   opts.banner = <<BANNER
 Report to the sheriff
@@ -23,12 +25,15 @@ BANNER
     Deputy.run_plugins
     exit
   end
+  opts.on('--host x', 'Use this host, when reporting') do |host|
+    options[:host] = host
+  end
 end.parse!
-
+  
 metric, value = ARGV[0..1]
 if metric.to_s.empty?
   puts "Usage instructions: deputy --help"
   exit
 end
 
-Deputy.send_report metric, (value || Deputy::DEFAULT_VALUE)
+Deputy.send_report metric, (value || Deputy::DEFAULT_VALUE), options

data/deputy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.44"
+  s.version = "0.1.45"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-08-05}
+  s.date = %q{2010-09-06}
   s.default_executable = %q{deputy}
   s.email = %q{mirko@dawanda.com}
   s.executables = ["deputy"]
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dawanda/deputy}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Report to the sheriff}
   s.test_files = [
     "spec/deputy_spec.rb",
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
     else
       s.add_dependency(%q<SystemTimer>, [">= 0"])

data/lib/deputy.rb

@@ -120,13 +120,16 @@ module Deputy
     raise e
   end
 
-  def self.send_report(group, value)
+  def self.send_report(group, value, options = {})
     raise "separate #{group} with a ." unless group.split('.',2).size == 2
-    get "/notify?group=#{CGI.escape group}&value=#{CGI.escape value.to_s}&hostname=#{Socket.gethostname}"
+    host = options[:host] || Socket.gethostname
+    
+    get "/notify?group=#{CGI.escape group}&value=#{CGI.escape value.to_s}&hostname=#{host}"
   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)
 
     Timeout.timeout(config['timeout']||10) do

data/spec/deputy_spec.rb

@@ -148,9 +148,12 @@ describe Deputy do
   end
 
   describe :run_plugins do
+    before do
+      Deputy.stub!(:config).and_return "sheriff_url" => 'http://sheri.ff'
+    end
+
     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', :code => '$notify=1'))
       FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=OK&hostname=my_host", :body => 'OK')
       Deputy.run_plugins
@@ -169,17 +172,24 @@ describe Deputy do
   end
 
   describe :send_report do
+    before do
+      Deputy.stub!(:config).and_return "sheriff_url" => 'http://sheri.ff'
+    end
+    
     it "sends a report" do
-      Deputy.stub!(:sheriff_url).and_return 'http://sheri.ff'
       FakeWeb.register_uri(:get, "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
-      Deputy.stub!(:sheriff_url).and_return 'http://sheri.ff'
       FakeWeb.register_uri(:get, "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", :body => 'OK')
+      Deputy.send_report('Xxx.yy?y', '123', {:host => 'general'}).should == 'OK'
+    end
   end
 
   describe :extract_auth_from_url! do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deputy
 version: !ruby/object:Gem::Version 
+  hash: 65
   prerelease: false
   segments: 
   - 0
   - 1
-  - 44
-  version: 0.1.44
+  - 45
+  version: 0.1.45
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 +02:00
+date: 2010-09-06 00:00:00 +02:00
 default_executable: deputy
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: SystemTimer
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -56,23 +59,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Report to the sheriff