deputy 0.1.46 → 0.1.47

data/Gemfile

@@ -0,0 +1,9 @@
+source :rubygems
+
+group :dev do
+  gem 'jeweler'
+  gem 'fakeweb'
+  gem 'rake'
+  gem 'rspec', '~>2'
+  gem 'fastercsv'
+end

data/Gemfile.lock

@@ -0,0 +1,30 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    fakeweb (1.2.8)
+    fastercsv (1.5.3)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakeweb
+  fastercsv
+  jeweler
+  rake
+  rspec (~> 2)

data/Rakefile

@@ -1,6 +1,8 @@
 task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color -b']}
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--backtrace --color'
+end
 
 begin
   require 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.1.46
+0.1.47

data/deputy.gemspec

@@ -1,40 +1,40 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.46"
+  s.version = "0.1.47"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-09-06}
+  s.date = %q{2011-02-10}
   s.default_executable = %q{deputy}
   s.email = %q{mirko@dawanda.com}
   s.executables = ["deputy"]
   s.files = [
+    "Gemfile",
+    "Gemfile.lock",
     "Rakefile",
-     "Readme.md",
-     "VERSION",
-     "bin/deputy",
-     "deputy.gemspec",
-     "lib/deputy.rb",
-     "spec/deputy_spec.rb",
-     "spec/spec_helper.rb"
+    "Readme.md",
+    "VERSION",
+    "bin/deputy",
+    "deputy.gemspec",
+    "lib/deputy.rb",
+    "spec/deputy_spec.rb",
+    "spec/spec_helper.rb"
   ]
   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.4.2}
   s.summary = %q{Report to the sheriff}
   s.test_files = [
     "spec/deputy_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/deputy.rb

@@ -104,18 +104,27 @@ module Deputy
 
     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
         puts "#{plugin.clean_class_name}: running"
-        plugin.new.build_report
+        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
+          puts e
+          exceptions << e
+        end
       else
         puts "#{plugin.clean_class_name}: waiting another #{minutes_to_wait} minutes"
       end
     end
-    send_report 'Deputies.finished', DEFAULT_VALUE
-  rescue Exception => e
+    send_report 'Deputies.finished', (exceptions.empty? ? DEFAULT_VALUE : 'Error')
+
+    raise exceptions.first unless exceptions.empty?
+  rescue Object => e # catch and report neta errors
     send_report "Deputies.Error", e.message
     raise e
   end

data/spec/deputy_spec.rb

@@ -161,6 +161,7 @@ describe Deputy do
     end
 
     it "sleeps a random interval if given in config" do
+      pending "somehow makes the next test fail wtf!"
       Socket.stub!(:gethostname).and_return 'foo'
       Deputy.stub!(:config).and_return('max_random_start_delay' => 30)
       Deputy.stub!(:send_report)
@@ -169,13 +170,33 @@ describe Deputy do
         Deputy.run_plugins
       }.should raise_error("OK")
     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/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{
+        Deputy.run_plugins
+      }.should raise_error('FooBar')
+    end
+
+    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/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{
+        Deputy.run_plugins
+      }.should raise_error
+      $notify.should == 1
+    end
   end
 
   describe :send_report do
     before do
       Deputy.stub!(:config).and_return "sheriff_url" => 'http://sheri.ff'
     end
-    
+
     it "sends a report" do
       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'
@@ -185,7 +206,7 @@ describe Deputy do
       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&forced_host=true", :body => 'OK')
       Deputy.send_report('Xxx.yy?y', '123', {:host => 'general'}).should == 'OK'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deputy
 version: !ruby/object:Gem::Version 
-  hash: 71
-  prerelease: false
+  hash: 69
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 46
-  version: 0.1.46
+  - 47
+  version: 0.1.47
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +02:00
+date: 2011-02-10 00:00:00 +01:00
 default_executable: deputy
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: SystemTimer
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,8 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   version_requirements: *id001
+  type: :runtime
+  name: SystemTimer
 description: 
 email: mirko@dawanda.com
 executables: 
@@ -41,6 +41,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION
@@ -54,8 +56,8 @@ homepage: http://github.com/dawanda/deputy
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -79,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Report to the sheriff