capistrano-slackify 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6efe9edb2bfae9ed432763cc512c2dd71d87779f
-  data.tar.gz: 76eced927e78e318647d365931fb86dd891a0268
+  metadata.gz: 72c70783267c99964abf6c5b5d46fd4c0a86b53b
+  data.tar.gz: 01dfb51af25a60985be5d4610a027a8def26da01
 SHA512:
-  metadata.gz: aa01862a635434cdaf6edd3174c33d08ef29a6294938430d569b90f7e3745a266f04983a3ccce4d71902567ca3e80f1b1d5e2a2d84e452e3e37bd2611a15813e
-  data.tar.gz: 9715200f4b82f656b7e5023171d8a0ef98577e4e433f0a26597cc641ff313d15701f214960044ce935c02646479323dadf28a33135a180363e373a39e4895700
+  metadata.gz: dc8c4b670d23ea8c00fc5ce4627b3a72b4c00bd7734fe41714abd86be682f83b7951a9c053a67534cdd9c6abf4e3dc4bd1264ee13306353c38a5e538f37d3a8c
+  data.tar.gz: dcf88932ef185745b734fde410beeeaa23d5d61443ece1647db293ea8b5d356dfb58faeddf7e859706a5bf2cb0ef0b9e9f6e71c852903b98e41c7c33e64df068

data/README.md

@@ -69,6 +69,8 @@ Any of the defaults can be over-ridden in `config/deploy.rb`:
     set :slack_deploy_failed_text, -> {
       "#{fetch(:stage)} deploy of #{fetch(:application)} with revision/branch #{fetch(:current_revision, fetch(:branch))} failed"
     }
+    set :slack_deploy_finished_color, 'good'
+    set :slack_deploy_failed_color, 'danger'
 
 To configure the way slack parses your message (see 'Parsing Modes' at https://api.slack.com/docs/formatting) use the `:slack_parse` setting:
 

data/capistrano-slackify.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-slackify'
-  spec.version       = '2.2.0'
+  spec.version       = '2.3.0'
   spec.authors       = ['seenmyfate']
   spec.email         = ['seenmyfate@gmail.com']
   spec.summary       = %q{Publish deployment notifications to Slack via the incoming webhooks integration}

data/lib/capistrano/tasks/slackify.cap

@@ -5,8 +5,14 @@ namespace :slack do
     run_locally do
       info 'Notifying Slack of deploy starting'
       set :time_started, Time.now.to_i
+
+      payload = Slackify::Payload.build self do |default, context|
+        default[:text] = fetch(:slack_deploy_starting_text)
+        default
+      end
+
       execute :curl, '-X POST', '--data-urlencode',
-        Slackify::Payload.build(self, fetch(:slack_deploy_starting_text)),
+        payload,
         fetch(:slack_url)
     end
   end
@@ -18,8 +24,43 @@ namespace :slack do
     run_locally do
       info 'Notifying Slack of deploy finished'
       set :time_finished, Time.now.to_i
+
+      payload = Slackify::Payload.build self do |default, context|
+        text = fetch(:slack_text)
+        default[:attachments] = [
+          {
+            fallback: text,
+            color: fetch(:slack_deploy_finished_color),
+            text: text,
+            fields: [
+              {
+                title: 'Status',
+                value: 'success',
+                short: true
+              },
+              {
+                title: 'Stage',
+                value: fetch(:stage),
+                short: true
+              },
+              {
+                title: 'Branch',
+                value: fetch(:branch),
+                short: true
+              },
+              {
+                title: 'Revision',
+                value: fetch(:current_revision),
+                short: true
+              },
+            ]
+          }
+        ]
+        default
+      end
+
       execute :curl, '-X POST', '--data-urlencode',
-        Slackify::Payload.build(self, fetch(:slack_text)),
+        payload,
         fetch(:slack_url)
     end
   end
@@ -31,8 +72,43 @@ namespace :slack do
     run_locally do
       info 'Notifying Slack of deploy failed'
       set :time_finished, Time.now.to_i
+
+      payload = Slackify::Payload.build self do |default, context|
+        text = fetch :slack_deploy_failed_text
+        default[:attachments] = [
+          {
+            fallback: text,
+            color: fetch(:slack_deploy_failed_color),
+            text: text,
+            fields: [
+              {
+                title: 'Status',
+                value: 'failed',
+                short: true
+              },
+              {
+                title: 'Stage',
+                value: fetch(:stage),
+                short: true
+              },
+              {
+                title: 'Branch',
+                value: fetch(:branch),
+                short: true
+              },
+              {
+                title: 'Revision',
+                value: fetch(:current_revision),
+                short: true
+              },
+            ]
+          }
+        ]
+        default
+      end
+
       execute :curl, '-X POST', '--data-urlencode',
-        Slackify::Payload.build(self, fetch(:slack_deploy_failed_text)),
+        payload,
         fetch(:slack_url)
     end
   end
@@ -49,15 +125,16 @@ namespace :load do
     set :slack_url, -> { fail ':slack_url is not set' }
     set :slack_text, lambda {
       time_elapsed = Integer(fetch(:time_finished) - fetch(:time_started))
-      "Revision #{fetch(:current_revision, fetch(:branch))} of " \
-      "#{fetch(:application)} deployed to #{fetch(:stage)} by #{fetch(:slack_user)} " \
+      "#{fetch(:application)} deployed by #{fetch(:slack_user)} " \
       "in #{time_elapsed} seconds."
     }
     set :slack_deploy_starting_text, -> {
       "#{fetch(:stage)} deploy starting with revision/branch #{fetch(:current_revision, fetch(:branch))} for #{fetch(:application)}"
     }
     set :slack_deploy_failed_text, -> {
-      "#{fetch(:stage)} deploy of #{fetch(:application)} with revision/branch #{fetch(:current_revision, fetch(:branch))} failed"
+      "deploy of #{fetch(:application)}"
     }
+    set :slack_deploy_finished_color, 'good'
+    set :slack_deploy_failed_color, 'danger'
   end
 end

data/lib/slackify.rb

@@ -3,29 +3,28 @@ require 'multi_json'
 module Slackify
   class Payload
 
-    attr_reader :text
-    protected :text
-
-    def initialize(context, text)
-      @context, @text = context, text
+    def initialize(context)
+      @context = context
     end
 
-    def self.build(context, text)
-      new(context, text).build
+    def self.build(context, &block)
+      new(context).build(&block)
     end
 
-    def build
-      "'payload=#{payload}'"
+    def build(&block)
+      "'payload=#{payload(&block)}'"
     end
 
-    def payload
-      MultiJson.dump({
+    def payload(&block)
+      default = {
         channel: fetch(:slack_channel),
         username: fetch(:slack_username),
-        text: text,
         icon_emoji: fetch(:slack_emoji),
         parse: fetch(:slack_parse)
-      })
+      }
+
+      json = yield(default, @context)
+      MultiJson.dump(json)
     end
 
     def fetch(*args, &block)

data/spec/lib/slackify_spec.rb

@@ -15,13 +15,20 @@ module Slackify
       }
 
       let(:payload) {
-        %{'payload={"channel":"#general","username":"Capistrano","text":":boom:","icon_emoji":":ghost:","parse":"default"}'}
+        %{'payload={"channel":"#general","username":"Capistrano","icon_emoji":":ghost:","parse":"default","text":":boom:"}'}
       }
 
       let(:text) { context.fetch(:slack_text) }
 
+      let(:builded_payload) {
+        Payload.build context do |default, context|
+          default[:text] = text
+          default
+        end
+      }
+
       it 'returns the payload with the specified text' do
-        expect(Payload.build(context, text)).to eq payload
+        expect(builded_payload).to eq payload
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-slackify
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - seenmyfate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Publish deployment notifications to Slack via the incoming webhooks integration