chef-irc-snitch 0.0.7 → 0.0.8

data/chef-irc-snitch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "chef-irc-snitch"
-  s.version     = "0.0.7"
+  s.version     = "0.0.8"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sean Porter"]
   s.email       = ["portertech@gmail.com"]

data/lib/chef-irc-snitch.rb

@@ -13,48 +13,48 @@ class IRCSnitch < Chef::Handler
     @github_user = github_user
     @github_token = github_token
     @ssl = ssl
+    @timestamp = Time.now.getutc
   end
 
   def report
-    Chef::Log.error("Chef run failed @ #{Time.now.getutc}, snitchin' to chefs via IRC")
-
-    gist = "#{run_status.formatted_exception}\n"
-    gist << Array(backtrace).join("\n")
-
-    max_attempts = 2
-    gist_id = nil
-
-    begin
-      timeout(8) do
-        res = Net::HTTP.post_form(URI.parse("http://gist.github.com/api/v1/json/new"), {
-          "files[#{node.name}-#{Time.now.to_i.to_s}]" => gist,
-          "login" => @github_user,
-          "token" => @github_token,
-          "description" => "Chef run failed on #{node.name} @ #{Time.now.getutc}",
-          "public" => false
-        })
-        gist_id = JSON.parse(res.body)["gists"].first["repo"]
-        Chef::Log.info("Created a GitHub Gist @ https://gist.github.com/#{gist_id}")
+    message = "#{run_status.formatted_exception}\n"
+    message << Array(backtrace).join("\n")
+
+    if STDOUT.tty?
+      Chef::Log.error("Chef run failed @ #{@timestamp}")
+      puts message
+    else
+      Chef::Log.error("Chef run failed @ #{@timestamp}, snitchin' to chefs via IRC")
+
+      gist_id = nil
+
+      begin
+        timeout(10) do
+          res = Net::HTTP.post_form(URI.parse("http://gist.github.com/api/v1/json/new"), {
+            "files[#{node.name}-#{@timestamp.to_i.to_s}]" => message,
+            "login" => @github_user,
+            "token" => @github_token,
+            "description" => "Chef run failed on #{node.name} @ #{@timestamp}",
+            "public" => false
+          })
+          gist_id = JSON.parse(res.body)["gists"].first["repo"]
+          Chef::Log.info("Created a GitHub Gist @ https://gist.github.com/#{gist_id}")
+        end
+      rescue Timeout::Error
+        Chef::Log.error("Timed out while attempting to create a GitHub Gist")
       end
-    rescue Timeout::Error
-      Chef::Log.error("Timed out while attempting to create a GitHub Gist, retrying ...")
-      max_attempts -= 1
-      retry if max_attempts > 0
-    end
 
-    max_attempts = 2
-    ip_address = (node.has_key? :ec2) ? node.ec2.public_ipv4 : node.ipaddress
-    message = "Chef run failed on #{node.name} : #{ip_address} : #{node.roles.join(", ")} : https://gist.github.com/#{gist_id}"
+      ip_address = (node.has_key? :ec2) ? node.ec2.public_ipv4 : node.ipaddress
+      message = "Chef run failed on #{node.name} : #{ip_address} : #{node.roles.join(", ")} : https://gist.github.com/#{gist_id}"
 
-    begin
-      timeout(8) do
-        CarrierPigeon.send(:uri => @irc_uri, :message => message, :ssl => @ssl)
-        Chef::Log.info("Informed chefs via IRC : #{message}")
+      begin
+        timeout(10) do
+          CarrierPigeon.send(:uri => @irc_uri, :message => message, :ssl => @ssl)
+          Chef::Log.info("Informed chefs via IRC '#{message}'")
+        end
+      rescue Timeout::Error
+        Chef::Log.error("Timed out while attempting to message Chefs via IRC")
       end
-    rescue Timeout::Error
-      Chef::Log.error("Timed out while attempting to message Chefs via IRC, retrying ...")
-      max_attempts -= 1
-      retry if max_attempts > 0
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: chef-irc-snitch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Sean Porter
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-07 00:00:00 -07:00
-default_executable: 
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -52,7 +51,6 @@ files:
 - Rakefile
 - chef-irc-snitch.gemspec
 - lib/chef-irc-snitch.rb
-has_rdoc: true
 homepage: https://github.com/portertech/chef-irc-snitch
 licenses: 
 - MIT
@@ -76,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: chef-irc-snitch
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: An exception handler for OpsCode Chef runs (GitHub Gists & IRC)