proby_notifier 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    proby_notifier (1.0.0)
+    proby_notifier (1.1.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/proby_notifier/proby_notifier.rb

@@ -46,13 +46,19 @@ module ProbyNotifier
     #
     # @param [String] proby_task_id The id of the task to be notified. If nil, the 
     #                               value of the +PROBY_TASK_ID+ environment variable will be used.
-    def send_finish_notification(proby_task_id=nil)
-      send_notification('/finish', proby_task_id)
+    # @param [Hash] options The options for the finish notification
+    # @option options [Boolean] :failed true if this task run resulted in some sort of failure. Setting
+    #                                   this parameter to true will trigger a notification to be sent to
+    #                                   the alarms configured for the given task. Defaults to false.
+    # @option options [String] :error_message A string message describing the failure that occurred.
+    #                                         1,000 character limit.
+    def send_finish_notification(proby_task_id=nil, options={})
+      send_notification('/finish', proby_task_id, options)
     end
 
     private
 
-    def send_notification(type, proby_task_id)
+    def send_notification(type, proby_task_id, options={})
       if @api_key.nil?
         logger.warn "ProbyNotifier: No notification sent because API key is not set"
         return nil
@@ -67,11 +73,13 @@ module ProbyNotifier
       url = BASE_URL + proby_task_id + type
       uri = URI.parse(url)
       req = Net::HTTP::Post.new(uri.path, {'api_key' => @api_key})
+      req.set_form_data(options)
 
       http = Net::HTTP.new(uri.host, uri.port) 
       http.open_timeout = 3
       http.read_timeout = 3
       http.use_ssl = true
+
       res = http.start { |h| h.request(req) }
       return res.code.to_i
     rescue Exception => e

data/lib/proby_notifier/resque_plugin.rb

@@ -47,11 +47,18 @@ module ProbyNotifier
     end
 
     def around_perform_proby(*args)
+      failed = false
+      error_message = nil
       _proby_id = proby_id(*args)
       ProbyNotifier.send_start_notification(_proby_id)
       yield
+    rescue Exception => e
+      failed = true
+      error_message = "#{e.class.name}: #{e.message}"
+      error_message << "\n#{e.backtrace.join("\n")}" if e.backtrace
+      raise e
     ensure
-      ProbyNotifier.send_finish_notification(_proby_id)
+      ProbyNotifier.send_finish_notification(_proby_id, :failed => failed, :error_message => error_message)
     end
   end
 end

data/lib/proby_notifier/version.rb

@@ -1,3 +1,3 @@
 module ProbyNotifier
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/proby_notifier_test.rb

@@ -40,6 +40,11 @@ class ProbyNotifierTest < Test::Unit::TestCase
       assert_equal 200, ProbyNotifier.send_finish_notification("abc123xyz456")
     end
 
+    should "send a finish notification with options if options are specified" do
+      FakeWeb.register_uri(:post, "https://proby.signalhq.com/tasks/abc123xyz456/finish", :status => ["200", "Success"])
+      assert_equal 200, ProbyNotifier.send_finish_notification("abc123xyz456", :failed => true, :error_message => "something bad happened")
+    end
+
     should "send a finish notification if a task_id is specified in an environment variable" do
       ENV['PROBY_TASK_ID'] = "iii999ooo222"
       FakeWeb.register_uri(:post, "https://proby.signalhq.com/tasks/iii999ooo222/finish", :status => ["200", "Success"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proby_notifier
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - John Wood
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-17 00:00:00 -05:00
+date: 2011-10-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency