ops_deploy 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc78846ff1cda030d7cb916965026b0f0bbfcf00
-  data.tar.gz: 6dc599136948bcee6c6e95669da2d370d0d3d1c9
+  metadata.gz: 1770134bbe27e803e4c5905c6bed626973443527
+  data.tar.gz: 97f6cd9f48cb327737fa4341e8ad3cee9d673dc8
 SHA512:
-  metadata.gz: 6d53e6581e75976bf39642b6bde35ce421f848f7ded689e680d2fbc3112bc361f1ac354d053788ec30bb7ec8c4ab5349ff2aecba7d9c3bd5e88469fcd9931cd3
-  data.tar.gz: 36f686bd784cc44905520182baaabe08d12649925d3805f07b4188d165bad4159d0639d8ecdb221919455d65647c3bc8219f69fc83578bc4b71b88d4f683765b
+  metadata.gz: 49001ff3e7e53d504719b0d02e6a59d352bb627791c449126c7ccf38d400ebba51781c55cc625ce2e1e5e2a70f66242165ecebecd9d134a33b00ba354dbc5336
+  data.tar.gz: cca776e64f629e8e4c022f53f3505c62669120ba04f95fe90d3c13f225fc002b37284c46fdeca405102491c46672fa8da18786912a95455da2439a709476e012

data/bin/opsdeploy

@@ -4,15 +4,19 @@ require 'ops_deploy'
 
 cli = OpsDeploy::CLI.new
 
-if OpsDeploy::CLI.argument("check-server")
-  cli.start_check_server
+if OpsDeploy::CLI.argument("server")
+  cli.start_server
+elsif OpsDeploy::CLI.argument("check-server")
+  puts "The 'check-server' argument is deprecated. Please use 'server'."
+  cli.start_server
 else
   stack = OpsDeploy::CLI.argument("stack", "STACK_ID")
   app_id = OpsDeploy::CLI.argument("app-id", "APP_ID")
   migrate = OpsDeploy::CLI.argument("migrate")
   check_via_proxy = OpsDeploy::CLI.argument("check-via-proxy")
+  wait_via_proxy = OpsDeploy::CLI.argument("wait-via-proxy")
 
   cli.start_deployment(stack, app_id, migrate) if OpsDeploy::CLI.argument("deploy")
-  cli.wait_for_deployments(stack) if OpsDeploy::CLI.argument("wait")
-  cli.check_instances(stack, check_via_proxy) if OpsDeploy::CLI.argument("check") or check_via_proxy
+  cli.wait_for_deployments(stack, wait_via_proxy) if OpsDeploy::CLI.argument("wait") || wait_via_proxy
+  cli.check_instances(stack, check_via_proxy) if OpsDeploy::CLI.argument("check") || check_via_proxy
 end

data/lib/ops_deploy/cli.rb

@@ -45,35 +45,42 @@ class OpsDeploy::CLI
     end
   end
 
-  def wait_for_deployments(stack_id_name_or_object)
+  def wait_for_deployments(stack_id_name_or_object, via_proxy = false)
     stack = find_stack(stack_id_name_or_object)
 
-    step_msg("Checking deployments...")
-    @main.deployments_callback = Proc.new {
-      |deployment|
+    if via_proxy
+      Pusher.url = OpsDeploy::CLI.argument("pusher-url", "PUSHER_URL", true)
+      Pusher['OpsDeploy'].trigger('wait_for_deployments', {
+        stack: stack.stack_id
+      })
+    else
+      step_msg("Checking deployments...")
+      @main.deployments_callback = Proc.new {
+        |deployment|
 
-      puts
+        puts
 
-      if (deployment.status == "successful")
-        success_msg("Deployment", "OK".green.bold, deployment.duration ? "(#{deployment.duration.to_s}s)" : "")
-      else
-        failure_msg("Deployment", "Failed".red.bold, deployment.duration ? "(#{deployment.duration.to_s}s)" : "")
-      end
-    }
+        if (deployment.status == "successful")
+          success_msg("Deployment", "OK".green.bold, deployment.duration ? "(#{deployment.duration.to_s}s)" : "")
+        else
+          failure_msg("Deployment", "Failed".red.bold, deployment.duration ? "(#{deployment.duration.to_s}s)" : "")
+        end
+      }
 
-    waiter = @main.wait_for_deployments(stack)
-    if waiter
-      step_msg("Waiting for deployments to finish...")
+      waiter = @main.wait_for_deployments(stack)
+      if waiter
+        step_msg("Waiting for deployments to finish...")
 
-      print ".".blue
-      print ".".blue until waiter.join(1)
+        print ".".blue
+        print ".".blue until waiter.join(1)
 
-      info_msg("Deployments finished")
-    else
-      info_msg("No running deployments on stack", "'#{stack_id_name_or_object.blue}'")
-    end
+        info_msg("Deployments finished")
+      else
+        info_msg("No running deployments on stack", "'#{stack_id_name_or_object.blue}'")
+      end
 
-    send_notification(stack)
+      send_notification(stack)
+    end
   end
 
   def check_instances(stack_id_name_or_object, via_proxy = false)
@@ -115,11 +122,12 @@ class OpsDeploy::CLI
     end
   end
 
-  def start_check_server
+  def start_server
     pusher_comp = URI.parse(OpsDeploy::CLI.argument("pusher-url", "PUSHER_URL", true))
     PusherClient.logger.level = Logger::ERROR
     socket = PusherClient::Socket.new(pusher_comp.user, secure: true)
     socket.subscribe("OpsDeploy")
+
     socket["OpsDeploy"].bind("check_instances") do |data|
       begin
         info = data
@@ -132,6 +140,18 @@ class OpsDeploy::CLI
       end
     end
 
+    socket["OpsDeploy"].bind("wait_for_deployments") do |data|
+      begin
+        info = data
+        info = JSON.parse(data) if data.kind_of?(String)
+        stack_id = info["stack"] || info[:stack]
+
+        wait_for_deployments(stack_id)
+      rescue StandardError => e
+        puts e
+      end
+    end
+
     info_msg("Started OpsDeploy server")
     socket.connect
   end

data/lib/ops_deploy/version.rb

@@ -1,3 +1,3 @@
 module OpsDeploy
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mahdi Bchetnia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ops_deploy
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Perform deployment & checks on AWS OpsWorks