slackistrano 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a1bb96232995fa01ec31424aa78f09a2812660
-  data.tar.gz: 3b6b45e2546a3b336fcb38af43256ae08ad9f951
+  metadata.gz: d3998c3aea514c9828cf3e3ab08e2ab68d91b897
+  data.tar.gz: 6734a8944a889eba842e5e201a556fd66a065eb0
 SHA512:
-  metadata.gz: af928b2ea2c32aefb7cfaf0af1f89ec519caf391e4e02e152a50e25b5e68dd9a363846079e1826fb6c4aeac5412c17de4d2b4de6a09d0d7593a788bc9d79d2a7
-  data.tar.gz: 4a6c9f5f152ff9819f7d5f07601ef5d944c6dc63598ff37e84cc070c7d206405e67110fd59b960e1f79ba0996e838b645d63047834bd004c80a40a444f682f97
+  metadata.gz: 92b28a925c578cfc17f16ad244403cee548612508aecb0fa4e4cb7be4ff62f09f06700fcc5956b3d1b3fb0f584779fad8848787623dd0f10a8bcb4cdba42f3df
+  data.tar.gz: b59697ca1b2001a6660e8bf85d5b18d85d39be16dcad9a1bd7232c3ef3df035a31f64f559790ca5a0b47fe9a71a17653acfbf7d86e73cee22a08efefcad7113b

data/README.md

@@ -31,14 +31,21 @@ You have two options to notify a channel in Slack when you deploy:
  1. Using *Incoming WebHooks* integration, offering more options but requires one of the five free integrations. This is the default option.
  2. Using *Slackbot*, which will not use one of the five free integrations. Enable via the `:slack_via_slackbot` option.
 
-In both case, you need to enable the integration inside Slack and get the token that will be needed later.
+In both case, you need to enable the integration inside Slack and get the token and/or webhook url that will be needed later.
+
+
 
 Require the library in your application's Capfile:
 
     require 'slackistrano'
 
-Set your team and token in your application's config/deploy.rb:
+If you post using *Incoming Webhooks* you need to set your webhook url in your application's config/deploy.rb:
+
+    set :slack_webhook, "https://hooks.slack.com/services/XXX/XXX/XXX"
+
+If you choose to post using *Slackbot* you **must** set your team and and token in your application's config/deploy.rb:
 
+    set :slack_via_slackbot, true
     set :slack_team, "supremegolf"
     set :slack_token, "xxxxxxxxxxxxxxxxxxxxxxxx"
 
@@ -54,7 +61,6 @@ 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,   ->{ "*ERROR!* #{ENV['USER'] || ENV['USERNAME']} failed to deploy branch #{fetch :branch} of #{fetch :application} to #{fetch :rails_env, 'production'}." }
-    set :slack_via_slackbot, ->{ false } # Set to true to send the message via slackbot instead of webhook
 
 **Note**: You may wish to disable one of the notifications if another service (ex:
 Honeybadger) also displays a deploy notification.

data/lib/slackistrano.rb

@@ -5,20 +5,47 @@ require 'json'
 load File.expand_path("../slackistrano/tasks/slack.rake", __FILE__)
 
 module Slackistrano
-  def self.post(team: nil, token: nil, via_slackbot: false, payload: {})
-    if via_slackbot
-      uri = URI(URI.encode("https://#{team}.slack.com/services/hooks/slackbot?token=#{token}&channel=#{payload[:channel]}"))
 
-      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-        response = http.request_post uri.request_uri, payload[:text]
-      end
+  #
+  #
+  #
+  def self.post(team: nil, token: nil, webhook: nil, via_slackbot: false, payload: {})
+    if via_slackbot
+      post_as_slackbot(team: team, token: token, webhook: webhook, payload: payload)
     else
-      uri = URI("https://#{team}.slack.com/services/hooks/incoming-webhook")
-      res = Net::HTTP.post_form(uri, 'token' => token, 'payload' => payload.to_json)
+      post_as_webhook(team: team, token: token, webhook: webhook, payload: payload)
     end
   rescue => e
     puts "There was an error notifying Slack."
     puts e.inspect
   end
+
+  #
+  #
+  #
+  def self.post_as_slackbot(team: nil, token: nil, webhook: webhook, payload: {})
+    uri = URI(URI.encode("https://#{team}.slack.com/services/hooks/slackbot?token=#{token}&channel=#{payload[:channel]}"))
+
+    Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+      http.request_post uri.request_uri, payload[:text]
+    end
+  end
+
+  #
+  #
+  #
+  def self.post_as_webhook(team: nil, token: nil, webhook: webhook, payload: {})
+    params = {'payload' => payload.to_json}
+
+    if webhook.nil?
+      webhook = "https://#{team}.slack.com/services/hooks/incoming-webhook"
+      params.merge!('token' => token)
+    end
+
+    uri = URI(webhook)
+    Net::HTTP.post_form(uri, params)
+  end
+
+
 end
 

data/lib/slackistrano/tasks/slack.rake

@@ -8,6 +8,7 @@ namespace :slack do
           Slackistrano.post(
             team: fetch(:slack_team),
             token: fetch(:slack_token),
+            webhook: fetch(:slack_webhook),
             via_slackbot: fetch(:slack_via_slackbot),
             payload: {
               channel: fetch(:slack_channel),
@@ -27,6 +28,7 @@ namespace :slack do
           Slackistrano.post(
             team: fetch(:slack_team),
             token: fetch(:slack_token),
+            webhook: fetch(:slack_webhook),
             via_slackbot: fetch(:slack_via_slackbot),
             payload: {
               channel: fetch(:slack_channel),
@@ -46,6 +48,7 @@ namespace :slack do
           Slackistrano.post(
             team: fetch(:slack_team),
             token: fetch(:slack_token),
+            webhook: fetch(:slack_webhook),
             via_slackbot: fetch(:slack_via_slackbot),
             payload: {
               channel: fetch(:slack_channel),
@@ -68,8 +71,12 @@ after 'deploy:failed',   'slack:deploy:failed'
 
 namespace :load do
   task :defaults do
-    set :slack_team,         ->{ nil } # If URL is 'team.slack.com', value is 'team'. Required.
-    set :slack_token,        ->{ nil } # Token from Incoming WebHooks. Required.
+
+    set :slack_team,         ->{ nil } # If URL is 'team.slack.com', value is 'team'.
+    set :slack_token,        ->{ nil } # Token from Incoming WebHooks.
+    set :slack_webhook,      ->{ nil } # Incoming WebHook URL.
+    set :slack_via_slackbot, ->{ false } # Set to true to send the message via slackbot instead of webhook
+
     set :slack_channel,      ->{ nil } # Channel to post to. Optional. Defaults to WebHook setting.
     set :slack_icon_url,     ->{ 'http://gravatar.com/avatar/885e1c523b7975c4003de162d8ee8fee?r=g&s=40' }
     set :slack_icon_emoji,   ->{ nil } # Emoji to use. Overrides icon_url. Must be a string (ex: ':shipit:')
@@ -80,6 +87,5 @@ 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,   ->{ "*ERROR!* #{ENV['USER'] || ENV['USERNAME']} failed to deploy branch #{fetch :branch} of #{fetch :application} to #{fetch :stage, 'an unknown stage'}." }
-    set :slack_via_slackbot, ->{ false } # Set to true to send the message via slackbot instead of webhook
   end
 end

data/lib/slackistrano/version.rb

@@ -1,3 +1,3 @@
 module Slackistrano
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/tasks_spec.rb

@@ -41,6 +41,7 @@ describe Slackistrano do
       set "slack_run_#{stage}".to_sym, ->{ 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:' }
@@ -48,6 +49,7 @@ describe Slackistrano do
       expect(Slackistrano).to receive(:post).with(
         team: 'team',
         token: 'token',
+        webhook: 'webhook',
         via_slackbot: false,
         payload: {
           channel: 'channel',

metadata

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