slackistrano 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3266486763092e1db2d76f99993c5e49e40ff356
-  data.tar.gz: 702af0c84de7fc72b60709943eb101a3b28072d4
+  metadata.gz: 50717c40880bf0a10d22f579b0eb4bb3f09aa46d
+  data.tar.gz: 4d852576633d9f56bff4df98e62aed9a6633b3c3
 SHA512:
-  metadata.gz: db09cab38914b229aaacc2221cfa964c6b1f1c6800999d3bce1fd78618d6c04b0a4c226e6bf09f8edd885ca012d3dc9f35a094fefa4cdbf4ec74b07fc210f8e6
-  data.tar.gz: 8149063abf25b62f65561f14f47bae4b546534810441792e188e13e144688212c5a71ea647aae45895631249886ab80c1dcfcadae876714a0efc633f3ccf94e8
+  metadata.gz: e2a75020fcc7c587db4497c96d92eee7eba879fb60e7c81c1c64ffe6dd55d8818de8940a03a6dfe59938554eea05bd1ccb0868b51b92de182e84d8f74d8dd242
+  data.tar.gz: f8eb3bcfd1c160bfb8603ad123a237e348f457ee608b21ea6358286cab57efd84e96aefe3fc72aed2343222333d43357bb4d13839d8c7171f14d11e803cfae40

data/README.md

@@ -26,8 +26,12 @@ And then execute:
 
 ## Configuration
 
-Set up an "Incoming WebHooks" integration in Slack.  Make a note 
-of the token as you'll need it later.
+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.
 
 Require the library in your application's Capfile:
 
@@ -41,7 +45,7 @@ Set your team and token in your application's config/deploy.rb:
 Optionally, override the other slack settings:
 
     set :slack_icon_url,     ->{ 'http://gravatar.com/avatar/885e1c523b7975c4003de162d8ee8fee?r=g&s=40' }
-    set :slack_icon_emoji,   ->{ nil } # will override icon_url
+    set :slack_icon_emoji,   ->{ nil } # will override icon_url, Must be a string (ex: ':shipit:')
     set :slack_channel,      ->{ '#general' }
     set :slack_username,     ->{ 'Slackistrano' }
     set :slack_run_starting, ->{ true }
@@ -50,6 +54,7 @@ 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,9 +5,17 @@ require 'json'
 load File.expand_path("../slackistrano/tasks/slack.rake", __FILE__)
 
 module Slackistrano
-  def self.post(team: nil, token: nil, payload: {})
-    uri = URI("https://#{team}.slack.com/services/hooks/incoming-webhook")
-    res = Net::HTTP.post_form(uri, 'token' => token, 'payload' => payload.to_json)
+  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
+    else
+      uri = URI("https://#{team}.slack.com/services/hooks/incoming-webhook")
+      res = Net::HTTP.post_form(uri, 'token' => token, 'payload' => payload.to_json)
+    end
   rescue => e
     puts "There was an error notifying Slack."
     puts e.inspect

data/lib/slackistrano/tasks/slack.rake

@@ -8,6 +8,7 @@ namespace :slack do
           Slackistrano.post(
             team: fetch(:slack_team),
             token: fetch(:slack_token),
+            via_slackbot: fetch(:slack_via_slackbot),
             payload: {
               channel: fetch(:slack_channel),
               username: fetch(:slack_username),
@@ -26,6 +27,7 @@ namespace :slack do
           Slackistrano.post(
             team: fetch(:slack_team),
             token: fetch(:slack_token),
+            via_slackbot: fetch(:slack_via_slackbot),
             payload: {
               channel: fetch(:slack_channel),
               username: fetch(:slack_username),
@@ -44,12 +46,13 @@ namespace :slack do
           Slackistrano.post(
             team: fetch(:slack_team),
             token: fetch(:slack_token),
+            via_slackbot: fetch(:slack_via_slackbot),
             payload: {
               channel: fetch(:slack_channel),
               username: fetch(:slack_username),
               icon_url: fetch(:slack_icon_url),
               icon_emoji: fetch(:slack_icon_emoji),
-              text: fetch(:slack_msg_failed)
+              text: fetch(:slack_msg_failed),
             }
           )
         end
@@ -77,5 +80,6 @@ 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.0.12'
+  VERSION = '0.1.0'
 end

data/spec/tasks_spec.rb

@@ -40,14 +40,15 @@ describe Slackistrano do
     it "calls Slackistrano.post with all the right arguments on slack:deploy:#{stage}" do
       set "slack_run_#{stage}".to_sym, ->{ true }
       set :slack_team,         ->{ 'team' }
-      set :slack_token,        ->{ 'token' } 
-      set :slack_channel,      ->{ 'channel' } 
+      set :slack_token,        ->{ 'token' }
+      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_icon_emoji,   ->{ ':emoji:' }
+      set "slack_msg_#{stage}".to_sym, ->{ 'text message' }
       expect(Slackistrano).to receive(:post).with(
         team: 'team',
         token: 'token',
+        via_slackbot: false,
         payload: {
           channel: 'channel',
           username: 'Slackistrano',

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: slackistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Philip Hallstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -96,12 +96,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -114,4 +114,3 @@ test_files:
 - spec/capistrano_deploy_stubs.rake
 - spec/spec_helper.rb
 - spec/tasks_spec.rb
-has_rdoc: