kontena-cli 1.2.2.rc1 → 1.2.2.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db7c48764f8cf25a6c8299cfea9a9114bf22e60
-  data.tar.gz: 6dd47f6ca45694944a84a785f4e44dd1e679813d
+  metadata.gz: 162858ba6e59443380f7e24294ebae4e3b778469
+  data.tar.gz: 736156b4a0301f2b6e03d5120133911f4d394b01
 SHA512:
-  metadata.gz: 66602d4abf1853a69113535b6df1c680e957c9fb505ba7c616ea9d72e4eb9fa501b0f5627ae73565688c98035030cecf3b44aa2306c6268810cf22f5b4396ab6
-  data.tar.gz: 0403f16eff264d3841a9b56b508ddd6f789f353d8bc91b85a95853a6562951a0f2a8987878b66ab292faed249ea83e1c4fa7b792d0b454742826532c19d8c0e4
+  metadata.gz: ec8b53ca0d6fcad53ecb07b9184fa51879d777de5377de1d3998e3c536c265aeba785bd04b372efbd7bb212b81f68199df3a0899068b1edcadf04eae5eb55753
+  data.tar.gz: 94a9975353877f7f28542a57722660c1fef23def52fc55cbd877e5693338c98de9c48125dffb27ee348ec230fa5d25cb0ab6020d5741a903ea8b979c37cf1750

data/VERSION

@@ -1 +1 @@
-1.2.2.rc1
+1.2.2.rc2

data/lib/kontena/cli/stacks/stacks_helper.rb

@@ -37,12 +37,12 @@ module Kontena::Cli::Stacks
           service_deploy = deployment['service_deploys'].find{ |s| s['state'] == 'ongoing' }
           if service_deploy
             tracked_services << service_deploy['id']
-            wait_for_service_deploy(service_deploy, states)
+            wait_for_service_deploy(service_deploy)
           end
           if states.include?(deployment['state'])
             deployed = true
             deployment['service_deploys'].select{ |s| !tracked_services.include?(s['id']) }.each do |s|
-              wait_for_service_deploy(s, states)
+              wait_for_service_deploy(s)
             end
           else
             sleep 1
@@ -69,19 +69,14 @@ module Kontena::Cli::Stacks
       raise 'deploy timed out'
     end
 
-    def wait_for_service_deploy(service_deploy, states)
-      service_deployed = false
+    def wait_for_service_deploy(service_deploy)
       name = service_deploy['service_id'].split('/')[-1]
       spinner "Deploying service #{pastel.cyan(name)}" do |spin|
-        until service_deployed
-          r = client.get("services/#{service_deploy['service_id']}/deploys/#{service_deploy['id']}")
-          if states.include?(r['state'])
-            service_deployed = true
-            spin.fail if r['state'] == 'error'
-          else
-            sleep 1
-          end
+        until service_deploy['finished_at']
+          sleep 1
+          service_deploy = client.get("services/#{service_deploy['service_id']}/deploys/#{service_deploy['id']}")
         end
+        spin.fail if service_deploy['state'] == 'error'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.2.rc1
+  version: 1.2.2.rc2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler