capistrano3-notification 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a8933628d07ceacd3ec62fa4a90ce8fbdcdbfc
-  data.tar.gz: a0e8e7b144e6e126d478ef2df066800cef41928a
+  metadata.gz: 21616767890c4e45b6ee17056648b909b7aa1739
+  data.tar.gz: 4072825cf9dd634c6b6f9221c2e750275e61decf
 SHA512:
-  metadata.gz: c85805264a8cf7d34f03d4eef836ba2562f8dfe35e06fdf58c2c9186546336c9e7d94f2cafcb4d4652423a961e04f200bda15a63833863be6d5f7074602da902
-  data.tar.gz: 95b094bbefb35116b3039faa5cb78730f1fec066e083b53fab9f247348697749b3d4985d5cec6ea7b95ef88ccd3a4c3242496460c58fc0564974a4bce40ef002
+  metadata.gz: 6021fccdb4ecf4dd2fe45455a30964d8dbd719dccd943bdff5d23297531c1017ec3bb6513c511fe6602d3aa6b1356a1442fe46f809dde7b7086a449596cd4335
+  data.tar.gz: e5894c79f74446570284dd1bb91fbe2b79d580377748fc194f1848a606ab0711f5f682b052cbc5b297d28aa3e84a8810347edb199b6990d525c9b05be048e618

data/.travis.yml

@@ -1,5 +1,8 @@
+language: ruby
+cache: bundler
+sudo: false
 rvm:
-  - 2.0.0
-  - 2.1.4
+  - 2.2.5
+  - 2.3.1
 script:
   - bundle exec rubocop

data/README.md

@@ -26,7 +26,7 @@ in `deploy.rb` or staging files:
 set :irc_host, 'example.com'
 set :irc_port, 16667         # default: 6667
 set :irc_channel, '#notice'
-set :irc_user, 'myproject' # default: 'capistrano'
+set :notifier, 'myproject' # default: 'capistrano'
 set :notification, -> { "#{fetch(:application)} was deployed to #{fetch(:stage)}" } # this message is default
 ```
 
@@ -34,10 +34,10 @@ set :notification, -> { "#{fetch(:application)} was deployed to #{fetch(:stage)}
 
 ```ruby
 set :slack_webhook_url, 'https://hooks.slack.com/services/EX/AM/PLE'
-set :slack_user, 'myproject' # default: 'capistrano'
 set :slack_channel, '#notice'
 set :slack_icon, ':ghost:'                     # use emoji
 set :slack_icon, 'http://example.com/icon.png' # use image
+set :notifier, 'myproject' # default: 'capistrano'
 set :notification, -> { "#{fetch(:application)} was deployed to #{fetch(:stage)}" } # this message is default
 ```
 

data/lib/capistrano3/notification/tasks/notification.rake

@@ -7,33 +7,39 @@ namespace :load do
 end
 
 namespace :notification do
-  task :notify do
+  task :notify_auto do
+    invoke 'notification:notify', fetch(:notification)
+  end
+
+  task :notify, [:message] do |t, args|
     deprecated :irc_user, :notifier if fetch(:irc_user)
     deprecated :slack_user, :notifier if fetch(:slack_user)
 
     %w(irc slack).each do |adapter|
-      invoke "notification:#{adapter}"
+      invoke "notification:#{adapter}", args[:message]
     end
+    t.reenable
   end
 
-  task :irc do
+  task :irc, [:message] do |t, args|
     user = fetch(:irc_user) || fetch(:notifier)
     host = fetch(:irc_host)
     port = fetch(:irc_port)
     channel = fetch(:irc_channel)
-    message = fetch(:notification)
+    message = args[:message]
     next unless user && host && port && channel && message
     require 'shout-bot'
     url = "irc://#{user}@#{host}:#{port}/#{channel}"
     ShoutBot.shout(url) { |irc| irc.say message }
+    t.reenable
   end
 
-  task :slack do
+  task :slack, [:message] do |t, args|
     webhook_url = fetch(:slack_webhook_url)
     user =  fetch(:slack_user) || fetch(:notifier)
     channel = fetch(:slack_channel)
     icon = fetch(:slack_icon) || nil
-    message = fetch(:notification)
+    message = args[:message]
     next unless user && channel && webhook_url && message
     require 'slack-notifier'
     notifier_options = { username: user, channel: channel }.reject { |_x, y| y.nil? }
@@ -42,19 +48,18 @@ namespace :notification do
                   :icon_emoji
                 when /^http/
                   :icon_url
-                else
-                  nil
                 end
     ping_options = {}.tap do |h|
       h[icon_type] = icon if icon_type
     end
     notifier = Slack::Notifier.new webhook_url, notifier_options
     notifier.ping message, ping_options
+    t.reenable
   end
 
   def deprecated(old, new)
     puts format('%6s %s', 'WARN'.red, ":#{old} is deplicated. use set :#{new}, '#{fetch(old)}'")
   end
 
-  after 'deploy:finished', 'notification:notify'
+  after 'deploy:finished', 'notification:notify_auto'
 end

data/lib/capistrano3/notification/version.rb

@@ -1,5 +1,5 @@
 module Capistrano3
   module Notification
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-notification
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: notification for capistrano-3.x