hako 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9a7759d62912ccf9f7b41c2497aaa3642eeee80
-  data.tar.gz: a6498a17bcf8f155d4df71263fb3493302f01f23
+  metadata.gz: 09a67f10cb41c44240b92e06db1fe5f13184e78a
+  data.tar.gz: 12debcaa9ddb9719d8b41ce5fb0511957918dcd9
 SHA512:
-  metadata.gz: 67ae0a234cd5c4ea4c2b19eaf3ae876ce4de21c6f8003100f9a97586f242bef2bd87bf695217ddea022dc4d6b977c8996c322e84a4b6f12ba6c2bc4fa059cfe7
-  data.tar.gz: 22bc8c6fccf5d3120ae6d9a4956eb38372d88efce844fc68c7f69b6b3724eea06a39225f50a9e47d5ad4b28802d119b50565b76ca2e80d2a0444bbd41a26fca9
+  metadata.gz: 94cc6eba550cde280f0e4f234d6dc4f9147e7a2fd7677edc25e7febd640688f462e127e103dc7139eb582b4a88bae8a87cf4c254f39c808db3ccdce99489e3da
+  data.tar.gz: 178293b2984bf77e788f07793a748c5688e1b2dcc7570d9614662cbcb0664b8c7e44bd629794872bdbcdf33f10a1aeb76da13eff41c76b8545b06b97455f8e7c

data/lib/hako.rb

@@ -7,7 +7,9 @@ module Hako
     @logger ||=
       begin
         $stdout.sync = true
-        Logger.new($stdout)
+        Logger.new($stdout).tap do |l|
+          l.level = Logger::INFO
+        end
       end
   end
 end

data/lib/hako/cli.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'hako'
 require 'thor'
 
 module Hako
@@ -7,18 +8,31 @@ module Hako
     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'
+
+      if options[:verbose]
+        Hako.logger.level = Logger::DEBUG
+      end
+
       Commander.new(Application.new(yaml_path)).deploy(force: options[:force], tag: options[:tag], dry_run: options[:dry_run])
     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'
-      Commander.new(Application.new(yaml_path)).oneshot([command, *args], tag: options[:tag])
+
+      if options[:verbose]
+        Hako.logger.level = Logger::DEBUG
+      end
+
+      Commander.new(Application.new(yaml_path)).oneshot([command, *args], tag: options[:tag], containers: options[:containers].split(','))
     end
 
     desc 'show-yaml FILE', 'Show expanded YAML'
@@ -40,5 +54,15 @@ module Hako
       require 'hako/commander'
       Commander.new(Application.new(yaml_path)).remove
     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}"
+      end
+    end
   end
 end

data/lib/hako/commander.rb

@@ -24,10 +24,10 @@ module Hako
       scripts.each { |script| script.after_deploy(containers) }
     end
 
-    def oneshot(commands, tag: 'latest')
-      app = AppContainer.new(@app, @app.yaml['app'].merge('tag' => tag), dry_run: false)
+    def oneshot(commands, tag:, containers:)
+      containers = load_containers(tag, dry_run: false, with: containers)
       scheduler = load_scheduler(@app.yaml['scheduler'])
-      exit scheduler.oneshot(app, commands)
+      exit scheduler.oneshot(containers, commands)
     end
 
     def status
@@ -42,7 +42,7 @@ module Hako
 
     private
 
-    def load_containers(tag, dry_run:)
+    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)
 
@@ -50,6 +50,14 @@ module Hako
       @app.yaml.fetch('additional_containers', {}).each do |name, container|
         containers[name] = Container.new(@app, container, dry_run: dry_run)
       end
+      if with
+        keys = ['app'] + with
+        containers.keys.each do |key|
+          unless keys.include?(key)
+            containers.delete(key)
+          end
+        end
+      end
       containers
     end
 

data/lib/hako/schedulers/ecs.rb

@@ -42,7 +42,7 @@ module Hako
           else
             Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
             upload_front_config(@app_id, front, app.port)
-            Hako.logger.info "Uploaded front configuration to s3://#{front.s3.bucket}/#{front.s3.key(@app_id)}"
+            Hako.logger.debug "Uploaded front configuration to s3://#{front.s3.bucket}/#{front.s3.key(@app_id)}"
           end
           service = create_or_update_service(task_definition.task_definition_arn, front_port)
           if service == :noop
@@ -55,10 +55,19 @@ module Hako
         end
       end
 
-      def oneshot(app, commands)
-        task_definition = register_task_definition_for_oneshot(app)
-        Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
-        task = run_task(task_definition, app.env, commands)
+      def oneshot(containers, commands)
+        definitions = create_definitions(containers, -1)
+        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
+        else
+          Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
+        end
+        task = run_task(task_definition, commands)
         Hako.logger.info "Started task: #{task.task_arn}"
         exit_code = wait_for_task(task)
         Hako.logger.info 'Oneshot task finished'
@@ -152,24 +161,28 @@ module Hako
         if service
           find_front_port(service)
         else
-          max_port = -1
-          @ecs.list_services(cluster: @cluster).each do |page|
-            unless page.service_arns.empty?
-              @ecs.describe_services(cluster: @cluster, services: page.service_arns).services.each do |s|
-                if s.status != 'INACTIVE'
-                  port = find_front_port(s)
-                  if port
-                    max_port = [max_port, port].max
-                  end
+          new_front_port
+        end
+      end
+
+      def new_front_port
+        max_port = -1
+        @ecs.list_services(cluster: @cluster).each do |page|
+          unless page.service_arns.empty?
+            @ecs.describe_services(cluster: @cluster, services: page.service_arns).services.each do |s|
+              if s.status != 'INACTIVE'
+                port = find_front_port(s)
+                if port
+                  max_port = [max_port, port].max
                 end
               end
             end
           end
-          if max_port == -1
-            DEFAULT_FRONT_PORT
-          else
-            max_port + 1
-          end
+        end
+        if max_port == -1
+          DEFAULT_FRONT_PORT
+        else
+          max_port + 1
         end
       end
 
@@ -184,11 +197,11 @@ module Hako
         end
       end
 
-      def task_definition_changed?(definitions)
+      def task_definition_changed?(family, definitions)
         if @force
           return true
         end
-        task_definition = @ecs.describe_task_definition(task_definition: @app_id).task_definition
+        task_definition = @ecs.describe_task_definition(task_definition: family).task_definition
         container_definitions = {}
         task_definition.container_definitions.each do |c|
           container_definitions[c.name] = c
@@ -207,7 +220,7 @@ module Hako
       end
 
       def register_task_definition(definitions)
-        if task_definition_changed?(definitions)
+        if task_definition_changed?(@app_id, definitions)
           @ecs.register_task_definition(
             family: @app_id,
             container_definitions: definitions,
@@ -228,21 +241,16 @@ module Hako
         end
       end
 
-      def register_task_definition_for_oneshot(app)
-        @ecs.register_task_definition(
-          family: "#{@app_id}-oneshot",
-          container_definitions: [
-            {
-              name: 'oneshot',
-              image: app.image_tag,
-              cpu: app.cpu,
-              memory: app.memory,
-              links: [],
-              port_mappings: [],
-              environment: [],
-            },
-          ],
-        ).task_definition
+      def register_task_definition_for_oneshot(definitions)
+        family = "#{@app_id}-oneshot"
+        if task_definition_changed?(family, definitions)
+          @ecs.register_task_definition(
+            family: "#{@app_id}-oneshot",
+            container_definitions: definitions,
+          ).task_definition
+        else
+          :noop
+        end
       end
 
       def front_container(front, front_port)
@@ -275,17 +283,15 @@ module Hako
         }
       end
 
-      def run_task(task_definition, env, commands)
-        environment = env.map { |k, v| { name: k, value: v } }
+      def run_task(task_definition, commands)
         @ecs.run_task(
           cluster: @cluster,
           task_definition: task_definition.task_definition_arn,
           overrides: {
             container_overrides: [
               {
-                name: 'oneshot',
+                name: 'app',
                 command: commands,
-                environment: environment,
               },
             ],
           },
@@ -311,13 +317,17 @@ module Hako
             end
           end
 
-          Hako.logger.info "  status #{task.last_status}"
+          Hako.logger.debug "  status #{task.last_status}"
 
           if task.last_status == 'STOPPED'
             Hako.logger.info "Stopped at #{task.stopped_at}"
-            container = task.containers[0]
-            Hako.logger.info "Exit code is #{container.exit_code}"
-            return container.exit_code
+            containers = {}
+            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
           end
           sleep 1
         end

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk