capistrano-slackify 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f301be9a89dff52e3090565e59405aa95fc544d4
-  data.tar.gz: a82912d5c917ab546bdaa307d093eac3d5ce7e88
+  metadata.gz: 2c1ce687a6a8d75cb09a1d5f1e1b4011548cb9c7
+  data.tar.gz: 333a05e6aeb30849c73484471ab1e7bc0a35aff0
 SHA512:
-  metadata.gz: 68c38752b583529ee11fce5ad58eb7df1e6efe3267b4fc07a844f6d19b2528fec14a9f98750375a3ef9769c005abe89d011ab589e7b4ed75918be1806af2fc43
-  data.tar.gz: ae0c58950a2801b61e29e282a4dcee62d7a48e9d747a36ef1410a902920ce0125ae5e6a96ef0aff47cc5e3859bba0c04dbeaf2525545b6ac460a33ea55af9457
+  metadata.gz: 0bf327f9e7abea13eecffffb4ce555565ba006825c644c77010075553645117255bb00886a367d67d097b54ff1a845768c126a93435254a3244476819580a50f
+  data.tar.gz: 1af5d9defc5846fad95a6b7590fedef9d46ed665f72f8e4af57bcf2d7dd22ccca9af91d0616df1e792ae230c0246649870c6ba3739de0842ade2ac8c43a8fb60

data/README.md

@@ -76,6 +76,32 @@ Any of the defaults can be over-ridden in `config/deploy.rb`:
     set :slack_deploy_failed_color, 'danger'
     set :slack_notify_events, [:started, :finished, :failed]
 
+You can setup custom fields by defining a mapping for how to display them in slack:
+
+    set :slack_fields, ['status', 'environment', 'docker_image']
+    # You could also add your custom mappings to the defaults with:
+    # set :slack_fields, fetch(:slack_fields).push('environment', 'docker_image')
+    set :slack_custom_field_mapping, -> {
+      {
+        'environment' => {
+          title: 'Environment',
+          value: -> {
+            if fetch(:stage) == :production
+              'production'
+            else
+              "staging-#{fetch(:staging_name)}"
+            end
+          },
+          short: true,
+        },
+        'docker_image' => {
+          title: 'Docker image',
+          value: fetch(:docker_image),
+          short: false,
+        },
+      }
+    }
+
 To configure the way slack parses your message (see 'Parsing Modes' at https://api.slack.com/docs/formatting) use the `:slack_parse` setting:
 
     set :slack_parse, 'none' # available options: 'default', 'none', 'full'

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.8.0'
+  spec.version       = '2.9.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

@@ -59,6 +59,7 @@ namespace :load do
     set :slack_parse, 'default'
     set :slack_user, -> { local_user.strip }
     set :slack_fields, ['status', 'stage', 'branch', 'revision', 'hosts']
+    set :slack_custom_field_mapping, {}
     set :slack_mrkdwn_in, []
     set :slack_hosts, -> { release_roles(:all).map(&:hostname).join("\n") }
     set :slack_url, -> { fail ':slack_url is not set' }

data/lib/slackify.rb

@@ -17,7 +17,44 @@ module Slackify
     end
 
     def payload
-      fields_map = {
+      fields = fetch(:slack_fields).each_with_object([]) { |field, fields|
+        if fields_map[field].fetch(:value).respond_to?(:call)
+          field_data = fields_map[field]
+          field_data[:value] = field_data.fetch(:value).call
+          fields.push(field_data)
+        else
+          fields.push(fields_map[field])
+        end
+      }
+
+      MultiJson.dump(
+        {
+          channel: fetch(:slack_channel),
+          username: fetch(:slack_username),
+          icon_emoji: fetch(:slack_emoji),
+          parse: fetch(:slack_parse),
+          attachments: [
+            {
+              fallback: text,
+              color: color,
+              text: text,
+              fields: fields,
+              mrkdwn_in: fetch(:slack_mrkdwn_in),
+            }
+          ]
+        }
+      )
+    end
+
+    def fields_map
+      @fields_map ||= [
+        default_field_map,
+        fetch(:slack_custom_field_mapping),
+      ].reduce(&:merge)
+    end
+
+    def default_field_map
+      {
         'status' => {
           title: 'Status',
           value: @status,
@@ -44,30 +81,6 @@ module Slackify
           short: true
         }
       }
-
-      fields = []
-
-      fetch(:slack_fields).each { |field|
-        fields.push(fields_map[field])
-      }
-
-      MultiJson.dump(
-        {
-          channel: fetch(:slack_channel),
-          username: fetch(:slack_username),
-          icon_emoji: fetch(:slack_emoji),
-          parse: fetch(:slack_parse),
-          attachments: [
-            {
-              fallback: text,
-              color: color,
-              text: text,
-              fields: fields,
-              mrkdwn_in: fetch(:slack_mrkdwn_in),
-            }
-          ]
-        }
-      )
     end
 
     def fetch(*args, &block)

data/spec/lib/slackify_spec.rb

@@ -10,7 +10,21 @@ module Slackify
           slack_emoji: ':ghost:',
           slack_parse: 'default',
           slack_user: 'You',
-          slack_fields: ['status', 'stage', 'branch', 'revision', 'hosts'],
+          slack_fields: ['status', 'stage', 'branch', 'revision', 'hosts', 'custom_field', 'custom_field_with_proc'],
+          slack_custom_field_mapping: {
+            'custom_field' => {
+              title: 'custom title',
+              value: 'custom value',
+              short: false
+            },
+            'custom_field_with_proc' => {
+              title: 'custom title proc',
+              value: -> {
+                'custom value proc'
+              },
+              short: false
+            }
+          },
           slack_mrkdwn_in: ['text'],
           slack_hosts: "192.168.10.1\r192.168.10.2",
           slack_text: ':boom:',
@@ -22,7 +36,7 @@ module Slackify
       }
 
       let(:payload) {
-        %{'payload={"channel":"#general","username":"Capistrano","icon_emoji":":ghost:","parse":"default","attachments":[{"fallback":":boom:","color":"good","text":":boom:","fields":[{"title":"Status","value":"success","short":true},{"title":"Stage","value":"sandbox","short":true},{"title":"Branch","value":"master","short":true},{"title":"Revision","value":"SHA","short":true},{"title":"Hosts","value":"192.168.10.1\\r192.168.10.2","short":true}],"mrkdwn_in":["text"]}]}'}
+        %{'payload={"channel":"#general","username":"Capistrano","icon_emoji":":ghost:","parse":"default","attachments":[{"fallback":":boom:","color":"good","text":":boom:","fields":[{"title":"Status","value":"success","short":true},{"title":"Stage","value":"sandbox","short":true},{"title":"Branch","value":"master","short":true},{"title":"Revision","value":"SHA","short":true},{"title":"Hosts","value":"192.168.10.1\\r192.168.10.2","short":true},{"title":"custom title","value":"custom value","short":false},{"title":"custom title proc","value":"custom value proc","short":false}],"mrkdwn_in":["text"]}]}'}
       }
 
       let(:text) { context.fetch(:slack_text) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-slackify
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - seenmyfate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano