slackistrano 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d58d90d84b9afb75ad4d9f823cc7aaa5a70c6f2a
-  data.tar.gz: e60fff0f076080afa0b6f45cec21574692fd5f7c
+  metadata.gz: 0a1407bbf8b606b2623a052d52055df8cc7b36bb
+  data.tar.gz: 81a5347837440d5955545f6fc3f74bc6b1e69ffe
 SHA512:
-  metadata.gz: 3db7ce926a979e201219dbb021e5335c3396feeeb6f280318385ca98bec7ce749be8beb74cf37be979a39b1c820fef5ab23e1207c35d8600b6c8521d7a4851a8
-  data.tar.gz: 7292420d05d6d461984c502fe90c5b3f4d2393930c6343249d57accd9a0c88dba8a73d10c290c212ce00e863e49dbadbb1efa93f6eb3a62f52620468dcab0009
+  metadata.gz: f06468179a1d516d756972e6eae955ffa1d340284b415e2bd588950cd42eb7db164b2a9edb9e81a2d69fbb5029490947991bd58dc17e41009866e410aa25a8f9
+  data.tar.gz: c193cbf26a18f3d8b1a73591cb95dd85b4bb31340d3db76790955e5ccdb7a603b9ebf7aee6e5b1eb5d9566aade7a2c567fc7ce7bfe0d0c348b593ec5bf1e3ba5

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 2.2.0
   - 2.1.0
   - 2.0.0

data/README.md

@@ -58,9 +58,9 @@ Optionally, override the other slack settings:
     set :slack_run_starting, ->{ true }
     set :slack_run_finished, ->{ true }
     set :slack_run_failed,   ->{ true }
-    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,   ->{ "*ERROR!* #{ENV['USER'] || ENV['USERNAME']} failed to deploy branch #{fetch :branch} of #{fetch :application} to #{fetch :rails_env, 'production'}." }
+    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'}" }
 
 **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

@@ -15,7 +15,9 @@ namespace :slack do
               username: fetch(:slack_username),
               icon_url: fetch(:slack_icon_url),
               icon_emoji: fetch(:slack_icon_emoji),
-              text: fetch(:slack_msg_starting)
+              attachments: [{
+                  text: fetch(:slack_msg_starting)
+              }]
             }
           )
         end
@@ -35,7 +37,10 @@ namespace :slack do
               username: fetch(:slack_username),
               icon_url: fetch(:slack_icon_url),
               icon_emoji: fetch(:slack_icon_emoji),
-              text: fetch(:slack_msg_finished)
+              attachments: [{
+                  color: 'good',
+                  text: fetch(:slack_msg_finished)
+              }]
             }
           )
         end
@@ -55,7 +60,10 @@ namespace :slack do
               username: fetch(:slack_username),
               icon_url: fetch(:slack_icon_url),
               icon_emoji: fetch(:slack_icon_emoji),
-              text: fetch(:slack_msg_failed),
+              attachments: [{
+                  color: 'danger',
+                  text: fetch(:slack_msg_failed)
+              }]
             }
           )
         end
@@ -84,8 +92,8 @@ namespace :load do
     set :slack_run_starting, ->{ true } # Set to false to disable starting message.
     set :slack_run_finished, ->{ true } # Set to false to disable finished message.
     set :slack_run_failed,   ->{ true } # Set to false to disable failure message.
-    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,   ->{ "*ERROR!* #{ENV['USER'] || ENV['USERNAME']} failed to deploy branch #{fetch :branch} of #{fetch :application} to #{fetch :stage, 'an unknown stage'}." }
+    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'}" }
   end
 end

data/lib/slackistrano/version.rb

@@ -1,3 +1,3 @@
 module Slackistrano
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/spec_helper.rb

@@ -11,6 +11,5 @@ require 'rspec'
 Dir['#{File.dirname(__FILE__)}/support/**/*.rb'].each {|f| require f}
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.order = 'random'
 end

data/spec/tasks_spec.rb

@@ -23,8 +23,7 @@ describe Slackistrano do
     Rake::Task['deploy:failed'].execute
   end
 
-  %w[starting finished failed].each do |stage|
-
+  shared_examples_for "slack notification" do |stage, color = nil|
     it "posts to slack on slack:deploy:#{stage}" do
       set "slack_run_#{stage}".to_sym, ->{ true }
       expect(Slackistrano).to receive :post
@@ -38,14 +37,18 @@ describe Slackistrano do
     end
 
     it "calls Slackistrano.post with all the right arguments on slack:deploy:#{stage}" do
-      set "slack_run_#{stage}".to_sym, ->{ true }
+      set :"slack_run_#{stage}", ->{ true }
       set :slack_team,         ->{ 'team' }
       set :slack_token,        ->{ 'token' }
       set :slack_webhook,      ->{ 'webhook' }
       set :slack_channel,      ->{ 'channel' }
       set :slack_icon_url,     ->{ 'http://icon.url' }
       set :slack_icon_emoji,   ->{ ':emoji:' }
-      set "slack_msg_#{stage}".to_sym, ->{ 'text message' }
+      set :"slack_msg_#{stage}", ->{ 'text message' }
+
+      attachment = {text: 'text message'}
+      attachment[:color] = color unless color.nil?
+
       expect(Slackistrano).to receive(:post).with(
         team: 'team',
         token: 'token',
@@ -56,11 +59,22 @@ describe Slackistrano do
           username: 'Slackistrano',
           icon_url: 'http://icon.url',
           icon_emoji: ':emoji:',
-          text: 'text message'
+          attachments: [attachment]
         }
       )
       Rake::Task["slack:deploy:#{stage}"].execute
     end
-  end # of stage loop
+  end
 
+  describe 'build is starting' do
+    it_should_behave_like "slack notification", :starting
+  end
+
+  describe 'build has finished' do
+    it_should_behave_like "slack notification", :finished, 'good'
+  end
+
+  describe 'build has failed' do
+    it_should_behave_like "slack notification", :failed, 'danger'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackistrano
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Philip Hallstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano