ecs_deployer 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e60347cf25748e10ebd8fb31c60a16bcb7c744f0
-  data.tar.gz: 70df50d8c38bafe0637bc36baf59dff095faeb92
+  metadata.gz: 8dbede2e477b7494c7ce86d997b1bc63760be467
+  data.tar.gz: 09ab13c573ae1fc4efb73daef2be2e85fb356fe7
 SHA512:
-  metadata.gz: 96b2e854dc1c9dbf9a789ceba7e24fc97913fdaed3fdc54f85616e7fe159acaa44e63a9a3211a2961d911e744b7189683f29912fc9a36e859463f50da3aa6d77
-  data.tar.gz: 927248da5b5c2aaee7f92012455155fb6f3a8380ce28ae05b4afac6dc88e81d858b5b336e55296813f4f75bebf80893500c44eb827f24a1fa278bcfd26c73ebe
+  metadata.gz: d1ae2cc0e11b1ee2909a771d240bb27b8e3b31ac49beeb8860738709df4b319a600413910c6bd87acdf81c88e6249db5c771cc217238ef6b26727be80e446383
+  data.tar.gz: 6c2fb378ca31391072450169588915f8ad5fe10c936db13a633b936c9395d763940412abe15ae7a88a120c2501baed234bb4d3a7cea0e01b351d2bb3553375e5

data/.rubocop.yml

@@ -1,6 +1,8 @@
 AllCops:
   Exclude:
-    - 'tmp/**/*'
+  - 'tmp/**/*'
+Style/BlockComments:
+  Enabled: false
 Style/Documentation:
   Enabled: false
 Style/ExtraSpacing:
@@ -8,7 +10,7 @@ Style/ExtraSpacing:
 Style/FrozenStringLiteralComment:
   Enabled: false
 Metrics/AbcSize:
-  Max: 20
+  Max: 64
 Metrics/BlockLength:
   Enabled: false
 Metrics/ClassLength:

data/README.md

@@ -1,5 +1,10 @@
 # EcsDeployer
 
+[![CircleCI](https://circleci.com/gh/naomichi-y/ecs_deployer/tree/master.svg?style=svg)](https://circleci.com/gh/naomichi-y/ecs_deployer/tree/master)
+[![Gem Version](https://badge.fury.io/rb/ecs_deployer.svg)](https://badge.fury.io/rb/ecs_deployer)
+
+## Description
+
 This package provides service deployment function of ECS.
 
 ## Installation
@@ -12,11 +17,15 @@ gem 'ecs_deployer'
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install ecs_deployer
+```
+$ gem install ecs_deployer
+```
 
 ## Task definition
 

data/lib/ecs_deployer/cli.rb

@@ -5,14 +5,19 @@ module EcsDeployer
     class_option :profile, type: :string
     class_option :region, type: :string
 
-    def initialize(*args)
-      super
-
-      aws_options = {}
-      aws_options[:profile] = options[:profile] if options[:profile]
-      aws_options[:region] = options[:region] if options[:region]
-
-      @deployer = EcsDeployer::Client.new(aws_options)
+    no_commands do
+      def prepare
+        aws_options = {}
+        aws_options[:profile] = options[:profile] if options[:profile]
+        aws_options[:region] = options[:region] if options[:region]
+
+        @deployer = EcsDeployer::Client.new(aws_options)
+      end
+
+      def invoke_command(command, *args)
+        prepare
+        super
+      end
     end
 
     desc 'task_register', 'Create new task definition'
@@ -28,13 +33,13 @@ module EcsDeployer
     option :cluster, required: true
     option :service, required: true
     option :wait, type: :boolean, default: true
-    option :timeout, type: :numeric, default: EcsDeployer::Client::DEPLOY_TIMEOUT
+    option :timeout, type: :numeric, default: 600
     def update_service
+      @deployer.timeout = options[:timeout]
       result = @deployer.update_service(
         options[:cluster],
         options[:service],
-        options[:wait],
-        options[:timeout]
+        options[:wait]
       )
 
       puts "Update service: #{result}"

data/lib/ecs_deployer/client.rb

@@ -7,11 +7,10 @@ require 'base64'
 module EcsDeployer
   class Client
     LOG_SEPARATOR = '-' * 96
-    PAULING_INTERVAL = 20
-    DEPLOY_TIMEOUT = 600
     ENCRYPT_PATTERN = /^\${(.+)}$/
 
     attr_reader :cli
+    attr_accessor :timeout, :pauling_interval
 
     # @param [Hash] aws_options
     # @option aws_options [String] :profile
@@ -21,6 +20,8 @@ module EcsDeployer
       @command = RuntimeCommand::Builder.new
       @cli = Aws::ECS::Client.new(aws_options)
       @kms = Aws::KMS::Client.new(aws_options)
+      @timeout = 600
+      @pauling_interval = 20
     end
 
     # @param [String] mater_key
@@ -100,9 +101,8 @@ module EcsDeployer
 
     # @param [String] cluster
     # @param [String] service
-    # @param [Fixnum] timeout
     # @return [String]
-    def update_service(cluster, service, wait = true, timeout = DEPLOY_TIMEOUT)
+    def update_service(cluster, service, wait = true)
       register_clone_task(cluster, service) if @new_task_definition_arn.nil?
 
       result = @cli.update_service(
@@ -110,7 +110,7 @@ module EcsDeployer
         service: service,
         task_definition: @family + ':' + @revision.to_s
       )
-      wait_for_deploy(cluster, service, timeout) if wait
+      wait_for_deploy(cluster, service) if wait
       result.service.service_arn
     end
 
@@ -184,8 +184,7 @@ module EcsDeployer
 
     # @param [String] cluster
     # @param [String] service
-    # @param [Fixnum] timeout
-    def wait_for_deploy(cluster, service, timeout)
+    def wait_for_deploy(cluster, service)
       service_status = service_status(cluster, service)
       raise TaskDesiredError, 'Task desired by service is 0.' if service_status[:desired_count].zero?
 
@@ -193,8 +192,8 @@ module EcsDeployer
       @command.puts 'Start deploing...'
 
       loop do
-        sleep(PAULING_INTERVAL)
-        wait_time += PAULING_INTERVAL
+        sleep(@pauling_interval)
+        wait_time += @pauling_interval
         result = deploy_status(cluster, service)
 
         if result[:new_running_count] == result[:current_running_count]
@@ -211,7 +210,7 @@ module EcsDeployer
           @command.puts LOG_SEPARATOR
           @command.puts 'You can stop process with Ctrl+C. Deployment will continue.'
 
-          if wait_time > timeout
+          if wait_time > @timeout
             @command.puts "New task definition: #{@new_task_definition_arn}"
             raise DeployTimeoutError, 'Service is being updating, but process is timed out.'
           end

data/lib/ecs_deployer/version.rb

@@ -1,3 +1,3 @@
 module EcsDeployer
-  VERSION = '0.1.12'.freeze
+  VERSION = '0.1.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deployer
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: runtime_command