ecs_compose 0.1.0.pre11 → 0.1.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d921f9b7cfc815df0f612407f5c4b6a5eb36a242
-  data.tar.gz: 517f89b2d4b32570307fb789370270b24a211882
+  metadata.gz: 9631893f24b9aefdc6fba876721e9cdfb52b2635
+  data.tar.gz: 5aea13e1e6d140ead8708fa72d3480fa630e4020
 SHA512:
-  metadata.gz: 850739a8d7a033f072c3b8a764a967d428cc28d7402ac69fc002d57e57bb5414cb260945c655023388fa96a5f2b11a75aa3243f99607716db4c7944bc626490f
-  data.tar.gz: 90a241bc97e878262a503e6310ff30fc8a4bf2b31bb15c05c9f1ee5e690250386b95ad2b4750ae8d7704ea3ff5ce100e6c6ce5180fe534253cf30521aa3dc775
+  metadata.gz: 3ddee4ff7648921d0015e29e4aa6190814da7a5119170821509ff42402f8c43b353d80aed6679012afc3151ebb05c1554d5aed3d8e7384289b2e75fc82e5b3ae
+  data.tar.gz: d4638ac13bcf415d2cf4e19c7568e9d3636b335a2ee355a99a42be8e63243018d2d46ebf11e83dc416dbe667d2cdfe7dcf20ca99292dce9709a0d41e8ed8f412

data/exe/ecs-compose

@@ -79,7 +79,8 @@ class App
   def command_up
     available = manifest.task_definitions.select {|td| td.type == :service }
     chosen = all_or_specified(available, options.fetch('<service>'))
-    chosen.each {|td| td.update }
+    services = chosen.map {|td| td.update }
+    EcsCompose::TaskDefinition.wait_for_services(services)
   end
 
   def command_run
@@ -104,9 +105,10 @@ class App
     command = options.fetch('<arg>')
     command = nil if command.empty?
 
-    task.run(environment: env,
-             entrypoint: options.fetch('--entrypoint').flatten[0],
-             command: command)
+    arn = task.run(environment: env,
+                   entrypoint: options.fetch('--entrypoint').flatten[0],
+                   command: command)
+    EcsCompose::TaskDefinition.wait_for_tasks([arn])
   end
 
   def command_json

data/lib/ecs_compose/ecs.rb

@@ -3,6 +3,7 @@
 require 'colorize'
 require 'json'
 require 'open3'
+require 'shellwords'
 require 'tempfile'
 
 module EcsCompose
@@ -18,7 +19,7 @@ module EcsCompose
     # Run `aws ecs` with the specified arguments.
     def self.run(*args)
       command = ["aws", "ecs"] + args + ["--output", "json"]
-      STDERR.puts "→ #{command.join(' ').blue}"
+      STDERR.puts "→ #{Shellwords.join(command).blue}"
       stdout, status = Open3.capture2(*command)
       if status != 0
         raise "Error running: #{command.inspect}"
@@ -62,14 +63,23 @@ module EcsCompose
           *extra_args)
     end
 
-    def self.wait_tasks_stopped(*arns)
+    # Wait until all of the specified services have reached a stable state.
+    # Returns nil.
+    def self.wait_services_stable(services)
+      run("wait", "services-stable",
+          "--services", *services)
+    end
+
+    # Wait until all of the specified tasks have stopped.  Returns nil.
+    def self.wait_tasks_stopped(arns)
       run("wait", "tasks-stopped",
-          "--tasks", arns.join(" "))
+          "--tasks", *arns)
     end
 
-    def self.describe_tasks(*arns)
+    # Describe a set of tasks as JSON.
+    def self.describe_tasks(arns)
       run("describe-tasks",
-          "--tasks", arns.join(" "))
+          "--tasks", *arns)
     end
   end
 end

data/lib/ecs_compose/task_definition.rb

@@ -30,6 +30,13 @@ module EcsCompose
     # service.
     def update
       Ecs.update_service(name, register)
+      name
+    end
+
+    # Wait for a set of services to reach a steady state.
+    def self.wait_for_services(service_names)
+      Ecs.wait_services_stable(service_names)
+      # TODO: Check for errors during stabilization.
     end
 
     # Run this task definition as a one-shot ECS task, with the specified
@@ -37,12 +44,13 @@ module EcsCompose
     def run(**args)
       overrides_json = json_generator.generate_override_json(**args)
       info = Ecs.run_task(register, overrides_json: overrides_json)
-      arn = info.fetch("tasks")[0].fetch("taskArn")
-      #STDERR.puts("Running as: #{arn}")
+      info.fetch("tasks")[0].fetch("taskArn")
+    end
 
-      # Wait until the task has finished running and check for errors.
-      Ecs.wait_tasks_stopped(arn)
-      TaskError.fail_on_errors(Ecs.describe_tasks(arn))
+    # Wait for a set of tasks to finish, and raise an error if they fail.
+    def self.wait_for_tasks(task_arns)
+      Ecs.wait_tasks_stopped(task_arns)
+      TaskError.fail_on_errors(Ecs.describe_tasks(task_arns))
     end
 
     # Generate ECS task definition JSON for this instance.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre11
+  version: 0.1.0.pre12
 platform: ruby
 authors:
 - Eric Kidd