capistrano-slack 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec0db9a375284a3cfb3379723ddfbf3f94461ae
-  data.tar.gz: 2089b0d0f090f461a608edc24fd1bb55fe32c80f
+  metadata.gz: e84c6de78edc23132c5d38111e07b8a2b6a97015
+  data.tar.gz: 9ac456ee75052c609d78c599302690961d97247d
 SHA512:
-  metadata.gz: cd4230c910782bd74226bc0dbc76126f31cc5a8b151bd1f1da535425303f785a17835637159dca54d8f100610463b1b7f99280fd25e97465cdabd05fe64fb3bc
-  data.tar.gz: 58eb76f2297d839a8c2b9d8b66d79c395e7818b373474cf5428adbf0f367d44818c03bffb74d702a512de89da55edab1a6092cf2a49b7f0cf068b58302a2445c
+  metadata.gz: 6852d59df25ecd50104bb4ade27f9b45a522dd6f6a44553a00beb2104c40b0be31b39f06d7c65ff9b7b24414853a631d27e7001c2fce42c9b405d94a4543ccf4
+  data.tar.gz: 65344352267ae66dd4be246cc5978c721a62b92d738eb3187f4cce027cfb0b6e542eeea4ca8c53f71f89a276f67a0b3a970b2915407eb81e27246799070155ab

data/Gemfile

@@ -1,13 +1,3 @@
-source :gemcutter
+source 'https://rubygems.org'
 
-gem "capistrano", "< 3.0.0"
-gem "capistrano-log_with_awesome", "~> 0.0.2"
-
-group :development do
-  gem "rspec", ">= 2.5.0"
-  gem "bundler", ">= 1.0.9"
-  gem "jeweler", "~> 1.8.0"
-  gem "capistrano-spec"
-  gem "yard"
-  gem "bluecloth" # for README.markdown
-end
+gemspec

data/Gemfile.lock

@@ -1,74 +1,92 @@
+PATH
+  remote: .
+  specs:
+    capistrano-slack (1.2.0)
+      activesupport (>= 3)
+      capistrano (~> 2.15.5)
+      capistrano-log_with_awesome (~> 0.0.2)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
     bluecloth (2.2.0)
-    capistrano (2.13.4)
+    builder (3.2.2)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    capistrano-campfire (0.2.0)
-      capistrano
-      tinder
     capistrano-log_with_awesome (0.0.2)
       capistrano (>= 2.5.14)
-    capistrano-spec (0.1.0)
-    diff-lcs (1.1.3)
-    eventmachine (1.0.0)
-    faraday (0.8.4)
-      multipart-post (~> 1.1)
-    faraday_middleware (0.8.8)
-      faraday (>= 0.7.4, < 0.9)
-    git (1.2.5)
-    hashie (1.2.0)
-    highline (1.6.15)
-    http_parser.rb (0.5.3)
-    jeweler (1.8.4)
+    capistrano-spec (0.6.3)
+    diff-lcs (1.2.5)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.1.1)
+    highline (1.6.21)
+    i18n (0.6.9)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    jruby-pageant (1.1.1)
-    json (1.7.5)
-    mime-types (1.19)
-    multi_json (1.3.6)
-    multipart-post (1.1.5)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.6.0)
-      jruby-pageant (>= 1.1.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    minitest (5.3.3)
+    multi_json (1.9.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    net-scp (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.8.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    nokogiri (1.5.10)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.3.1)
+    rdoc (4.1.1)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    simple_oauth (0.1.9)
-    tinder (1.9.1)
-      eventmachine (>= 0.12.0, < 2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.8)
-      hashie (~> 1.0)
-      json (~> 1.6)
-      mime-types (~> 1.16)
-      multi_json (~> 1.0)
-      multipart-post (~> 1.1)
-      twitter-stream (~> 0.1)
-    twitter-stream (0.1.16)
-      eventmachine (>= 0.12.8)
-      http_parser.rb (~> 0.5.1)
-      simple_oauth (~> 0.1.4)
-    yard (0.8.3)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby
@@ -76,9 +94,7 @@ PLATFORMS
 DEPENDENCIES
   bluecloth
   bundler (>= 1.0.9)
-  capistrano
-  capistrano-campfire (~> 0.2.0)
-  capistrano-log_with_awesome (~> 0.0.2)
+  capistrano-slack!
   capistrano-spec
   jeweler (~> 1.8.0)
   rspec (>= 2.5.0)

data/README.markdown

@@ -1,7 +1,18 @@
 # Capistrano Slack
 
-Push deployment messages to Slack
+## Install
 
+Best way to install Capistrano Slack intergration is via Bundler.  
+
+Add the following to your Gemfile, then run the `bundle` command to install the gem direct from the git repository
+
+```
+gem 'capistrano-slack', :git => 'https://github.com/j-mcnally/capistrano-slack.git'
+```
+
+Once installed you can use the settings below in your Capistrano deploy.rb to configure Slack.
+
+## Push deployment messages to Slack
 
 ```ruby
 
@@ -16,4 +27,10 @@ set :slack_subdomain, "kohactive" # if your subdomain is kohactive.slack.com
 set :slack_application, "Rocketman"
 set :slack_username, "Elton John"
 set :slack_emoji, ":rocket:"
+set :slack_application_url, "http://my-awesome-app.example.com"
+# set(:slack_application_url) { "http://{ fetch :domain_aliases }" }
 ```
+
+You can obtain your `webhook_token` from the integrations section of the team page in Slack.  
+
+https://kohactive.slack.com/services/new/incoming-webhook (if your subdomain is kohactive.slack.com)

data/capistrano-slack.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-slack"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols", "Justin McNally"]
@@ -36,37 +36,15 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.23"
   s.summary = "Announce capistrano deploys to slack"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_dependency(%q<capistrano>, ["~> 2.15.5"])
+  s.add_dependency(%q<capistrano-log_with_awesome>, ["~> 0.0.2"])
+  s.add_dependency(%q<activesupport>, [">= 3"])
+  s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
+  s.add_development_dependency(%q<bundler>, [">= 1.0.9"])
+  s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
+  s.add_development_dependency(%q<capistrano-spec>, [">= 0"])
+  s.add_development_dependency(%q<yard>, [">= 0"])
+  s.add_development_dependency(%q<bluecloth>, [">= 0"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<capistrano>, ["< 3.0.0"])
-      s.add_runtime_dependency(%q<capistrano-log_with_awesome>, ["~> 0.0.2"])
-      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.9"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
-      s.add_development_dependency(%q<capistrano-spec>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<bluecloth>, [">= 0"])
-    else
-      s.add_dependency(%q<capistrano>, ["< 3.0.0"])
-      s.add_dependency(%q<capistrano-log_with_awesome>, ["~> 0.0.2"])
-      s.add_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.9"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
-      s.add_dependency(%q<capistrano-spec>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<bluecloth>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<capistrano>, ["< 3.0.0"])
-    s.add_dependency(%q<capistrano-log_with_awesome>, ["~> 0.0.2"])
-    s.add_dependency(%q<rspec>, [">= 2.5.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.9"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
-    s.add_dependency(%q<capistrano-spec>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<bluecloth>, [">= 0"])
-  end
 end
 

data/lib/capistrano/slack.rb

@@ -2,6 +2,7 @@ require 'capistrano'
 require 'capistrano/log_with_awesome'
 require 'json'
 require 'net/http'
+require 'active_support/all'
 # TODO need to handle loading a bit beter. these would load into the instance if it's defined
 module Capistrano
   module Slack
@@ -9,15 +10,21 @@ module Capistrano
       configuration.load do
 
         before 'deploy', 'slack:starting'
-        before 'deploy:migrations', 'slack:starting'
+        before 'deploy:migrations', 'slack:configure_for_migrations', 'slack:starting'
         after 'deploy',  'slack:finished'
+        after 'deploy:migrations', 'slack:configure_for_migrations', 'slack:finished'
 
         set :deployer do
           ENV['GIT_AUTHOR_NAME'] || `git config user.name`.chomp
         end
+        set :slack_with_migrations, false
 
 
         namespace :slack do
+            task :configure_for_migrations do
+              set :slack_with_migrations, true
+            end
+
             task :starting do
               slack_token = fetch(:slack_token)
               slack_room = fetch(:slack_room)
@@ -25,22 +32,25 @@ module Capistrano
               slack_username = fetch(:slack_username) || "deploybot"
               slack_application = fetch(:slack_application) || application
               slack_subdomain = fetch(:slack_subdomain)
+              slack_application_url = fetch(:slack_application_url, nil)
               return if slack_token.nil?
-              announced_deployer = fetch(:deployer)
-              announced_stage = fetch(:stage, 'production')
+              announced_deployer = ActiveSupport::Multibyte::Chars.new(fetch(:deployer)).mb_chars.normalize(:kd).gsub(/[^\x00-\x7F]/,'').to_s
+              announced_stage = slack_application_url || fetch(:stage, 'production')
 
               announcement = if fetch(:branch, nil)
-                               "#{announced_deployer} is deploying #{slack_application}'s #{branch} to #{announced_stage}"
+                               "#{announced_deployer} is deploying #{slack_application}'s #{branch}"
                              else
-                               "#{announced_deployer} is deploying #{slack_application} to #{announced_stage}"
+                               "#{announced_deployer} is deploying #{slack_application}"
                              end
-              
+              announcement << " with migrations" if slack_with_migrations
+              announcement << " to #{announced_stage}"
+
 
               # Parse the API url and create an SSL connection
               uri = URI.parse("https://#{slack_subdomain}.slack.com/services/hooks/incoming-webhook?token=#{slack_token}")
               http = Net::HTTP.new(uri.host, uri.port)
               http.use_ssl = true
-              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+              http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
               # Create the post request and setup the form data
               request = Net::HTTP::Post.new(uri.request_uri)
@@ -57,15 +67,26 @@ module Capistrano
               begin
                 slack_token = fetch(:slack_token)
                 slack_room = fetch(:slack_room)
+                slack_emoji = fetch(:slack_emoji) || ":ghost:"
+                slack_username = fetch(:slack_username) || "deploybot"
+                slack_application = fetch(:slack_application) || application
                 slack_subdomain = fetch(:slack_subdomain)
+                slack_application_url = fetch(:slack_application_url, nil)
                 return if slack_token.nil?
                 announced_deployer = fetch(:deployer)
+                announced_stage = slack_application_url || fetch(:stage, 'production')
                 end_time = Time.now
                 start_time = fetch(:start_time)
                 elapsed = end_time.to_i - start_time.to_i
-              
-                msg = "#{announced_deployer} deployed #{application} successfully in #{elapsed} seconds."
-                
+
+                msg = if fetch(:branch, nil)
+                         "#{announced_deployer} deployed #{slack_application}'s #{branch}"
+                       else
+                         "#{announced_deployer} deployed #{slack_application}"
+                       end
+                msg << " with migrations" if slack_with_migrations
+                msg << " to #{announced_stage} successfully in #{elapsed} seconds"
+
                 # Parse the URI and handle the https connection
                 uri = URI.parse("https://#{slack_subdomain}.slack.com/services/hooks/incoming-webhook?token=#{slack_token}")
                 http = Net::HTTP.new(uri.host, uri.port)
@@ -74,8 +95,8 @@ module Capistrano
 
                 # Create the post request and setup the form data
                 request = Net::HTTP::Post.new(uri.request_uri)
-                request.set_form_data(:payload => {'channel' => slack_room, 'username' => 'deploybot', 'text' => msg, "icon_emoji" => ":ghost:"}.to_json)
-                
+                request.set_form_data(:payload => {'channel' => slack_room, 'username' => slack_username, 'text' => msg, "icon_emoji" => slack_emoji}.to_json)
+
                 # Make the actual request to the API
                 response = http.request(request)
 
@@ -93,4 +114,3 @@ end
 if Capistrano::Configuration.instance
   Capistrano::Configuration.instance.extend(Capistrano::Slack)
 end
-  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-slack
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Joshua Nichols
@@ -15,16 +15,16 @@ dependencies:
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.15.5
 - !ruby/object:Gem::Dependency
   name: capistrano-log_with_awesome
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +39,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -163,9 +177,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Announce capistrano deploys to slack
 test_files: []
 has_rdoc: