hako 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e144225804bd958a9c8be85ad1f2998cc3a70b
-  data.tar.gz: 746df8720d4697f12ed9b7fd66d73699af39e8c1
+  metadata.gz: db06d64418cd4a7dcd0217e8c6ada22c9fd100fb
+  data.tar.gz: 5f962c2f0b257e6486d69c5bde8f4d16a38663ed
 SHA512:
-  metadata.gz: 47a8418855c3fe25132a0033375a00628df9cb07385e6ee1ccb50c6d18c1e14ae0deb1f9284cf32d354568631f7fbfe67d84a1a12b95e6ce1823d43dd48e7d92
-  data.tar.gz: d4274e025153b4cebaac5e6b4d81ef05443afa9a497cccb54b77cf54a8612decf9be2dc5d17980dae692e08cfa112e4f640122f6cf739dded359005657ebfdde
+  metadata.gz: 55589bac643779f00ed7eaf18c40106e262610685ba747affd57f21001a38ebf0c31f6f0cbdd14f87bea34ca3a5adb6969e116fc149a12737ffe193d80812dde
+  data.tar.gz: 5d6f39b9a9d2dc9452ebb412981fe0f255b9485faa82819a24a8f2e29554908333693491d84108e1e47fd0ed8016bcc92d84bfb5202d768e25df28cac9225a2e

data/.rubocop_todo.yml

@@ -21,3 +21,7 @@ Metrics/BlockNesting:
 
 Style/Documentation:
   Enabled: false
+
+# Temporarily...
+Metrics/ParameterLists:
+  Enabled: false

data/lib/hako/commander.rb

@@ -19,11 +19,12 @@ module Hako
       front = load_front(@app.yaml['front'])
       scheduler = load_scheduler(@app.yaml['scheduler'])
       app_port = @app.yaml.fetch('port', nil)
+      docker_labels = @app.yaml.fetch('docker_labels', {})
       image = @app.yaml.fetch('image') { raise Error.new('image must be set') }
       image_tag = "#{image}:#{tag}"
       after_scripts = @app.yaml.fetch('after_scripts', []).map { |config| load_after_script(config) }
 
-      scheduler.deploy(image_tag, env, app_port, front, force: force)
+      scheduler.deploy(image_tag, env, app_port, docker_labels, front, force: force)
 
       after_scripts.each(&:after_deploy)
     end

data/lib/hako/scheduler.rb

@@ -8,7 +8,7 @@ module Hako
     def initialize(_app_id, _options)
     end
 
-    def deploy(_image_tag, _env, _app_port, _front_config, _options)
+    def deploy(_image_tag, _env, _app_port, _docker_labels, _front_config, _options)
       raise NotImplementedError
     end
 

data/lib/hako/schedulers/echo.rb

@@ -7,7 +7,7 @@ module Hako
         @app_id = app_id
       end
 
-      def deploy(image_tag, env, app_port, _front, force: false)
+      def deploy(image_tag, env, app_port, _docker_labels, _front, force: false)
         puts "Deploy #{image_tag} with app_port=#{app_port}, force=#{force}"
         puts 'Environment variables:'
         env.each do |key, val|

data/lib/hako/schedulers/ecs.rb

@@ -23,7 +23,7 @@ module Hako
         @ec2 = Aws::EC2::Client.new(region: region)
       end
 
-      def deploy(image_tag, env, app_port, front, force: false)
+      def deploy(image_tag, env, app_port, docker_labels, front, force: false)
         @force_mode = force
         front_env = {
           'AWS_DEFAULT_REGION' => front.config.s3.region,
@@ -31,7 +31,7 @@ module Hako
           'S3_CONFIG_KEY' => front.config.s3.key(@app_id),
         }
         front_port = determine_front_port
-        task_definition = register_task_definition(image_tag, env, front.config, front_env, front_port)
+        task_definition = register_task_definition(image_tag, env, docker_labels, front.config, front_env, front_port)
         if task_definition == :noop
           Hako.logger.info "Task definition isn't changed"
           task_definition = @ecs.describe_task_definition(task_definition: @app_id).task_definition
@@ -195,9 +195,9 @@ module Hako
         EcsDefinitionComparator.new(expected_container).different?(actual_container)
       end
 
-      def register_task_definition(image_tag, env, front_config, front_env, front_port)
+      def register_task_definition(image_tag, env, docker_labels, front_config, front_env, front_port)
         front = front_container(front_config, front_env, front_port)
-        app = app_container(image_tag, env)
+        app = app_container(image_tag, env, docker_labels)
         if task_definition_changed?(front, app)
           @ecs.register_task_definition(
             family: @app_id,
@@ -239,7 +239,7 @@ module Hako
         }
       end
 
-      def app_container(image_tag, env)
+      def app_container(image_tag, env, docker_labels)
         environment = env.map { |k, v| { name: k, value: v } }
         {
           name: 'app',
@@ -250,6 +250,7 @@ module Hako
           port_mappings: [],
           essential: true,
           environment: environment,
+          docker_labels: docker_labels,
         }
       end
 

data/lib/hako/version.rb

@@ -1,3 +1,3 @@
 module Hako
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Deploy Docker container