hako 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1407a0536a7ceb26b385676d75b54acbc88f01c6
-  data.tar.gz: 5a66b42284d1e620a07217f9f5d6d6cd3313f788
+  metadata.gz: b4b66507d80228e05ee0fdd78429ff9898f8ed5c
+  data.tar.gz: af54939a042cfcaa1a17a36a9c33a1ea822749a4
 SHA512:
-  metadata.gz: f3d0e37907893a6b21ce3440936d54c7737e3ffd2949253681a86013c338a453811ec12e467e4d833f7b34b068cc0de9f1d67d18ff56d0e15db2e4981ba4b43e
-  data.tar.gz: a319f40f7638445fe2f8e0b95857b9262317db80a6dcc4fa9e7bdcba1b799a1075566b78d539fe1de32c41fc68c666afb966e0874c169732f675108d87474f28
+  metadata.gz: a96ceada37a687ffeba40a6fd27c6133bc542ca18b959c531f823e0669147fd2be945c1bc5e7ccc8dd64a86026ef4e1ebd5fc822044ab66be2fc6896b20a8566
+  data.tar.gz: 6d3a66534d013a1f306f1ab1fcf9426be5cfc6f2d383b0b4bbb55a59f1793fee1414ed9697ee1fb9b99479d427915d02d08bfdec6e91fa55533e2737c1cb03e9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.6.0 (2017-06-23)
+## New features
+- Add experimental option `--no-wait` to oneshot
+    - `hako oneshot --no-wait` runs Docker container in background and return an identifier depending on scheduler.
+    - In ECS scheduler, it will output the task's ARN.
+
 # 1.5.2 (2017-06-08)
 ## Bug fixes
 - Retry RegisterTaskDefinition when "too many concurrent attempts" error occurs

data/lib/hako/cli.rb

@@ -144,7 +144,7 @@ module Hako
           Hako.logger.level = Logger::DEBUG
         end
 
-        Commander.new(Application.new(@yaml_path)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run)
+        Commander.new(Application.new(@yaml_path)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run, no_wait: @no_wait)
       end
 
       def parse!(argv)
@@ -153,6 +153,7 @@ module Hako
         @containers = []
         @env = {}
         @verbose = false
+        @no_wait = false
         parser.parse!(argv)
         @yaml_path = argv.shift
         @argv = argv
@@ -171,6 +172,7 @@ module Hako
           opts.on('-n', '--dry-run', 'Enable dry-run mode') { @dry_run = true }
           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 }
+          opts.on('--no-wait', 'Run Docker container in background and return an identifier depending on scheduler (experimental)') { @no_wait = true }
           opts.on('-e', '--env=NAME=VAL', 'Add environment variable') do |arg|
             k, v = arg.split('=', 2)
             @env[k] = v

data/lib/hako/commander.rb

@@ -45,8 +45,9 @@ module Hako
     # @param [String] tag
     # @param [Hash<String, String>] env
     # @param [Boolean] dry_run
+    # @param [Boolean] no_wait
     # @return [nil]
-    def oneshot(commands, tag:, containers:, env: {}, dry_run: false)
+    def oneshot(commands, tag:, containers:, env: {}, dry_run: false, no_wait: false)
       containers = load_containers(tag, dry_run: dry_run, with: containers)
       scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
       volumes = @app.yaml.fetch('volumes', {})
@@ -54,7 +55,7 @@ module Hako
 
       scripts.each { |script| script.oneshot_starting(containers) }
       exit_code = with_oneshot_signal_handlers(scheduler) do
-        scheduler.oneshot(containers, commands, env)
+        scheduler.oneshot(containers, commands, env, no_wait: no_wait)
       end
       scripts.each { |script| script.oneshot_finished(containers) }
       exit exit_code

data/lib/hako/schedulers/ecs.rb

@@ -136,8 +136,9 @@ module Hako
       # @param [Hash<String, Container>] containers
       # @param [Array<String>] commands
       # @param [Hash<String, String>] env
-      # @return [nil]
-      def oneshot(containers, commands, env)
+      # @param [Boolean] no_wait
+      # @return [Integer] Returns exit code
+      def oneshot(containers, commands, env, no_wait: false)
         definitions = create_definitions(containers)
         definitions.each do |definition|
           definition.delete(:essential)
@@ -161,7 +162,12 @@ module Hako
           @task = run_task(task_definition, commands, env)
           Hako.logger.info "Started task: #{@task.task_arn}"
           @scripts.each { |script| script.oneshot_started(self) }
-          wait_for_oneshot_finish
+          if no_wait
+            puts @task.task_arn
+            0
+          else
+            wait_for_oneshot_finish
+          end
         end
       end
 
@@ -858,6 +864,7 @@ module Hako
 
         autoscaling = Aws::AutoScaling::Client.new
         interval = MIN_ASG_INTERVAL
+        Hako.logger.info("Unable to start tasks. Start trying scaling out '#{@autoscaling_group_for_oneshot}'")
         loop do
           begin
             asg = autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: [@autoscaling_group_for_oneshot]).auto_scaling_groups[0]

data/lib/hako/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hako
-  VERSION = '1.5.2'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk