ops_deploy 0.1.6.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0050dd628522155b9230933482337da4df68efbb
-  data.tar.gz: 6a64041b2f689427ffc250c05895127c51ec1866
+  metadata.gz: e2fd85c660f1062efc8fa2dde99d8d2998145d66
+  data.tar.gz: d5ef764749f64ac99de1b342d57174d41b4e613a
 SHA512:
-  metadata.gz: a398fb8a81e474e71481fdb1623067b9929c48d90aba74a5753779f669932174a33ce226250f48999563d4395cbd5bb0d841d2910fabc6a19f5c6a064dcbf7ba
-  data.tar.gz: 6b085f1d7be9642139f9ade8be97e27ac74e2aceb9ec3bb9d831e40e0d154dbe623f4b5f9551b1fbce9d94548461c158ff03c75ed3d2305a81514247fc02d82a
+  metadata.gz: ab2cba0577551b5bf550fae30b75ee3ac788e7d446a49751b492369449e590250719cd59569e5f349c65898ef7969a06064ff0c409c3d5360898725ff4c8e395
+  data.tar.gz: a927a15b7edb4560cef2966323fa7016a85f159520179c5b7a429d8c0509287e6a9c39dce28257f1437558080896cc5aa41e45a972d9326465b0ba36f2abd79c

data/lib/ops_deploy/cli.rb

@@ -47,8 +47,10 @@ class OpsDeploy::CLI
     stack = find_stack(stack_id_name_or_object)
 
     if via_proxy
+      slack_webhook_url = OpsDeploy::CLI.argument('slack-webhook-url', 'SLACK_WEBHOOK_URL')
       Pusher.url = OpsDeploy::CLI.argument('pusher-url', 'PUSHER_URL', true)
-      Pusher['OpsDeploy'].trigger('wait_for_deployments', stack: stack.stack_id)
+      Pusher.trigger('OpsDeploy', 'wait_for_deployments', stack: stack.stack_id,
+                                                          slack: slack_webhook_url)
     else
       step_msg('Checking deployments...')
       @main.deployments_callback = proc { |deployment|
@@ -80,8 +82,10 @@ class OpsDeploy::CLI
     stack = find_stack(stack_id_name_or_object)
 
     if via_proxy
+      slack_webhook_url = OpsDeploy::CLI.argument('slack-webhook-url', 'SLACK_WEBHOOK_URL')
       Pusher.url = OpsDeploy::CLI.argument('pusher-url', 'PUSHER_URL', true)
-      Pusher['OpsDeploy'].trigger('check_instances', stack: stack.stack_id)
+      Pusher.trigger('OpsDeploy', 'check_instances', stack: stack.stack_id,
+                                                     slack: slack_webhook_url)
     else
       @main.instances_check_callback = proc { |instance, response, error|
         puts
@@ -121,8 +125,11 @@ class OpsDeploy::CLI
         info = data
         info = JSON.parse(data) if data.is_a?(String)
         stack_id = info['stack'] || info[:stack]
+        slack_webhook_url = info['slack'] || info[:slack]
 
-        check_instances(stack_id)
+        with_slack_webhook(slack_webhook_url) do
+          check_instances(stack_id)
+        end
       rescue StandardError => e
         puts e
       end
@@ -133,8 +140,11 @@ class OpsDeploy::CLI
         info = data
         info = JSON.parse(data) if data.is_a?(String)
         stack_id = info['stack'] || info[:stack]
+        slack_webhook_url = info['slack'] || info[:slack]
 
-        wait_for_deployments(stack_id)
+        with_slack_webhook(slack_webhook_url) do
+          wait_for_deployments(stack_id)
+        end
       rescue StandardError => e
         puts e
       end
@@ -144,6 +154,19 @@ class OpsDeploy::CLI
     socket.connect
   end
 
+  def with_slack_webhook(slack_webhook_url = nil)
+    old_notifier = @notifier
+    if slack_webhook_url && !slack_webhook_url.strip.empty?
+      @notifier = OpsDeploy::CLI::Notifier.new(slack: {
+                                               webhook_url: slack_webhook_url
+                                               })
+    end
+
+    yield
+
+    @notifier = old_notifier
+  end
+
   def self.argument(argv_name, env_name = nil, required = false)
     value = nil
     value = ENV[env_name] if env_name

data/lib/ops_deploy/version.rb

@@ -1,3 +1,3 @@
 class OpsDeploy
-  VERSION = '0.1.6.2'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.6.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Mahdi Bchetnia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk