slackistrano 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11791217d0177e658e5632ae0e89f110882fe044
-  data.tar.gz: 65ffd1268921fa6d6286e1bf40c8269c5430c8bc
+  metadata.gz: 1a0f452cf7ee31969c23a554ccec0418f467f08d
+  data.tar.gz: c905557c5378737e129954ca0cd76664d0ce9b39
 SHA512:
-  metadata.gz: 0e7e7e693a96352c351bcb781220e0c2dff6deefa44c03ff330c9eb2ec2e19bc23db22840f688dfa5c1ad64fef094987a0364aba3f154752b3b8df30e57614c8
-  data.tar.gz: 733ea398ef62098fe93fac6974c03a34df539d10758b4d2ab219a6a8716a80204b4a521a78c60ffb56e1e32f5225240af39c7664083f8f733d0c2d739a4da80b
+  metadata.gz: aa80630b66e5b949ec5507aa23c5efcd55ac8856d3304e4bfac8d2389c1b9756976bda398c3494323eba6398fd9faf8e0ed86a9f2cfcb1be3e85ec0f3bbc29b8
+  data.tar.gz: 3ac0e1018da28a10cc46c61de1ccca3928c12cf831ed262d355b88024e579f7eae450aae0c34b0aaab3ce295c990f73d3e1bd9383c4420753e146fb81990f1cd

data/README.md

@@ -64,6 +64,9 @@ Optionally, override the other slack settings:
     set :slack_msg_starting,     -> { "#{ENV['USER'] || ENV['USERNAME']} has started deploying branch #{fetch :branch} of #{fetch :application} to #{fetch :rails_env, 'production'}" }
     set :slack_msg_finished,     -> { "#{ENV['USER'] || ENV['USERNAME']} has finished deploying branch #{fetch :branch} of #{fetch :application} to #{fetch :rails_env, 'production'}" }
     set :slack_msg_failed,       -> { "#{ENV['USER'] || ENV['USERNAME']} failed to deploy branch #{fetch :branch} of #{fetch :application} to #{fetch :rails_env, 'production'}" }
+    set :slack_title_starting,   -> { nil }
+    set :slack_title_finished,   -> { nil }
+    set :slack_title_failed,     -> { nil }
 
 **Note**: You may wish to disable one of the notifications if another service (ex:
 Honeybadger) also displays a deploy notification.

data/lib/slackistrano/tasks/slack.rake

@@ -1,6 +1,14 @@
-
 namespace :slack do
   namespace :deploy do
+    def make_attachments(stage, options={})
+      attachments = options.merge({
+        title: fetch(:"slack_title_#{stage}"),
+        pretext: fetch(:"slack_pretext_#{stage}"),
+        text: fetch(:"slack_msg_#{stage}"),
+        mrkdwn_in: [:text, :pretext]
+      }).reject{|k, v| v.nil? }
+      [attachments]
+    end
 
     task :starting do
       if fetch(:slack_run_starting)
@@ -15,10 +23,7 @@ namespace :slack do
               username: fetch(:slack_username),
               icon_url: fetch(:slack_icon_url),
               icon_emoji: fetch(:slack_icon_emoji),
-              attachments: [{
-                  text: fetch(:slack_msg_starting),
-                  mrkdwn_in: [:text]
-              }]
+              attachments: make_attachments(:starting)
             }
           )
         end
@@ -38,11 +43,7 @@ namespace :slack do
               username: fetch(:slack_username),
               icon_url: fetch(:slack_icon_url),
               icon_emoji: fetch(:slack_icon_emoji),
-              attachments: [{
-                  color: 'good',
-                  text: fetch(:slack_msg_finished),
-                  mrkdwn_in: [:text]
-              }]
+              attachments: make_attachments(:finished, color: 'good')
             }
           )
         end
@@ -62,11 +63,7 @@ namespace :slack do
               username: fetch(:slack_username),
               icon_url: fetch(:slack_icon_url),
               icon_emoji: fetch(:slack_icon_emoji),
-              attachments: [{
-                  color: 'danger',
-                  text: fetch(:slack_msg_failed),
-                  mrkdwn_in: [:text]
-              }]
+              attachments: make_attachments(:failed, color: 'danger')
             }
           )
         end
@@ -101,5 +98,11 @@ namespace :load do
     set :slack_msg_starting,     -> { "#{ENV['USER'] || ENV['USERNAME']} has started deploying branch #{fetch :branch} of #{fetch :application} to #{fetch :stage, 'an unknown stage'}" }
     set :slack_msg_finished,     -> { "#{ENV['USER'] || ENV['USERNAME']} has finished deploying branch #{fetch :branch} of #{fetch :application} to #{fetch :stage, 'an unknown stage'}" }
     set :slack_msg_failed,       -> { "#{ENV['USER'] || ENV['USERNAME']} failed to deploy branch #{fetch :branch} of #{fetch :application} to #{fetch :stage, 'an unknown stage'}" }
+    set :slack_title_starting,   -> { nil }
+    set :slack_title_finished,   -> { nil }
+    set :slack_title_failed,     -> { nil }
+    set :slack_pretext_starting, -> { nil }
+    set :slack_pretext_finished, -> { nil }
+    set :slack_pretext_failed,   -> { nil }
   end
 end

data/lib/slackistrano/version.rb

@@ -1,3 +1,3 @@
 module Slackistrano
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/spec/tasks_spec.rb

@@ -45,7 +45,7 @@ describe Slackistrano do
     ['finished', 'good', 'finished_channel'],
     ['failed', 'danger', 'failed_channel'],
   ].each do |stage, color, channel_for_stage|
-  
+
     it "calls Slackistrano.post with the right arguments for stage=#{stage}, color=#{color}, channel_for_stage=#{channel_for_stage}" do
       set :"slack_run_#{stage}", -> { true }
       set :slack_team,           -> { 'team' }
@@ -60,9 +60,9 @@ describe Slackistrano do
       expected_channel = channel_for_stage || 'channel'
 
       attachment = {
-        text: 'text message', 
+        text: 'text message',
         color: color,
-        mrkdwn_in: [:text]
+        mrkdwn_in: [:text, :pretext]
       }.reject{|k,v| v.nil?}
 
       expect(Slackistrano).to receive(:post).with(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackistrano
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Philip Hallstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano