capistrano-notifications 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7206bacffdeab09b3d57eeb83820a09923c2aa90
-  data.tar.gz: 46e25ffe6c17e06b479dc6756ce552460725a723
+  metadata.gz: d6b06e7740bac372fe30fde45fe126e4ce7844b4
+  data.tar.gz: bf6f315f2601a0fbdf945e9a68d9a27e6fb370c8
 SHA512:
-  metadata.gz: c135f5e6cde1151e1b4096aa77540d126afeb11351a57252a5482af6912c2ebfe1ab03c5f78899d38f81dfeb5ca6de4dcd35e6795324a5b7fc6a42cab991c360
-  data.tar.gz: c53393e19861dd3390d3d0c4c14cc0712c2597a8fb017dfb6d0639a213cb9574d184ce59cb41a72a95de07c9a6bef36ec0d90734792ba0cd055ab8d35dcb0115
+  metadata.gz: a76d78038ec573da4305e823351453928a5ae36cba1228a8d603d4d88437e631eaf858aa1767ca1c96e5b48741189f52f51afa464acb89286c0f967ad6a382ca
+  data.tar.gz: 327c0cf4b8dd9d3015f21b4dc2a53c58e0d4f743b4ccdf097ce0dd30882e2d9faa6348a4654881d15eb64e9ebfeb7ceb372237d0ae5baf5b50e451c5f4ad546c

data/.gitignore

@@ -15,4 +15,5 @@ mkmf.log
 
 .ruby-version
 .ruby-gemset
-.idea
+.idea
+.gem

data/capistrano-notifications.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'capistrano', '~> 3.3.5'
+  spec.add_development_dependency 'capistrano', '~> 3.3'
 
-  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday', '~> 0.9'
+  spec.add_dependency 'activesupport', '~> 4.1'
 end

data/lib/capistrano/notifications/adapter/base.rb

@@ -12,13 +12,13 @@ module Capistrano
         end
 
         def notify(members = [], message = '')
-          members.each { |member| send_notification(member, message) }
+          Array.wrap(members).each { |member| send_notification(member, message) }
         end
 
         protected
 
         def send_notification(_member, _message)
-          raise NoMethodError, 'send_notification is not defined.'
+          raise NoMethodError, 'send_notification is not implemented.'
         end
 
       end

data/lib/capistrano/notifications/adapter/slack.rb

@@ -6,7 +6,7 @@ module Capistrano
         attr_reader :team, :token
 
         protected
-        def send_notification(_member, _message)
+        def send_notification(member, message, username = 'Capistrano Notification')
           connection = Faraday.new(url: "https://#{team}.slack.com") do |faraday|
             faraday.request :url_encoded
             faraday.adapter Faraday.default_adapter
@@ -16,13 +16,7 @@ module Capistrano
             req.headers['User-Agent'] = "Capistrano Notification #{Capistrano::Notifications::VERSION}"
             req.body = {
                 token: token,
-                payload: {
-                    channel: "#{_member}",
-                    username: "#{fetch(:application)} #{fetch(:env)}",
-                    text: _message,
-                    icon_emoji: ':grin:',
-                    mrkdwn: true
-                }.to_json
+                payload: {channel: member, username: username, text: message, icon_emoji: ':grin:', mrkdwn: true}.to_json
             }
           end
         end

data/lib/capistrano/notifications/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Notifications
-    VERSION = '0.0.1'
+    VERSION = '0.0.3'
   end
 end

data/lib/capistrano/notifications.rb

@@ -1,5 +1,7 @@
 require 'faraday'
 require 'json'
+require 'active_support/core_ext/string'
+require 'active_support/core_ext/array'
 
 module Capistrano
   module Notifications

data/lib/capistrano/tasks/notifications.rake

@@ -1,49 +1,29 @@
 #
-# adapters:
+#   examples:
 #
-#   * Slack
+#     * Slack
 #
-#     example:
+#       set :notify, -> {
+#         {
+#             to: %w(@scorix #deploy),
+#             via: :slack,
+#             options: {team: 'my-team', token: 'token'}
+#         }
+#       }
 #
-#       set :notify_adapter, :Slack
-#
-set :notify_adapter, -> { nil }
-
-#
-# default options:
-#
-#   * Slack:
-#
-#       team **required**
-#
-#       token **required**
-#
-#      example:
-#
-#        set :notify_default_options, team: 'my-team', token: 'token'
-#
-set :notify_default_options, -> { {} }
-
-#
-# subscribers
-#
-#    * Slack:
-#
-#      subscribers could be a user, or a channel
-#
-#      example:
-#
-#        set :subscribers, -> { ['@scorix', '#deploy'] }
-#
-set :subscribers, -> { [] }
+set :notify, -> { {} }
 
 namespace :notify do
 
+  def notify
+    fetch(:notify) { {} }
+  end
+
   def find_adapter
-    adapter = fetch(:notify_adapter, nil)
+    adapter = notify[:via]
 
     if adapter
-      adapter = Capistrano::Notifications::Adapter.const_get(adapter.to_sym).setup(fetch(:notify_default_options))
+      adapter = Capistrano::Notifications::Adapter.const_get(adapter.to_s.classify.to_sym).setup(notify[:options])
 
       begin
         yield adapter
@@ -55,17 +35,19 @@ namespace :notify do
 
   task :starting do
     find_adapter do |adapter|
-      adapter.notify(fetch(:subscribers), "@#{local_user} is deploying branch #{fetch(:branch)}")
+      adapter.notify(notify[:to], "#{local_user} is deploying the `#{fetch(:branch)}` branch...")
     end
   end
 
   task :finishing do
     find_adapter do |adapter|
-      adapter.notify(fetch(:subscribers), t(:revision_log_message,
-                                            branch: fetch(:branch),
-                                            user: "@#{local_user}",
-                                            sha: fetch(:current_revision),
-                                            release: fetch(:release_timestamp)))
+      adapter.notify(notify[:to],
+                     t(:revision_log_message,
+                       branch: fetch(:branch),
+                       user: local_user,
+                       sha: fetch(:current_revision),
+                       release: fetch(:release_timestamp)),
+                     "#{fetch(:application)} #{fetch(:env)}".titleize)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-notifications
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - scorix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.5
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.5
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 description: Send deploy notifications to subscribers.
 email:
 - scorix@gmail.com