mikoshi 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e732444d9107e6409fde22edc4700c1c7ceaad3c
-  data.tar.gz: ba803c7452847c673431eab79e2d02b99d748423
+  metadata.gz: 66bb151aeed8702ad507aa84126eff3bda7fbf90
+  data.tar.gz: 8085cc9bf14cc57ad151282ac13b5d35785be054
 SHA512:
-  metadata.gz: 6fccda9380d7deecc83029d0cb2180601bc6949d2997e37d279728ebecbd083a78c66512cf4eee74d9b4bb75e41a319ee12bfc0e471831bbd3463619d3f68e8b
-  data.tar.gz: 65224e4c679303011d1a2c85bb77935c72e26023c583f35cd8a3698e513c9b987d71fedd81ec538ef3da4190368be12b2621a8c56bf54b53cc13533382d937a3
+  metadata.gz: 6817c50c328ae791ead793aea49a4bab1972166cff09c07fe88b7166378e2c35bf9fa2ed9f435f9a0115794007254ec1a97100b94e8083cc0eed5c96ce58c4bf
+  data.tar.gz: 9f3278475c0c6d9e05450aabfdc93ece6b57a10d9397de67e56cb557f1cb9a9018706dcf266bf5528b177c6f436fd98bac5fd01313f09cf8bd24e1c8b1ab25c7

data/.gitignore

@@ -7,3 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+/task_definitions/
+/services/
+.ruby-version

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -6,3 +6,8 @@ Style/Documentation:
   Enabled: false
 Style/RegexpLiteral:
   EnforcedStyle: percent_r
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+    - 'mikoshi.gemspec'

data/.travis.yml

@@ -3,8 +3,9 @@ notifications:
 sudo: false
 language: ruby
 rvm:
-  - 2.2.7
   - 2.3.4
   - 2.4.1
   - ruby-head
 before_install: gem install bundler -v 1.14.3
+script:
+  - bundle exec rspec

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mikoshi.gemspec

data/README.md

@@ -1,5 +1,6 @@
 # Mikoshi
 [![Build Status](https://travis-ci.org/unasuke/mikoshi.svg?branch=master)](https://travis-ci.org/unasuke/mikoshi)
+[![codecov](https://codecov.io/gh/unasuke/mikoshi/branch/master/graph/badge.svg)](https://codecov.io/gh/unasuke/mikoshi)
 
 This gem is tool to deploy ECS task definition and service with described by yaml documents.
 
@@ -24,23 +25,32 @@ First, describe task definition to yaml.
 
 ```yaml
 # task_definitions/ping2googledns.yml.erb
-family: "ping2googledns"
-network_mode: "bridge"
-container_definitions:
-  - name: "ping"
-    image: "unasuke/ping2googledns:latest"
-    cpu: 128
-    memory: 128
+task_definition:
+  family: "ping2googledns"
+  network_mode: "bridge"
+  container_definitions:
+    - name: "ping"
+      image: "unasuke/ping2googledns:latest"
+      cpu: 128
+      memory: 128
+hooks:
+  after_register:
+    - echo registerd
 ```
 
 ... and service too.
 
 ```yaml
 # services/ping2googledns.yml.erb
-cluster: "default"
-service: "ping2googledns"
-task_definition: <%= "ping2googledns:#{ENV['TASK_REVISION']}" %>
-desired_count: 1
+service:
+  cluster: "default"
+  service: "ping2googledns"
+  task_definition: <%= "ping2googledns:#{ENV['TASK_DEF_REVISION']}" %>
+  desired_count: 1
+hooks:
+  before_update:
+    - echo some shell command
+    - echo shell command another one
 ```
 
 Then, invoke those commands.
@@ -52,7 +62,7 @@ Update task definition: ping2googledns
 Done update task definition: ping2googledns revision: 6
 
 # update service
-$ TASK_REVISION=3 mikoshi update_service ping2googledns
+$ TASK_DEF_REVISION=3 mikoshi update_service ping2googledns
 Update service : ping2googledns
 Waiting for 10 sec...
 Update service success

data/Rakefile

@@ -1,13 +1,10 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
+RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i[test rubocop]
+task default: %i[spec rubocop]

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'mikoshi'

data/exe/mikoshi

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 require 'mikoshi'
 Mikoshi::Cli.start

data/lib/mikoshi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mikoshi/version'
 require 'mikoshi/cli'
 require 'mikoshi/plan'

data/lib/mikoshi/cli.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'aws-sdk'
-require 'timeout'
 require 'mikoshi/plan'
 require 'mikoshi/plan/task_definition'
 require 'mikoshi/plan/service'
 
 module Mikoshi
   class Cli < Thor
-    TASK_DEFINITION_PATH = 'task_definitions'.freeze
-    SERVICE_PATH = 'services'.freeze
-    PLAN_EXT = '.yml.erb'.freeze
+    TASK_DEFINITION_PATH = 'task_definitions'
+    SERVICE_PATH = 'services'
+    PLAN_EXT = '.yml.erb'
     FETCH_INTERVAL = 10
     DEPLOY_TIMEOUT = 300
 
@@ -33,20 +34,7 @@ module Mikoshi
         client:     aws_client,
       )
       puts "Update service : #{service_name}"
-      service.deploy_service
-      begin
-        Timeout.timeout(DEPLOY_TIMEOUT) do
-          loop do
-            puts "Waiting for #{FETCH_INTERVAL} sec..."
-            sleep FETCH_INTERVAL
-            break if service.deployed?
-          end
-        end
-      rescue Timeout::Error
-        puts "Update failed by timeout(#{DEPLOY_TIMEOUT} sec)"
-        exit(false)
-      end
-
+      service.deploy_service(message: true)
       puts "Done update service #{service_name}"
     end
 

data/lib/mikoshi/plan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/hash/keys'
 require 'erb'
 require 'yaml'
@@ -14,6 +16,12 @@ module Mikoshi
         @data = YAML.safe_load(ERB.new(File.new(yaml_path).read).result).deep_symbolize_keys
         @client = client
       end
+
+      def invoke_hooks(hooks)
+        hooks.each do |hook|
+          system hook
+        end
+      end
     end
   end
 end

data/lib/mikoshi/plan/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/hash/except'
 require 'mikoshi/plan'
 
@@ -9,40 +11,72 @@ module Mikoshi
       def initialize(yaml_path: nil, client: nil)
         super
 
-        if @data[:task_definition].match(TASK_DEFINITION_WITH_REVISION).nil?
+        if @data[:service][:task_definition].match(TASK_DEFINITION_WITH_REVISION).nil?
           raise ArgumentError, 'task_definition should have revision by numerically.'
         end
 
-        @data.store :service_name, @data[:service]
+        @data[:service].store :service_name, @data[:service][:service]
       end
 
       def create_service
-        @client.create_service(@data.except(:service))
+        invoke_before_create_hooks
+
+        @client.create_service(@data[:service].except(:service))
       end
 
       def update_service
-        @client.update_service(@data.except(:service_name))
+        invoke_before_update_hooks
+
+        @client.update_service(@data[:service].except(:service_name))
       end
 
-      def deploy_service
-        resp = @client.describe_services(cluster: @data[:cluster], services: [@data[:service]])
-        if resp.services.empty? || resp.services.first.status == 'INACTIVE'
+      def deploy_service(message: false)
+        case operation
+        when :create
           create_service
-        else
+        when :update
           update_service
         end
-      end
 
-      def deployed?
-        resp = @client.describe_services(cluster: @data[:cluster], services: [@data[:service]])
-        deployment = resp.services.first.deployments.find do |d|
-          d.task_definition.end_with?(@data[:task_definition])
+        @client.wait_until(:services_stable, cluster: @data[:service][:cluster], services: [@data[:service][:service]]) do |w|
+          w.max_attempts = 30
+          w.delay        = 10
+
+          w.before_wait do
+            puts 'Waiting to change status of service...' if message
+          end
+        end
+
+        case operation
+        when :create
+          invoke_after_create_hooks
+        when :update
+          invoke_after_update_hooks
         end
+      end
 
-        if deployment.running_count == @data[:desired_count]
-          true
+      private
+
+      def operation
+        if @operation
+          @operation
         else
-          false
+          resp = @client.describe_services(cluster: @data[:service][:cluster], services: [@data[:service][:service]])
+
+          @operation ||=
+            if resp.services.empty? || resp.services.first.status == 'INACTIVE'
+              :create
+            else
+              :update
+            end
+        end
+      end
+
+      %w[before after].each do |step|
+        %w[create update].each do |func|
+          define_method "invoke_#{step}_#{func}_hooks" do
+            invoke_hooks @data[:hooks]["#{step}_#{func}".to_sym] unless @data.dig(:hooks, "#{step}_#{func}".to_sym).nil?
+          end
         end
       end
     end

data/lib/mikoshi/plan/task_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mikoshi/plan'
 
 module Mikoshi
@@ -8,10 +10,23 @@ module Mikoshi
       end
 
       def register_task_definition
-        resp = @client.register_task_definition(@data)
+        invoke_before_register_hooks
+
+        resp = @client.register_task_definition(@data[:task_definition])
         ENV['TASK_DEF_REVISION'] = resp.task_definition.revision.to_s
+
+        invoke_after_register_hooks
+
         resp
       end
+
+      private
+
+      %w[before after].each do |step|
+        define_method "invoke_#{step}_register_hooks" do
+          invoke_hooks @data[:hooks]["#{step}_register".to_sym] unless @data.dig(:hooks, "#{step}_register".to_sym).nil?
+        end
+      end
     end
   end
 end

data/lib/mikoshi/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mikoshi
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.0'
 end

data/mikoshi.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 lib = File.expand_path('../lib', __FILE__)
@@ -22,12 +23,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.3.0'
+
   spec.add_dependency 'activesupport', '~> 5'
   spec.add_dependency 'aws-sdk', '~> 2'
   spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'codecov'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'unasukecop'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikoshi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Yusuke Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unasukecop
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mikoshi is a tool that deploy to ECS and manage task definition and cluster.
 email:
 - yusuke1994525@gmail.com
@@ -117,6 +159,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
@@ -145,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="