hako 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09a67f10cb41c44240b92e06db1fe5f13184e78a
-  data.tar.gz: 12debcaa9ddb9719d8b41ce5fb0511957918dcd9
+  metadata.gz: 2eb5f8e08ca1d904ac2fd8b62eef4a6f1475058c
+  data.tar.gz: 26dc1a08053eb64a64f8e43c9842a5e4ede4d005
 SHA512:
-  metadata.gz: 94cc6eba550cde280f0e4f234d6dc4f9147e7a2fd7677edc25e7febd640688f462e127e103dc7139eb582b4a88bae8a87cf4c254f39c808db3ccdce99489e3da
-  data.tar.gz: 178293b2984bf77e788f07793a748c5688e1b2dcc7570d9614662cbcb0664b8c7e44bd629794872bdbcdf33f10a1aeb76da13eff41c76b8545b06b97455f8e7c
+  metadata.gz: c65560e2a33df328f972de4d4602fcc5192757bf29099905215df7a3e4a491016d200ca593fa12dce4cbc99c2e285bd54c54a6ef3e8d25b7ec8df3b430a2081b
+  data.tar.gz: 48f1e96ecf8a524c73998ec1517c6ac2b5b96d620274b94feea0388701b0bb3eb44f33c9cf4df33b61fba82cf5872d7487e31037c93486ab20a6dba4fd56bf81

data/exe/hako

@@ -2,4 +2,4 @@
 # frozen_string_literal: true
 require 'hako/cli'
 
-Hako::CLI.start
+Hako::CLI.start(ARGV)

data/hako.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk', '>= 2.1.0'
-  spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/hako/cli.rb

@@ -1,67 +1,207 @@
 # frozen_string_literal: true
 require 'hako'
-require 'thor'
+require 'optparse'
 
 module Hako
-  class CLI < Thor
-    desc 'deploy FILE', 'Run deployment'
-    option :force, aliases: %w[-f], type: :boolean, default: false, desc: 'Run deployment even if nothing is changed'
-    option :tag, aliases: %w[-t], type: :string, default: 'latest', desc: 'Specify tag (default: latest)'
-    option :dry_run, aliases: %w[-n], type: :boolean, default: false, desc: 'Enable dry-run mode'
-    option :verbose, aliases: %w[-v], type: :boolean, default: false, desc: 'Enable verbose logging'
-    def deploy(yaml_path)
-      require 'hako/application'
-      require 'hako/commander'
+  class CLI
+    SUB_COMMANDS = %w[
+      deploy
+      oneshot
+      show-yaml
+      status
+      remove
+    ].freeze
 
-      if options[:verbose]
-        Hako.logger.level = Logger::DEBUG
+    def self.start(argv)
+      new(argv).run
+    end
+
+    def initialize(argv)
+      @argv = argv.dup
+      @help = false
+      parser.order!(@argv)
+    end
+
+    def run
+      if @help || @argv.empty?
+        puts parser.help
+        SUB_COMMANDS.each do |subcommand|
+          puts create_subcommand(subcommand).new.parser.help
+        end
+      else
+        create_subcommand(@argv.shift).new.run(@argv)
       end
+    end
 
-      Commander.new(Application.new(yaml_path)).deploy(force: options[:force], tag: options[:tag], dry_run: options[:dry_run])
+    private
+
+    def parser
+      @parser ||= OptionParser.new do |opts|
+        opts.banner = 'hako'
+        opts.version = VERSION
+        opts.on('-h', '--help', 'Show help') { @help = true }
+      end
     end
 
-    desc 'oneshot FILE COMMAND ARG...', 'Run oneshot task'
-    option :tag, aliases: %w[-t], type: :string, default: 'latest', desc: 'Specify tag (default: latest)'
-    option :containers, aliases: %w[-c], type: :string, default: '', banner: 'NAME1,NAME2', desc: 'Comma-separated additional container names to start with the app container (default: "")'
-    option :verbose, aliases: %w[-v], type: :boolean, default: false, desc: 'Enable verbose logging'
-    def oneshot(yaml_path, command, *args)
-      require 'hako/application'
-      require 'hako/commander'
+    def create_subcommand(sub)
+      if SUB_COMMANDS.include?(sub)
+        CLI.const_get(sub.split('-').map(&:capitalize).join(''))
+      else
+        $stderr.puts "No such subcommand: #{sub}"
+        exit 1
+      end
+    end
 
-      if options[:verbose]
-        Hako.logger.level = Logger::DEBUG
+    class Deploy
+      def run(argv)
+        parse!(argv)
+        require 'hako/application'
+        require 'hako/commander'
+
+        if @verbose
+          Hako.logger.level = Logger::DEBUG
+        end
+
+        Commander.new(Application.new(@yaml_path)).deploy(force: @force, tag: @tag, dry_run: @dry_run)
+      end
+
+      def parse!(argv)
+        @force = false
+        @tag = 'latest'
+        @dry_run = false
+        @verbose = false
+        parser.parse!(argv)
+        @yaml_path = argv.first
+
+        if @yaml_path.nil?
+          puts parser.help
+          exit 1
+        end
       end
 
-      Commander.new(Application.new(yaml_path)).oneshot([command, *args], tag: options[:tag], containers: options[:containers].split(','))
+      def parser
+        @parser ||= OptionParser.new do |opts|
+          opts.banner = 'hako deploy [OPTIONS] FILE'
+          opts.version = VERSION
+          opts.on('-f', '--force', 'Run deployment even if nothing is changed') { @force = true }
+          opts.on('-t', '--tag=TAG', 'Specify tag (default: latest)') { |v| @tag = v }
+          opts.on('-n', '--dry-run', 'Enable dry-run mode') { @dry_run = true }
+          opts.on('-v', '--verbose', 'Enable verbose logging') { @verbose = true }
+        end
+      end
     end
 
-    desc 'show-yaml FILE', 'Show expanded YAML'
-    def show_yaml(yaml_path)
-      require 'hako/yaml_loader'
-      puts YamlLoader.new.load(Pathname.new(yaml_path)).to_yaml
+    class Oneshot
+      def run(argv)
+        parse!(argv)
+        require 'hako/application'
+        require 'hako/commander'
+
+        if @verbose
+          Hako.logger.level = Logger::DEBUG
+        end
+
+        Commander.new(Application.new(@yaml_path)).oneshot(@argv, tag: @tag, containers: @containers)
+      end
+
+      def parse!(argv)
+        @tag = 'latest'
+        @containers = []
+        @verbose = false
+        parser.parse!(argv)
+        @yaml_path = argv.shift
+        @argv = argv
+
+        if @yaml_path.nil? || @argv.empty?
+          puts parser.help
+          exit 1
+        end
+      end
+
+      def parser
+        @parser ||= OptionParser.new do |opts|
+          opts.banner = 'hako oneshot [OPTIONS] FILE COMMAND ARG...'
+          opts.version = VERSION
+          opts.on('-t', '--tag=TAG', 'Specify tag (default: latest)') { @tag = tag }
+          opts.on('-c', '--container=NAME', 'Additional container name to start with the app container') { |v| @containers << v }
+          opts.on('-v', '--verbose', 'Enable verbose logging') { @verbose = true }
+        end
+      end
     end
 
-    desc 'status FILE', 'Show deployment status'
-    def status(yaml_path)
-      require 'hako/application'
-      require 'hako/commander'
-      Commander.new(Application.new(yaml_path)).status
+    class ShowYaml
+      def run(argv)
+        parse!(argv)
+        require 'hako/yaml_loader'
+        puts YamlLoader.new.load(Pathname.new(@yaml_path)).to_yaml
+      end
+
+      def parse!(argv)
+        parser.parse!(argv)
+        @yaml_path = argv.first
+        if @yaml_path.nil?
+          puts parser.help
+          exit 1
+        end
+      end
+
+      def parser
+        @parser ||= OptionParser.new do |opts|
+          opts.banner = 'hako show-yaml FILE'
+          opts.version = VERSION
+        end
+      end
     end
 
-    desc 'remove FILE', 'Destroy the application'
-    def remove(yaml_path)
-      require 'hako/application'
-      require 'hako/commander'
-      Commander.new(Application.new(yaml_path)).remove
+    class Status
+      def run(argv)
+        parse!(argv)
+        require 'hako/application'
+        require 'hako/commander'
+        Commander.new(Application.new(@yaml_path)).status
+      end
+
+      def parse!(argv)
+        parser.parse!(argv)
+        @yaml_path = argv.first
+
+        if @yaml_path.nil?
+          puts parser.help
+          exit 1
+        end
+      end
+
+      def parser
+        @parser ||= OptionParser.new do |opts|
+          opts.banner = 'hako status FILE'
+          opts.version = VERSION
+        end
+      end
     end
 
-    desc 'version', 'Show version'
-    option :numeric, type: :boolean, default: false, desc: 'Show numeric only'
-    def version
-      if options[:numeric]
-        say VERSION
-      else
-        say "hako v#{VERSION}"
+    class Remove
+      def run
+        parse!(argv)
+        require 'hako/application'
+        require 'hako/commander'
+        Commander.new(Application.new(@yaml_path)).remove
+      end
+
+      def parse!(argv)
+        parser.parse!(argv)
+        @yaml_path = argv.first
+
+        if @yaml_path.nil?
+          puts parser.help
+          exit 1
+        end
+      end
+
+      def parser
+        @parser ||= OptionParser.new do |opts|
+          opts.banner = 'hako remove FILE'
+          opts.version = VERSION
+        end
       end
     end
   end

data/lib/hako/schedulers/ecs.rb

@@ -69,8 +69,19 @@ module Hako
         end
         task = run_task(task_definition, commands)
         Hako.logger.info "Started task: #{task.task_arn}"
-        exit_code = wait_for_task(task)
+        containers = wait_for_task(task)
         Hako.logger.info 'Oneshot task finished'
+        exit_code = 127
+        containers.each do |name, container|
+          if container.exit_code.nil?
+            Hako.logger.info "#{name} has stopped without exit_code: reason=#{container.reason}"
+          else
+            Hako.logger.info "#{name} has stopped with exit_code=#{container.exit_code}"
+            if name == 'app'
+              exit_code = container.exit_code
+            end
+          end
+        end
         exit_code
       end
 
@@ -325,9 +336,7 @@ module Hako
             task.containers.each do |c|
               containers[c.name] = c
             end
-            app = containers.fetch('app')
-            Hako.logger.info "Exit code is #{app.exit_code}"
-            return app.exit_code
+            return containers
           end
           sleep 1
         end

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !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