lib/chef-irc-snitch.rb in chef-irc-snitch-0.2.0.beta vs lib/chef-irc-snitch.rb in chef-irc-snitch-0.2.0

@@ -1,32 +1,35 @@
-require 'rubygems'
-require 'chef/handler'
-require 'uri'
-require 'json'
-require 'net/https'
-require 'carrier-pigeon'
+require "rubygems"
+require "chef/handler"
+require "uri"
+require "json"
+require "net/https"
+require "carrier-pigeon"
 
 class IRCSnitch < Chef::Handler
-
   def initialize(irc_uri, ssl=false)
     @irc_uri = irc_uri
     @ssl = ssl
     @timestamp = Time.now.getutc
     @gist_url = nil
   end
 
   def formatted_run_list
-    node.run_list.map { |r| r.type == :role ? r.name : r.to_s }.join(', ')
+    node.run_list.map { |r| r.type == :role ? r.name : r.to_s }.join(", ")
   end
 
   def formatted_gist
-    info = [
-      "Node: #{node.name} (#{node.ipaddress})",
+    ip_address = node.has_key?(:cloud) ? node.cloud.public_ipv4 : node.ipaddress
+    node_info = [
+      "Node: #{node.name} (#{ip_address})",
       "Run list: #{node.run_list}",
       "All roles: #{node.roles.join(', ')}"
     ].join("\n")
-    backtrace = Array(backtrace).join("\n")
-    [info, run_status.formatted_exception, backtrace].join("\n")
+    [
+      node_info,
+      run_status.formatted_exception,
+      Array(backtrace).join("\n")
+    ].join("\n\n")
   end
 
   def create_gist
     begin
       timeout(10) do