ops_deploy 0.1.8.2 → 0.1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7463a676e488caa261d788eacc2a76dc14421deb
-  data.tar.gz: 66895b1ba36e7cca89161905a9dcfbedc46a5fba
+  metadata.gz: f982c964034710b65572b3ea37c1787eec0a0fd7
+  data.tar.gz: d9d586c32696fd1665771048f81076009c3ddaf7
 SHA512:
-  metadata.gz: 7fa75606b0aaac3b8d38ab909b355c2258422488d6e626fa860ba856e4cb86785af449c2f9cda7aef512f24b3a5059748fa136735e991d933e6ec7bfd5dcc8f0
-  data.tar.gz: 9e5fe8b24496a3fba3e3fdd669c44ff9f474e064c97c6a3aa1017b609d68ac480d4b569bb44716f4ddb9408d896d5eee58ff80002fe3bec78d7a9db046ad6c45
+  metadata.gz: 35cb437678df6c7f21afc1d94a3d452995299c32f2549a234f41e11c5cec69ccd15aa491b2f613af385dc4b4e82c881adc39b079bf8c064ec9f0d439d1c05f3e
+  data.tar.gz: a1e2eaa8072f5e2b7273a1ee0ef5ac6bc7bd47919a8dc134ee26523f685afb9761e1533810bf9d6bc6487d8d9d3a40438d2e662b54745f0914cf803616da488c

data/lib/ops_deploy/cli.rb

@@ -60,18 +60,15 @@ class OpsDeploy::CLI
                                                           slack: @notifier.options[:slack])
     else
       step_msg('Checking deployments...')
-      notify_user = @notifier.notify_user
 
       @main.deployments_callback = proc { |deployment|
         puts
         if (deployment.status == 'successful')
           success_msg('Deployment', 'OK'.green.bold,
-                      deployment.duration ? "(#{deployment.duration}s)" : '',
-                      notify_user ? "@#{notify_user}" : '')
+                      deployment.duration ? "(#{deployment.duration}s)" : '')
         else
           failure_msg('Deployment', 'Failed'.red.bold,
-                      deployment.duration ? "(#{deployment.duration}s)" : '',
-                      notify_user ? "@#{notify_user}" : '')
+                      deployment.duration ? "(#{deployment.duration}s)" : '')
         end
       }
 
@@ -84,8 +81,7 @@ class OpsDeploy::CLI
 
         info_msg('Deployments finished')
       else
-        info_msg('No running deployments on stack', "'#{stack_id_name_or_object.blue}'",
-                 notify_user ? "@#{notify_user}" : '')
+        info_msg('No running deployments on stack', "'#{stack_id_name_or_object.blue}'")
       end
 
       send_notification(stack)

data/lib/ops_deploy/cli/notifier.rb

@@ -3,14 +3,12 @@ class OpsDeploy::CLI::Notifier
   attr_accessor :options
   attr_accessor :messages
   attr_accessor :notification_type
-  attr_accessor :notify_user
 
   def initialize(options)
     @options = options
     @options.delete(:slack) if @options[:slack].nil? || @options[:slack][:webhook_url].nil?
     @messages = OpsDeploy::CLI::Notifier::Messages.new
     @notification_type = :info
-    @notify_user = @options[:slack] ? @options[:slack][:notify_user] : nil
   end
 
   def notify(stack)
@@ -82,40 +80,57 @@ class OpsDeploy::CLI::Notifier::Slack < OpsDeploy::CLI::Notifier::Generic
 
   def notify(message)
     message = message.gsub(/\[[0-9;]+?m/, '')
-    @slack_notifier.ping '', channel: @options[:channel], attachments: [
-      {
-        fallback: message,
-        author_name: @stack.name,
-        author_link: stack_link(@stack),
-        text: message
-      }
-    ]
+
+    recipients.each do |recipient|
+      @slack_notifier.ping '', channel: recipient, attachments: [
+        {
+          fallback: message,
+          author_name: @stack.name,
+          author_link: stack_link(@stack),
+          text: message
+        }
+      ]
+    end
   end
 
   def success_notify(message)
     message = message.gsub(/\[[0-9;]+?m/, '')
-    @slack_notifier.ping '', channel: @options[:channel], attachments: [
-      {
-        fallback: message,
-        text: message,
-        author_name: @stack.name,
-        author_link: stack_link(@stack),
-        color: 'good'
-      }
-    ]
+
+    recipients.each do |recipient|
+      @slack_notifier.ping '', channel: recipient, attachments: [
+        {
+          fallback: message,
+          text: message,
+          author_name: @stack.name,
+          author_link: stack_link(@stack),
+          color: 'good'
+        }
+      ]
+    end
   end
 
   def failure_notify(message)
     message = message.gsub(/\[[0-9;]+?m/, '')
-    @slack_notifier.ping '', channel: @options[:channel], attachments: [
-      {
-        fallback: message,
-        text: "#{message} <!channel>",
-        author_name: @stack.name,
-        author_link: stack_link(@stack),
-        color: 'danger'
-      }
-    ]
+
+    recipients.each do |recipient|
+      @slack_notifier.ping '', channel: recipient, attachments: [
+        {
+          fallback: message,
+          text: "#{message} <!channel>",
+          author_name: @stack.name,
+          author_link: stack_link(@stack),
+          color: 'danger'
+        }
+      ]
+    end
+  end
+
+  private
+
+  def recipients
+    names = [options[:channel]]
+    names << "@#{options[:notify_user]}" if options[:notify_user]
+    names
   end
 
   def stack_link(stack)

data/lib/ops_deploy/version.rb

@@ -1,3 +1,3 @@
 class OpsDeploy
-  VERSION = '0.1.8.2'
+  VERSION = '0.1.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.8.2
+  version: 0.1.8.3
 platform: ruby
 authors:
 - Mahdi Bchetnia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk