hako 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15a5dfc30436140400dd5ccda62a4b278b4be62d
-  data.tar.gz: ea8732df2d78bcb4b35c43e6f3443f113ea0e2e2
+  metadata.gz: bc9a0e86d4e177d1111a515c83721c43c8ef7e76
+  data.tar.gz: ff4f22fd4b84bb5644e571d834180476c05d735a
 SHA512:
-  metadata.gz: ef577f0f0fbfc7cd58c476fe5ccf544b0ea23e64f2415ad24451da25e130cb7dc8b9de8399bbfe85239e95c1d51d60098a50d07d1fbf1321b14499f9840433ea
-  data.tar.gz: 0dbafe4c400b5095c56cb8f117ac7509951ebb7978d2b49767ca0f40d97d9664fa8bb0e1a63a6c42c319417eee4b73338f7bcc824d69d8c16c3a083784ba0e31
+  metadata.gz: ee2903bab02577238bffe0b17acdf9414daf7972d593db13650f7dd2c0e3785748d2435568fc94cd823aa637f8e01f1a5023fe0e5a4b195eb53ce0a29658c381
+  data.tar.gz: 3a1cc1ffc48155bcea674b613e019fde2b61cb43f3e66f410787750b48817ba086a300dae7f2c8881da5caa74c0c421d7ea6491d7bae0c1832c9ee55375a7c41

data/lib/hako/cli.rb

@@ -101,11 +101,12 @@ module Hako
           Hako.logger.level = Logger::DEBUG
         end
 
-        Commander.new(Application.new(@yaml_path)).oneshot(@argv, tag: @tag, containers: @containers, env: @env)
+        Commander.new(Application.new(@yaml_path)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run)
       end
 
       def parse!(argv)
         @tag = 'latest'
+        @dry_run = false
         @containers = []
         @env = {}
         @verbose = false
@@ -124,6 +125,7 @@ module Hako
           opts.banner = 'hako oneshot [OPTIONS] FILE COMMAND ARG...'
           opts.version = VERSION
           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('-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('-e', '--env=NAME=VAL', 'Add environment variable') do |arg|

data/lib/hako/commander.rb

@@ -27,7 +27,7 @@ module Hako
     def oneshot(commands, tag:, containers:, env: {}, dry_run: 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) }
-      scheduler = load_scheduler(@app.yaml['scheduler'], scripts)
+      scheduler = load_scheduler(@app.yaml['scheduler'], scripts, dry_run: dry_run)
 
       exit_code = with_oneshot_signal_handlers(scheduler) do
         scheduler.oneshot(containers, commands, env)
@@ -77,7 +77,10 @@ module Hako
 
     def load_containers(tag, dry_run:, with: nil)
       app = AppContainer.new(@app, @app.yaml['app'].merge('tag' => tag), dry_run: dry_run)
-      front = load_front(@app.yaml['front'], dry_run: dry_run)
+      front =
+        if @app.yaml.key?('front')
+          load_front(@app.yaml['front'], dry_run: dry_run)
+        end
 
       containers = { 'app' => app, 'front' => front }
       @app.yaml.fetch('additional_containers', {}).each do |name, container|

data/lib/hako/schedulers/ecs.rb

@@ -61,17 +61,29 @@ module Hako
         definitions.each do |definition|
           definition.delete(:essential)
         end
-        task_definition = register_task_definition_for_oneshot(definitions)
-        if task_definition == :noop
-          Hako.logger.info "Task definition isn't changed"
-          task_definition = @ecs.describe_task_definition(task_definition: "#{@app_id}-oneshot").task_definition
+
+        if @dry_run
+          definitions.each do |d|
+            Hako.logger.info "Add container #{d}"
+          end
+          env.each do |k, v|
+            Hako.logger.info "Add environment #{k}=#{v}"
+          end
+          Hako.logger.info "Execute command #{commands}"
+          0
         else
-          Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
+          task_definition = register_task_definition_for_oneshot(definitions)
+          if task_definition == :noop
+            Hako.logger.info "Task definition isn't changed"
+            task_definition = @ecs.describe_task_definition(task_definition: "#{@app_id}-oneshot").task_definition
+          else
+            Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
+          end
+          @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
         end
-        @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
       end
 
       def stop_oneshot

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk