ops_deploy 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2fd85c660f1062efc8fa2dde99d8d2998145d66
-  data.tar.gz: d5ef764749f64ac99de1b342d57174d41b4e613a
+  metadata.gz: 3517b8d5c1981e1c84cf3c14a0e133f8bee3fbdc
+  data.tar.gz: 30061b9fdf4aefe02028c023138ea62d44a2f5d0
 SHA512:
-  metadata.gz: ab2cba0577551b5bf550fae30b75ee3ac788e7d446a49751b492369449e590250719cd59569e5f349c65898ef7969a06064ff0c409c3d5360898725ff4c8e395
-  data.tar.gz: a927a15b7edb4560cef2966323fa7016a85f159520179c5b7a429d8c0509287e6a9c39dce28257f1437558080896cc5aa41e45a972d9326465b0ba36f2abd79c
+  metadata.gz: 606ef71c9e74fc5f6b9944cdf291e312f76078433e070cb5c6155409a484fdb42d9d7afd3f35690ee0a31fa5efdbdf94f9fcde4704bdd4506d63da6debeb61b4
+  data.tar.gz: a511963e956bd5f4c894979b5a0e4c58794b9319f7c5654fecd8818b6f23025a0d34cba284550290fe22fb00412d99fd053543baa1d95c3ff84d899f0ab746f2

data/lib/ops_deploy/cli.rb

@@ -47,10 +47,9 @@ 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.trigger('OpsDeploy', 'wait_for_deployments', stack: stack.stack_id,
-                                                          slack: slack_webhook_url)
+                                                          slack: @notifier.options[:slack])
     else
       step_msg('Checking deployments...')
       @main.deployments_callback = proc { |deployment|
@@ -82,10 +81,9 @@ 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.trigger('OpsDeploy', 'check_instances', stack: stack.stack_id,
-                                                     slack: slack_webhook_url)
+                                                     slack: @notifier.options[:slack])
     else
       @main.instances_check_callback = proc { |instance, response, error|
         puts
@@ -123,12 +121,10 @@ class OpsDeploy::CLI
     socket['OpsDeploy'].bind('check_instances') do |data|
       begin
         info = data
-        info = JSON.parse(data) if data.is_a?(String)
-        stack_id = info['stack'] || info[:stack]
-        slack_webhook_url = info['slack'] || info[:slack]
+        info = symbolize_keys(JSON.parse(data)) if data.is_a?(String)
 
-        with_slack_webhook(slack_webhook_url) do
-          check_instances(stack_id)
+        with_slack(info[:slack]) do
+          check_instances(info[:stack])
         end
       rescue StandardError => e
         puts e
@@ -138,12 +134,10 @@ class OpsDeploy::CLI
     socket['OpsDeploy'].bind('wait_for_deployments') do |data|
       begin
         info = data
-        info = JSON.parse(data) if data.is_a?(String)
-        stack_id = info['stack'] || info[:stack]
-        slack_webhook_url = info['slack'] || info[:slack]
+        info = symbolize_keys(JSON.parse(data)) if data.is_a?(String)
 
-        with_slack_webhook(slack_webhook_url) do
-          wait_for_deployments(stack_id)
+        with_slack(info[:slack]) do
+          wait_for_deployments(info[:stack])
         end
       rescue StandardError => e
         puts e
@@ -154,13 +148,9 @@ class OpsDeploy::CLI
     socket.connect
   end
 
-  def with_slack_webhook(slack_webhook_url = nil)
+  def with_slack(slack_options = 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
+    @notifier = OpsDeploy::CLI::Notifier.new(slack: slack_options) if slack_options
 
     yield
 
@@ -251,14 +241,29 @@ class OpsDeploy::CLI
   end
 
   def puts(message = nil)
-    $stdout.puts(message) if message
+    $stdout.puts(message)
     $stdout.flush
   end
 
   def print(message = nil)
-    $stdout.print(message) if message
+    $stdout.print(message)
     $stdout.flush
   end
+
+  def symbolize_keys(hash)
+    hash.inject({}){|result, (key, value)|
+      new_key = case key
+                when String then key.to_sym
+                else key
+                end
+      new_value = case value
+                  when Hash then symbolize_keys(value)
+                  else value
+                  end
+      result[new_key] = new_value
+      result
+    }
+  end
 end
 
 require_relative 'cli/notifier'

data/lib/ops_deploy/cli/notifier.rb

@@ -69,6 +69,7 @@ end
 # A notification class for Slack
 class OpsDeploy::CLI::Notifier::Slack < OpsDeploy::CLI::Notifier::Generic
   attr_accessor :slack_notifier
+  attr_accessor :options
 
   def initialize(stack, options)
     @stack = stack

data/lib/ops_deploy/version.rb

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

metadata

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