fiveruns-dash-ruby 0.7.5 → 0.7.6

data/lib/fiveruns/dash/configuration.rb

@@ -62,7 +62,9 @@ module Fiveruns::Dash
     # Merge in an existing recipe
     # call-seq:
     #   add_recipe :ruby
-    def add_recipe(name, options = {})
+    def add_recipe(name, options = {}, &block)
+      Fiveruns::Dash.register_recipe(name, options, &block) if block_given?
+
       if Fiveruns::Dash.recipes[name]
         Fiveruns::Dash.recipes[name].each do |recipe|
           if !recipes.include?(recipe) && recipe.matches?(options)

data/lib/fiveruns/dash/metric.rb

@@ -133,17 +133,27 @@ module Fiveruns::Dash
           values.detect { |value| value[:context] == context }[:value]
         end
 
-        { :value => @operation.call(*args), :context => context }
+        { :value => metric_callback(*args), :context => context }
       end
 
       {:values => values}
     end
 
     def value_hash
-      current_value = ::Fiveruns::Dash.sync { @operation.call }
+      current_value = ::Fiveruns::Dash.sync { metric_callback }
       {:values => parse_value(current_value)}
     end
     
+    def metric_callback(*args)
+      begin
+        @operation.call(*args)
+      rescue Exception => ex
+        Fiveruns::Dash.logger.error("Metric #{recipe ? "#{recipe.name}/" : ''}#{@name} raised #{ex.class.name}: #{ex.message}")
+        Fiveruns::Dash.logger.error(ex.backtrace.join("\n"))
+        0
+      end
+    end
+
     # Verifies value matches one of the following patterns:
     # * A numeric value (indicates no namespace)
     # * A hash of [namespace_kind, namespace_name, ...] => value pairs, eg:

data/test/test_helper.rb

@@ -46,6 +46,7 @@ class Test::Unit::TestCase
     @recipes << Fiveruns::Dash::Recipe.new(:foo, :url => 'http://foo.com')
     @recipes << Fiveruns::Dash::Recipe.new(:foo2, :url => 'http://foo2.com')
     @metrics << @metric_class.new("NonCustomMetric") { 2 }
+    @metrics << @metric_class.new("BadMetric") { raise ArgumentError }
     @configuration = flexmock(:configuration) do |mock|
       mock.should_receive(:metrics).and_return(@metrics)
       mock.should_receive(:recipes).and_return(@recipes)

data/version.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 5
+:patch: 6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency