mikoshi 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56bb8fdf71e768f178771479a4cd619c69393ff3
-  data.tar.gz: 1db7396f7a154aa01873b9a0d120be26895c131d
+  metadata.gz: 11ffacd388fe1d9f9e14b9a6b4996a49e6a1dd01
+  data.tar.gz: b9024f9536b02d92f818382df4efd5ccd3e38340
 SHA512:
-  metadata.gz: 2e26bed49e82178f2e09e6b909c5532823c6430b5d778e52d5e2e786fcab8d4dec1badf6a7c5e441918bbb42c1e5f99138108aad9db688d021c99ffe8912c87e
-  data.tar.gz: 4ac04275fc78b7bda44b91cefebfc1cacfe333fc3ccc4260413421820c61bb44e620c2b0e70895125087157f93b3c5973b0261fa6ff158bc702b6b76399ae66a
+  metadata.gz: 05e402e23adebac0612a4e4c20ea1a35b6cbec586338d3417251983cd3f08a593b22ff53332c5271a834b1963695b3ae3dcdcc7c3c927476818f253fe5001152
+  data.tar.gz: 5c3d49d7caff0699368be992558a33827ee0a494ade3cedd3a4876f5591631fa46c46ff13da27d781015d4bd010b785b0f02951e1d80d5fc80023e7c26e16065

data/README.md

@@ -85,15 +85,37 @@ $ mikoshi deploy -g ping2googledns
 
 # show help
 $ mikoshi help
-Commands:
-  mikoshi deploy                       # Deploy task definition and service
-  mikoshi help [COMMAND]               # Describe available commands or one specific command
-  mikoshi update_service SERVICE_NAME  # Update service
-  mikoshi update_task TASK_NAME        # Update task definition
+Usage of the mikoshi
 
-Options:
-  [--region=REGION]  # aws region
+Global option
+  -r, --region=REGION : Set aws region
+  -h, --help          : Print this help message
+  -v, --version       : Print mikoshi version
 
+Subcommands
+  update_task_definition
+    Update task definition to given task definition yaml file.
+    Set TASK_DEF_REVISION to updated task definition revision number.
+
+    Option
+      --potdr
+        Acronym of the "Print Only Task Definition Revision".
+
+  update_service
+    Update service to given service yaml file.
+    Wait for success to update the service. (Maximum 300 min)
+
+  deploy
+    invoke update_task_definition and update_service.
+
+    Option
+      -g, --group=GROUP
+        If task definition file name and service file name are
+        same, that a shorthand of pass both.
+
+  Common options
+    -s, --service=SERVICE
+    -t, --task-definition=TASK_DEFINITION
 ```
 
 ## Development

data/exe/mikoshi

@@ -3,4 +3,4 @@
 
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 require 'mikoshi'
-Mikoshi::Cli.start
+Mikoshi::Cli.new(argv: ARGV).start

data/lib/mikoshi/cli.rb

@@ -1,67 +1,162 @@
 # frozen_string_literal: true
 
-require 'thor'
+# rubocop: disable Metrics/AbcSize
+# rubocop: disable Metrics/ClassLength
+
 require 'aws-sdk'
 require 'mikoshi/plan'
 require 'mikoshi/plan/task_definition'
 require 'mikoshi/plan/service'
+require 'optparse'
 
 module Mikoshi
-  class Cli < Thor
+  class Cli
+    attr_reader :options
+
     TASK_DEFINITION_PATH = 'task_definitions'
     SERVICE_PATH = 'services'
     PLAN_EXT = '.yml.erb'
     FETCH_INTERVAL = 10
     DEPLOY_TIMEOUT = 300
 
-    class_option :region, type: :string, desc: 'aws region'
+    def initialize(argv: nil)
+      raise ArgumentError, 'argv is required.' if argv.nil?
+
+      @argv = argv
+      @options = { region: nil, command: nil, config: {} }
+    end
+
+    def start
+      parse
+      exit_when_flag
+
+      case @options[:command]
+      when :update_task_definition
+        update_task_definition(@options[:config][:task_definition])
+      when :update_service
+        update_service(@options[:config][:service])
+      when :deploy
+        deploy
+      when :version
+        version
+      when :help
+        usage
+      end
+    end
+
+    def parse
+      opt = OptionParser.new
+
+      opt.on('-r', '--region=REGION')                   { |v| @options[:region] = v }
+      opt.on('-s', '--service=SERVICE')                 { |v| @options[:config][:service] = v }
+      opt.on('-t', '--task-definition=TASK_DEFINITION') { |v| @options[:config][:task_definition] = v }
+      opt.on('--potdr')                                 { |v| @options[:config][:potdr] = v }
+      opt.on('-g', '--group=GROUP')                     { |v| @options[:config][:group] = v }
+      opt.on('-h', '--help')                            { |v| @options[:config][:help] = v }
+      opt.on('-v', '--version')                         { |v| @options[:config][:version] = v }
+
+      opt.permute!(@argv)
+      @options[:command] = @argv.first.to_sym unless @argv.first.nil?
+    end
+
+    def exit_when_flag
+      usage if @options[:config][:help]
+      version if @options[:config][:version]
+      exit if @options[:config][:help] || @options[:config][:version]
+    end
+
+    def usage
+      puts <<~USAGE
+        Usage of the mikoshi
+
+        Global option
+          -r, --region=REGION : Set aws region
+          -h, --help          : Print this help message
+          -v, --version       : Print mikoshi version
+
+        Subcommands
+          update_task_definition
+            Update task definition to given task definition yaml file.
+            Set TASK_DEF_REVISION to updated task definition revision number.
+
+            Option
+              --potdr
+                Acronym of the "Print Only Task Definition Revision".
+
+          update_service
+            Update service to given service yaml file.
+            Wait for success to update the service. (Maximum 300 min)
+
+          deploy
+            invoke update_task_definition and update_service.
+
+            Option
+              -g, --group=GROUP
+                If task definition file name and service file name are
+                same, that a shorthand of pass both.
+
+          Common options
+            -s, --service=SERVICE
+            -t, --task-definition=TASK_DEFINITION
+      USAGE
+    end
+
+    def version
+      puts "mikoshi version #{Mikoshi::VERSION}"
+    end
+
+    def update_task_definition(task_def_name)
+      if task_def_name.nil?
+        warn '--task-definition=TASK_DEFINITION is require option.'
+        abort
+      end
 
-    desc 'update_task TASK_NAME', 'Update task definition'
-    def update_task_definition(task_name)
       task = ::Mikoshi::Plan::TaskDefinition.new(
-        yaml_path:  File.join(TASK_DEFINITION_PATH, task_name + PLAN_EXT),
-        client:     aws_client,
+        yaml_path: File.join(TASK_DEFINITION_PATH, task_def_name + PLAN_EXT),
+        client:    aws_client,
       )
-      puts "Update task definition: #{task_name}"
+
+      # print only task definition revision
+      potdr = @options[:config][:potdr]
+
+      puts "Update task definition: #{task_def_name}" unless potdr
       task.register_task_definition
-      puts "Done update task definition: #{task_name} revision: #{ENV['TASK_DEF_REVISION']}"
+      puts "Done update task definition: #{task_def_name} revision: #{ENV['TASK_DEF_REVISION']}" unless potdr
+      puts ENV['TASK_DEF_REVISION'] if potdr
     end
 
-    desc 'update_service SERVICE_NAME', 'Update service'
     def update_service(service_name)
+      if service_name.nil?
+        warn '--service=SERVICE is require option.'
+        abort
+      end
+
       service = ::Mikoshi::Plan::Service.new(
-        yaml_path:  File.join(SERVICE_PATH, service_name + PLAN_EXT),
-        client:     aws_client,
+        yaml_path: File.join(SERVICE_PATH, service_name + PLAN_EXT),
+        client:    aws_client,
       )
-      puts "Update service : #{service_name}"
+
+      puts "Update service: #{service_name}"
       service.deploy_service(message: true)
       puts "Done update service #{service_name}"
     end
 
-    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
-      task_definition = options[:group] || options[:task_definition] || nil
-      service = options[:group] || options[:service] || nil
+      task_def_name = @options[:config][:group] || @options[:config][:task_definition]
+      service_name = @options[:config][:group] || @options[:config][:service]
 
-      update_task_definition(task_definition) if task_definition
-      update_service(service) if service
+      update_task_definition(task_def_name) if task_def_name
+      update_service(service_name) if service_name
     end
 
-    no_tasks do
-      def aws_client
-        opt =
-          if options[:region].nil?
-            {}
-          else
-            { region: options[:region] }
-          end
-
-        Aws::ECS::Client.new(opt)
-      end
+    def aws_client
+      opt =
+        if @options[:region].nil?
+          {}
+        else
+          { region: @options[:region] }
+        end
+      Aws::ECS::Client.new(opt)
     end
   end
 end

data/lib/mikoshi/version.rb

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

data/mikoshi.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
 
   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 'codacy-coverage'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikoshi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yusuke Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement