deployme 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818c46100359f8dc6b33f8d8b794273323d375e7e5b710310e12489974a61f08
-  data.tar.gz: a108b1c68aaade6df935d8e369886aaa151d61f170b782c4744b9d84c276ca21
+  metadata.gz: 2092ec13e1c2ec3da76e08c519ac38f4bfce73dad9533ff693057c41251a5fe0
+  data.tar.gz: 72b15d3d59fc554bb2dc5ae6189911f10fc9f7b3b2487f67bb7ad35875006cdb
 SHA512:
-  metadata.gz: 356aa29e4fcbec2970874c68cfe4d6398de2b1f3e1448f7e466507a3bf4ff65fd9a6311a53ca6a3b65c7f914ef14823cf849e0d3ac473dd1e2f9bd2ca65e5eac
-  data.tar.gz: 5f2f3df307fc9811b671515d62a0d2f11fe40fff855d9cfb2fca6cccdf9960877783bba69d08af81d7e3739a7382722be388ccd305c41322bb11abe199a02c17
+  metadata.gz: 825126a97858836951c81b1f3dcece404d55b3fc857d9be292ef840f6f308a5663d53d16e9567dfb0a4e2cf7b3b549fe836010f0165c1c2d2c8da2393c04407d
+  data.tar.gz: 5ecd9848f6a8163e95dae1fb9b1f00292f468d4d6957769609ede0b1588d2e48d67c87d31c1cd3547067a3cd705d7fec2061feefbd8e462cc43c9546be5497ff

data/lib/deployme/providers/ecs.rb

@@ -55,7 +55,7 @@ module Deployme
           end
         rescue Aws::Waiters::Errors::WaiterFailed => error
           logger.error "failed waiting for service: #{error.message}"
-          exit(1)
+          raise('Failed to deploy')
         end
       end
 
@@ -64,7 +64,7 @@ module Deployme
         failures.each do |failure|
           STDERR.puts "Error: run task failure '#{failure.reason}'"
         end
-        exit 1
+        raise('Failed to deploy')
       end
 
       # handle one off tasks
@@ -72,11 +72,12 @@ module Deployme
         config.fetch(:one_off_commands, []).each do |one_off_command|
           task_definition = task_definitions[one_off_command[:task_family].to_sym]
           logger.info "Running '#{one_off_command[:command]}'"
+
           response = client.run_task(
             cluster: options.ecs_cluster,
             task_definition: task_definition[:arn],
             count: 1,
-            started_by: "ecs-deploy: one_off_commands",
+            started_by: 'ecs-deploy: one_off_commands',
             overrides: {
               container_overrides: [
                 {
@@ -90,28 +91,27 @@ module Deployme
           report_run_task_failures(response.failures)
 
           task_arn = response.tasks.first.task_arn
-          print "Waiting for '#{one_off_command[:command]}' to finish"
-          waiting = 0
-          last_now = Time.now
-          task = nil
-          while waiting <= 1800 do
-            task = client.describe_tasks(tasks: [task_arn], cluster: options.ecs_cluster).tasks.first
-            break if task.last_status == "STOPPED"
-            print "."
-            now = Time.now
-            waiting += (now - last_now).to_i
-            last_now = now
-            sleep 5
-          end
-          if waiting > 1800
-            STDERR.puts "Error: wait time exceeded"
-            exit 1
+          logger.info "Task: #{task_arn}"
+          begin
+            client.wait_until(:tasks_stopped, cluster: options.ecs_cluster, tasks: [task_arn]) do |w|
+              w.before_wait do
+                logger.info 'Waiting for task to finish...'
+              end
+            end
+          rescue Aws::Waiters::Errors::WaiterFailed => error
+            logger.error "failed waiting for task: #{error.message}"
+            raise('Failed to deploy')
           end
-          if task.containers.first.exit_code != 0
+
+          task = client.describe_tasks(tasks: [task_arn], cluster: options.ecs_cluster).tasks.first
+          container = task.containers.find { |c| c.name == task_definition[:container_definitions].first[:name] }
+          if container.exit_code != 0
             STDERR.puts "Error: '#{one_off_command[:command]}' finished with a non-zero exit code! Aborting."
-            exit 1
+            STDERR.puts "Exit code: #{task.containers.first.exit_code}"
+            STDERR.puts "           #{task.containers.first.reason}"
+            raise('Failed to deploy')
           end
-          puts " done!"
+          puts ' done!'
         end
       end
 

data/lib/deployme/version.rb

@@ -1,3 +1,3 @@
 module Deployme
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deployme
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs