mikoshi 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66ad04d55f747d3091c3cd1f31a223864561eaea
-  data.tar.gz: 15f22a4a24d5e8cbbb5b10689676a6bcb3571966
+  metadata.gz: 56bb8fdf71e768f178771479a4cd619c69393ff3
+  data.tar.gz: 1db7396f7a154aa01873b9a0d120be26895c131d
 SHA512:
-  metadata.gz: 2b9ff8154a87ff40e3039e625b2612362733f8f132d4d580b8ffdb356feb24f42b4df03df0d4ecdf54ed993695df88eecf5848e8e7ad7bf44eb3efbe37db3b18
-  data.tar.gz: c793828dfc4816c89900db56f442661329064827736b9583fef1e9e840f225d87c5c02b8d0debd47364955124a222348d2a3c9bb881764e7c461a53ba8514c81
+  metadata.gz: 2e26bed49e82178f2e09e6b909c5532823c6430b5d778e52d5e2e786fcab8d4dec1badf6a7c5e441918bbb42c1e5f99138108aad9db688d021c99ffe8912c87e
+  data.tar.gz: 4ac04275fc78b7bda44b91cefebfc1cacfe333fc3ccc4260413421820c61bb44e620c2b0e70895125087157f93b3c5973b0261fa6ff158bc702b6b76399ae66a

data/.rubocop.yml

@@ -11,3 +11,6 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*_spec.rb'
     - 'mikoshi.gemspec'
+
+Metrics/CyclomaticComplexity:
+  Max: 8

data/README.md

@@ -80,6 +80,9 @@ Waiting for 10 sec...
 Waiting for 10 sec...
 Update service success
 
+# if task definition and service are same name, you can use -g option
+$ mikoshi deploy -g ping2googledns
+
 # show help
 $ mikoshi help
 Commands:

data/lib/mikoshi/cli.rb

@@ -41,9 +41,14 @@ module Mikoshi
     desc 'deploy', 'Deploy task definition and service'
     method_option :task_definition, type: :string, desc: 'task_definition name', aliases: '-t'
     method_option :service, type: :string, desc: 'service name', aliases: '-s'
+    method_option :group, type: :string, desc: 'service and task definition name(if both are same)', aliases: '-g'
+
     def deploy
-      update_task_definition(options[:task_definition]) unless options[:task_definition].nil?
-      update_service(options[:service]) unless options[:service].nil?
+      task_definition = options[:group] || options[:task_definition] || nil
+      service = options[:group] || options[:service] || nil
+
+      update_task_definition(task_definition) if task_definition
+      update_service(service) if service
     end
 
     no_tasks do

data/lib/mikoshi/plan/service.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/except'
 require 'mikoshi/plan'
+require 'mikoshi/util/except_keys'
 
 module Mikoshi
   class Plan
     class Service < Base
       TASK_DEFINITION_WITH_REVISION = %r{\A\S+:\d+\z}
+      IGNORE_OPTIONS_WHEN_UPDATE =
+        %i[client_token load_balancers placement_constraints placement_strategy role service_name].freeze
 
       def initialize(yaml_path: nil, client: nil)
         super
@@ -30,7 +32,7 @@ module Mikoshi
       def update_service
         invoke_before_update_hooks
 
-        @client.update_service(@data[:service].except(:service_name, :placement_strategy, :placement_constraints))
+        @client.update_service(@data[:service].except_keys(IGNORE_OPTIONS_WHEN_UPDATE))
         wait_until_services_stable
 
         invoke_after_update_hooks

data/lib/mikoshi/util/except_keys.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/except'
+
+class Hash
+  def except_keys(keys_enum)
+    return dup.except!(keys_enum) unless keys_enum.respond_to?(:each)
+
+    clone = dup
+    keys_enum.each do |key|
+      clone.except!(key)
+    end
+
+    clone
+  end
+end

data/lib/mikoshi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikoshi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yusuke Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,6 +160,7 @@ files:
 - lib/mikoshi/plan.rb
 - lib/mikoshi/plan/service.rb
 - lib/mikoshi/plan/task_definition.rb
+- lib/mikoshi/util/except_keys.rb
 - lib/mikoshi/version.rb
 - mikoshi.gemspec
 homepage: https://github.com/unasuke/mikoshi