irccat.rb in knife-spork-1.6.0

- old
+ new

@@ -42,10 +42,11 @@
 
       def after_promote_remote
         environments.each do |environment|
           diff = environment_diffs[environment.name]
           env_gist = env_gist(environment, diff) if config.gist
+          display_gist(env_gist) if env_gist
           irccat(template(:promote) % {
             :organization => organization,
             :current_user => current_user,
             :cookbooks    => cookbooks.collect{ |c| "#{c.name}@#{c.version}" }.join(", "),
             :environment  => environment.name,
@@ -54,90 +55,99 @@
         end
       end
 
       def after_environmentfromfile
         environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(environment_gist) if environment_gist
         irccat(template(:environmentfromfile) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => environment_gist
         })
       end
 
       def after_environmentedit
         environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(environment_gist) if environment_gist
         irccat(template(:environmentedit) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => environment_gist
         })
       end
 
       def after_environmentcreate
         environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(environment_gist) if environment_gist
         irccat(template(:environmentcreate) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => environment_gist
         })
       end
 
       def after_environmentdelete
         environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(environment_gist) if environment_gist
         irccat(template(:environmentdelete) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => environment_gist
         })
       end
 
       def after_rolefromfile
         role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(role_gist) if role_gist
         irccat(template(:rolefromfile) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => role_gist
         })
       end
 
       def after_roleedit
         role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(role_gist) if role_gist
         irccat(template(:roleedit) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => role_gist
         })
       end
 
       def after_rolecreate
         role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(role_gist) if role_gist
         irccat(template(:rolecreate) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => role_gist
         })
       end
 
       def after_roledelete
         role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(role_gist) if role_gist
         irccat(template(:roledelete) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => role_gist
         })
       end
 
       def after_databagedit
         databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagedit) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :object_secondary_name    => object_secondary_name,
@@ -145,20 +155,22 @@
         })
       end
 
       def after_databagdelete
         databag_gist = object_gist("databag item", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagdelete) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => databag_gist
         })
       end
 
       def after_databagitemdelete
         databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagitemdelete) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :object_secondary_name    => object_secondary_name,
@@ -166,20 +178,22 @@
         })
       end
 
       def after_databagcreate
         databag_gist = object_gist("databag", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagcreate) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => databag_gist
         })
       end
 
       def after_databagfromfile
         databag_gist = object_gist("databag", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagfromfile) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :object_secondary_name    => object_secondary_name,
@@ -187,50 +201,55 @@
         })
       end
 
       def after_nodeedit
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:nodeedit) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => node_gist
         })
       end
 
       def after_nodedelete
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:nodedelete) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => node_gist
         })
       end
 
       def after_nodecreate
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:nodecreate) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => node_gist
         })
       end
 
       def after_nodefromfile
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:nodefromfile) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :gist => node_gist
         })
       end
 
       def after_noderunlistadd
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:noderunlistadd) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :object_secondary_name    => object_secondary_name,
@@ -238,10 +257,11 @@
         })
       end
 
       def after_noderunlistremove
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:noderunlistremove) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :object_secondary_name    => object_secondary_name,
@@ -249,10 +269,11 @@
         })
       end
 
       def after_noderunlistset
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:noderunlistset) % {
             :organization => organization,
             :current_user => current_user,
             :object_name    => object_name,
             :object_secondary_name    => object_secondary_name,
@@ -277,9 +298,13 @@
       end
 
       def env_gist(environment, diff)
         msg = "Environment #{environment} uploaded at #{Time.now.getutc} by #{current_user}\n\nConstraints updated on server in this version:\n\n#{diff.collect { |k, v| "#{k}: #{v}\n" }.join}"
         %x[ echo "#{msg}" | #{config.gist}]
+      end
+
+      def display_gist(gist)
+        ui.info "Gist generated at #{gist}"
       end
 
       def object_gist(object_type, object_name, object_diff)
         msg = "#{object_type.capitalize} #{object_name} changed at #{Time.now.getutc} by #{current_user}\n\nDiff is as follows:\n\n#{object_diff}"
         %x[ echo "#{msg}" | #{config.gist}]