ecs_deployer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63e2ad46f9cab7f78fddf9952e32b456f798d039
-  data.tar.gz: 89501da0f01b0ef5a60314771142a18df880cde2
+  metadata.gz: 47b8f97fb9482d7736def886976477700742787b
+  data.tar.gz: 4d9f5cf0333818a5df1482ece0fc06ead1b9abb0
 SHA512:
-  metadata.gz: 3c7628b60938925607c4088061bef7e01b463080271e39b1cc443769860ee12393ff03d0208911d4a8c07940a3a03d528524f13bc02add8aea81463139cbad8a
-  data.tar.gz: e63fa09d2794e0d25fda1e3c1b9ed0a6ab5ba33204a22eb1cea65949193cdd3797ea5f4310a2b38a2d40366ebb2dc74fe3ea399a91583fab40d7985624a76104
+  metadata.gz: 13d158aa62c0e9e9ffa17f19b6a8c1d4b676e3144f2db0294064f69f0e93e684c7dafa79f936a3eec96a82e45de57733b1fe9872af31460155524aca7991416c
+  data.tar.gz: 9c6a7a38501ca9709762bfd0689bdcea6baac07896504fdd2700a89427f3f772641328227efd8f36ca6133c6e0514bf7ed032f73568deb5d5e1683fd34d340b0

data/lib/ecs_deployer/client.rb

@@ -6,15 +6,16 @@ module EcsDeployer
   class Client
     PAULING_INTERVAL = 20
 
-    # @param [String] cluster_name
+    # @param [String] cluster
     # @param [Hash] options
     # @option options [String] :profile
     # @option options [String] :region
     # @return [EcsDeployer::Client]
-    def initialize(cluster_name, options = {})
-      @cluster_name = cluster_name
-      @ecs_command = Commander.new(cluster_name, options)
-      @family_name = ''
+    def initialize(cluster, options = {})
+      @cluster = cluster
+      @runtime = RuntimeCommand::Builder.new
+      @ecs_command = Commander.new(@runtime, options)
+      @family = ''
       @revision = ''
       @new_task_definition_arn = ''
     end
@@ -29,42 +30,43 @@ module EcsDeployer
     # @param [Hash] task_hash
     # @return [String]
     def register_task_hash(task_hash)
-      result = @ecs_command.register_task_definition(
-        task_hash['family'],
-        task_hash['containerDefinitions']
-      )
+      result = @ecs_command.register_task_definition(task_hash['family'], task_hash['containerDefinitions'])
 
-      @family_name = result['taskDefinition']['family']
+      @family = result['taskDefinition']['family']
       @revision = result['taskDefinition']['revision']
       @new_task_definition_arn = result['taskDefinition']['taskDefinitionArn']
     end
 
-    # @param [String] service_name
+    # @param [String] service
     # @return [String]
-    def register_clone_task(service_name)
+    def register_clone_task(service)
       detected_service = false
 
-      result = @ecs_command.describe_services(service_name)
-      result['services'].each do |service|
-        if service['serviceName'] == service_name
-          result = @ecs_command.describe_task_definition(service['taskDefinition'])
-          @new_task_definition_arn = register_task_process(result['taskDefinition'])
+      result = @ecs_command.describe_services([service], { 'cluster': @cluster })
+      result['services'].each do |svc|
+        if svc['serviceName'] == service
+          result = @ecs_command.describe_task_definition(svc['taskDefinition'])
+          @new_task_definition_arn = register_task_hash(result['taskDefinition'])
           detected_service = true
           break
         end
       end
 
-      raise ServiceNotFoundError.new("'#{service_name}' service is not found.") unless detected_service
+      raise ServiceNotFoundError.new("'#{service}' service is not found.") unless detected_service
 
       @new_task_definition_arn
     end
 
-    # @param [String] service_name
+    # @param [String] service
     # @param [Fixnum] timeout
-    def update_service(service_name, wait = true, timeout = 300)
-      register_clone_task(service_name) if @new_task_definition_arn.empty?
-      @ecs_command.update_service(service_name, @family_name, @revision)
-      wait_for_deploy(service_name, timeout) if wait
+    def update_service(service, wait = true, timeout = 600)
+      register_clone_task(service) if @new_task_definition_arn.empty?
+      options = {
+        'cluster': @cluster,
+        'task-definition': @family + ':' + @revision.to_s
+      }
+      @ecs_command.update_service(service, options)
+      wait_for_deploy(service, timeout) if wait
     end
 
     # @return [String]
@@ -73,60 +75,66 @@ module EcsDeployer
     end
 
     private
-    def wait_for_deploy(service_name, timeout)
+    def wait_for_deploy(service, timeout)
       detected_service = false
 
-      result = @ecs_command.describe_services(service_name)
-      result['services'].each do |service|
-        next unless service['serviceName'] == service_name
+      result = @ecs_command.describe_services([service], { 'cluster': @cluster })
+      result['services'].each do |svc|
+        next unless svc['serviceName'] == service
         detected_service = true
 
-        result = @ecs_command.describe_task_definition(service['taskDefinition'])
+        result = @ecs_command.describe_task_definition(svc['taskDefinition'])
 
-        if service['desiredCount'] > 0
+        if svc['desiredCount'] > 0
           running_new_task = false
           wait_time = 0
-          puts 'Start deploing...'
+          @runtime.puts 'Start deploing...'
 
           begin
             sleep(PAULING_INTERVAL)
             wait_time += PAULING_INTERVAL
 
             # Get current tasks
-            result = @ecs_command.list_tasks(service_name)
+            options = {
+              'cluster': @cluster,
+              'service-name': service,
+              'desired-status': 'RUNNING'
+            }
+            result = @ecs_command.list_tasks(options)
 
-            if result['taskArns'].size > 0
-              success_count = 0
+            raise TaskNotFoundError.new('Desired count is 0.') if result['taskArns'].size == 0
 
-              result = @ecs_command.describe_tasks(result['taskArns'])
-              result['tasks'].each do |task|
-                success_count += 1 if @new_task_definition_arn == task['taskDefinitionArn']
-              end
-
-              if result['tasks'].size == success_count
-                puts 'Service update succeeded.'
-                puts "New task definition: #{@new_task_definition_arn}"
+            new_running_count = 0
+            result = @ecs_command.describe_tasks(result['taskArns'], { 'cluster': @cluster })
 
-                running_new_task = true
-              end
-            else
-              raise TaskNotFoundError.new('Desired count is 0.')
+            result['tasks'].each do |task|
+              new_running_count += 1 if @new_task_definition_arn == task['taskDefinitionArn']
             end
 
-            if wait_time > timeout
-              puts "New task definition: #{@new_task_definition_arn}"
-              raise DeployTimeoutError.new('Service is being updating, but process is timed out.')
-            end
+            current_running_count = result['tasks'].size
 
-            puts "Deploying... (#{wait_time} seconds elapsed)"
+            if current_running_count == new_running_count
+              @runtime.puts "Service update succeeded. [#{new_running_count}/#{current_running_count}]"
+              @runtime.puts "New task definition: #{@new_task_definition_arn}"
 
+              running_new_task = true
+
+            else
+              @runtime.puts "Deploying... [#{new_running_count}/#{current_running_count}] (#{wait_time} seconds elapsed)"
+              @runtime.puts 'You can stop process with Ctrl+C. Deployment will continue.'
+
+              if wait_time > timeout
+                @runtime.puts "New task definition: #{@new_task_definition_arn}"
+                raise DeployTimeoutError.new('Service is being updating, but process is timed out.')
+              end
+            end
           end while !running_new_task
         end
 
         break
       end
 
-      raise ServiceNotFoundError.new("'#{service_name}' service is not found.") unless detected_service
+      raise ServiceNotFoundError.new("'#{service}' service is not found.") unless detected_service
     end
   end
 end

data/lib/ecs_deployer/commander.rb

@@ -1,80 +1,61 @@
 require 'oj'
-require 'runtime_command'
 
 module EcsDeployer
   class Commander
-    # @param [String] cluster_name
+    # @param [RuntimeCommand::Builder] runtime
     # @param [Hash] options
     # @return EcsDeployer::Commander
-    def initialize(cluster_name, options = {})
-      @runtime = RuntimeCommand::Builder.new
+    def initialize(runtime, options = {})
+      @runtime = runtime
       @options = options
-      @cluster_name = cluster_name
     end
 
-    # @param [String] service_name
-    # @param [String] family_name
-    # @param [Fixnum] revision
+    # @param [String] service
+    # @param [Hash] options
     # @return [Hash]
-    def update_service(service_name, family_name, revision)
-      args = {
-        'cluster': @cluster_name,
-        'service':  service_name,
-        'task-definition': family_name + ':' + revision.to_s
-      }
-
-      exec('update-service', args)
+    def update_service(service, options = {})
+      options['service'] = service
+      exec('update-service', options)
     end
 
-    # @param [String] service_name
+    # @param [Hash] options
     # @return [Hash]
-    def list_tasks(service_name)
-      args = {
-        'cluster': @cluster_name,
-        'service-name': service_name,
-        'desired-status': 'RUNNING'
-      }
-      exec('list-tasks', args)
+    def list_tasks(options = {})
+      exec('list-tasks', options)
     end
 
     # @param [Array] tasks
+    # @param [Hash] options
     # @return [Hash]
-    def describe_tasks(tasks)
-      args = {
-        'cluster': @cluster_name,
-        'tasks': tasks.join(' ')
-      }
-      exec('describe-tasks', args)
+    def describe_tasks(tasks, options = {})
+      options['tasks'] = tasks.join(' ')
+      exec('describe-tasks', options)
     end
 
     # @param [String] task_definition
+    # @param [Hash] options
     # @return [Hash]
-    def describe_task_definition(task_definition)
-      args = {
-        'task-definition': task_definition
-      }
-      exec('describe-task-definition', args)
+    def describe_task_definition(task_definition, options = {})
+      options['task-definition'] = task_definition
+      exec('describe-task-definition', options)
     end
 
-    # @param [String] service_name
+    # @param [Array] services
+    # @param [Hash] options
     # @return [Hash]
-    def describe_services(service_name)
-      args = {
-        'cluster': @cluster_name,
-        'services': service_name
-      }
-      exec('describe-services', args)
+    def describe_services(services, options = {})
+      options['services'] = services.join(' ')
+      exec('describe-services', options)
     end
 
-    # @param [String] family_name
+    # @param [String] family
     # @param [Hash] container_definitions
+    # @param [Hash] options
     # @return [Hash]
-    def register_task_definition(family_name, container_definitions)
-      args = {
-        'family': family_name,
-        'container-definitions': '"' + Oj.dump(container_definitions).gsub('"', '\\"') + '"'
-      }
-      exec('register-task-definition', args)
+    def register_task_definition(family, container_definitions, options = {})
+      options['family'] = family
+      options['container-definitions'] = '"' + Oj.dump(container_definitions).gsub('"', '\\"') + '"'
+      exec('register-task-definition', options)
     end
 
     # @return [String]
@@ -84,24 +65,23 @@ module EcsDeployer
 
     private
     # @param [String] command
-    # @param [Hash] args
+    # @param [Hash] params
     # @return [Hash]
-    def exec(command, args)
+    def exec(command, params)
       arg = ''
-      args.each do |name, value|
+      params.each do |name, value|
         arg << "--#{name} #{value} "
       end
 
-      arg << "--profile #{@options[:profile]} " if @options.has_key?(:profile)
-      arg << "--region #{@options[:region]} " if @options.has_key?(:region)
+      arg << "--profile #{params[:profile]} " if params.has_key?(:profile)
+      arg << "--region #{params[:region]} " if params.has_key?(:region)
 
       command = "aws ecs #{command} #{arg}"
       result = @runtime.exec(command)
 
       raise CommandError.new unless result.buffered_stderr.empty?
 
-      result = result.buffered_stdout
-      Oj.load(result)
+      Oj.load(result.buffered_stdout)
     end
   end
 end

data/lib/ecs_deployer/version.rb

@@ -1,3 +1,3 @@
 module EcsDeployer
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deployer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: runtime_command
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Deploy application to ECS.