deputy 0.1.37 → 0.1.38

data/VERSION

@@ -1 +1 @@
-0.1.37
+0.1.38

data/deputy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.37"
+  s.version = "0.1.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-07-15}
+  s.date = %q{2010-07-16}
   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.7}
+  s.rubygems_version = %q{1.3.6}
   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::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/deputy.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'open-uri'
 require 'cgi'
+require "socket"
 
 def eval_and_fetch_constants(x)
   old = Module.constants.map{|c| c.to_s}
@@ -117,16 +118,12 @@ module Deputy
 
   def self.send_report(group, value)
     raise "separate #{group} with a ." unless group.split('.',2).size == 2
-    get "/notify?group=#{CGI.escape group}&value=#{CGI.escape value.to_s}"
+    get "/notify?group=#{CGI.escape group}&value=#{CGI.escape value.to_s}&hostname=#{Socket.gethostname}"
   end
 
   def self.get(path, options = {})
-    
     url = "#{sheriff_url}#{path}"
-    url = url.sub(%r{//(.*?):(.*?)@}, '//')
-    auth = [$1, $2].compact
-    options[:http_basic_authentication] = auth if auth.size == 2
-    options['REMOTE_HOST'] = hostname
+    options[:http_basic_authentication] = extract_auth_from_url!(url)
 
     Timeout.timeout(config['timeout']||10) do
       open(url, options).read
@@ -148,10 +145,6 @@ module Deputy
     raise "No deputy.yml found in /etc or #{home}"
   end
 
-  def self.hostname
-    File.read('/etc/hostname') rescue "hostname_unknown"
-  end
-
   # stolen from klarlack -- http://github.com/schoefmax/klarlack
   # to get an reliable timeout that wont fail on other platforms
   # or if sytem_timer is missing
@@ -173,4 +166,10 @@ module Deputy
     require 'timeout'
     Timeout
   end
+
+  def self.extract_auth_from_url!(url)
+    url.sub!(%r{//(.*?):(.*?)@}, '//')
+    auth = [$1, $2].compact
+    auth.empty? ? nil : auth
+  end
 end

data/spec/deputy_spec.rb

@@ -32,6 +32,10 @@ class OptionsPlugin < Scout::Plugin
 end
 
 describe Deputy do
+  before do
+    Socket.stub!(:gethostname).and_return 'my_host'
+  end
+
   it "has a VERSION" do
     Deputy::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
@@ -143,7 +147,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/notify?group=Deputies.finished&value=1", :body => 'OK')
+      FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=1&hostname=my_host", :body => 'OK')
       Deputy.run_plugins
       $notify.should == 1
     end
@@ -152,14 +156,36 @@ describe Deputy do
   describe :send_report do
     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", :body => 'OK')
+      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", :body => 'OK')
+      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
   end
+
+  describe :extract_auth_from_url! do
+    it "finds auth" do
+      Deputy.extract_auth_from_url!('http://x:y@foo').should == ['x','y']
+    end
+
+    it "removes auth from url" do
+      url = 'http://x:y@foo'
+      Deputy.extract_auth_from_url!(url)
+      url.should == 'http://foo'
+    end
+
+    it "returns nil when auth was not found" do
+      Deputy.extract_auth_from_url!('http://foo').should == nil
+    end
+
+    it "does not alter url when auth was not found" do
+      url = 'http://foo'
+      Deputy.extract_auth_from_url!(url)
+      url.should == 'http://foo'
+    end
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: deputy
 version: !ruby/object:Gem::Version 
-  hash: 81
   prerelease: false
   segments: 
   - 0
   - 1
-  - 37
-  version: 0.1.37
+  - 38
+  version: 0.1.38
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-07-16 00:00:00 +02:00
 default_executable: deputy
 dependencies: []
 
@@ -46,27 +45,23 @@ 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.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Report to the sheriff