mikoshi 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a78590a8807358c4ba28fae1dc1368ad7abc5738
-  data.tar.gz: e621c2727414da2e6068c2655bb9c5dc35a9e927
+  metadata.gz: 66ad04d55f747d3091c3cd1f31a223864561eaea
+  data.tar.gz: 15f22a4a24d5e8cbbb5b10689676a6bcb3571966
 SHA512:
-  metadata.gz: 408dfd6af42bab61164d4d593162880bcfc946b08585867cfda89599a0fb27ab397d374726228f059259f3d9c2c6dccb8041fb2ad5fb5b7821b9ecf63ddce288
-  data.tar.gz: c08270d8c4c0a5a25e36195321bb50850a35afc6e2e9076c518502f33a6e232fa5782b60a1fa4a396fb9ff975715a3e11c29ec5c1ff9a493803d5ed6b9ac9287
+  metadata.gz: 2b9ff8154a87ff40e3039e625b2612362733f8f132d4d580b8ffdb356feb24f42b4df03df0d4ecdf54ed993695df88eecf5848e8e7ad7bf44eb3efbe37db3b18
+  data.tar.gz: c793828dfc4816c89900db56f442661329064827736b9583fef1e9e840f225d87c5c02b8d0debd47364955124a222348d2a3c9bb881764e7c461a53ba8514c81

data/README.md

@@ -1,6 +1,9 @@
 # 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)
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/71ceb38e09ab4a319e54a2964725f16a)](https://www.codacy.com/app/unasuke/mikoshi?utm_source=github.com&utm_medium=referral&utm_content=unasuke/mikoshi&utm_campaign=Badge_Coverage)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/71ceb38e09ab4a319e54a2964725f16a)](https://www.codacy.com/app/unasuke/mikoshi?utm_source=github.com&utm_medium=referral&utm_content=unasuke/mikoshi&utm_campaign=Badge_Grade)
+[![Gem downloads](https://img.shields.io/gem/dtv/mikoshi.svg)]()
+[![Gem version](https://img.shields.io/gem/v/mikoshi.svg)]()
 
 This gem is tool to deploy ECS task definition and service with described by yaml documents.
 

data/lib/mikoshi/plan/service.rb

@@ -22,37 +22,32 @@ module Mikoshi
         invoke_before_create_hooks
 
         @client.create_service(@data[:service].except(:service))
+        wait_until_services_stable
+
+        invoke_after_create_hooks
       end
 
       def update_service
         invoke_before_update_hooks
 
         @client.update_service(@data[:service].except(:service_name, :placement_strategy, :placement_constraints))
+        wait_until_services_stable
+
+        invoke_after_update_hooks
       end
 
       def deploy_service(message: false)
+        @message = message
+
         case operation
         when :create
           create_service
         when :update
           update_service
         end
-
-        @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
+      rescue => e
+        invoke_failed_hooks
+        raise e
       end
 
       private
@@ -72,6 +67,19 @@ module Mikoshi
         end
       end
 
+      def wait_until_services_stable
+        params = { cluster: @data[:service][:cluster], services: [@data[:service][:service]] }
+
+        @client.wait_until(:services_stable, params) do |w|
+          w.max_attempts = 30
+          w.delay        = 10
+
+          w.before_wait do
+            puts 'Waiting to change status of service...' if @message
+          end
+        end
+      end
+
       %w[before after].each do |step|
         %w[create update].each do |func|
           define_method "invoke_#{step}_#{func}_hooks" do
@@ -79,6 +87,9 @@ module Mikoshi
           end
         end
       end
+      def invoke_failed_hooks
+        invoke_hooks(@data[:hooks][:failed]) unless @data.dig(:hooks, :failed).nil?
+      end
     end
   end
 end

data/lib/mikoshi/plan/task_definition.rb

@@ -18,6 +18,9 @@ module Mikoshi
         invoke_after_register_hooks
 
         resp
+      rescue => e
+        invoke_failed_hooks
+        raise e
       end
 
       private
@@ -27,6 +30,9 @@ module Mikoshi
           invoke_hooks @data[:hooks]["#{step}_register".to_sym] unless @data.dig(:hooks, "#{step}_register".to_sym).nil?
         end
       end
+      def invoke_failed_hooks
+        invoke_hooks(@data[:hooks][:failed]) unless @data.dig(:hooks, :failed).nil?
+      end
     end
   end
 end

data/lib/mikoshi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mikoshi
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/mikoshi.gemspec

@@ -30,10 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'codecov'
+  spec.add_development_dependency 'codacy-coverage'
   spec.add_development_dependency 'rake', '~> 10.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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yusuke Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: codacy-coverage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !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: '0'
 - !ruby/object:Gem::Dependency
   name: unasukecop
   requirement: !ruby/object:Gem::Requirement