hako 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 790a66a0b27267656b3f0b5b39a81fa2b54ee772
-  data.tar.gz: 08bdb98df7dda625874ecb89a0d2b1d2dec14da6
+  metadata.gz: d38174e02789d9c6483172755239f8533b8be58a
+  data.tar.gz: 412c52142395ca4e316bea3149d8e643de6f9802
 SHA512:
-  metadata.gz: cf57c0ce8f75f05fc37709da163324b520dc36912aeb9e6065a218f64311309255512455eae6ac0891c1fe1d428e00c251a14468ea2f0498d303a35abfff3549
-  data.tar.gz: e2bf166333f4cda8fe99f5ea22d51a88131991278b6191e4b5ed3e14217559dd5e15b424783212fb91ce3342e7f726a7726ddccaad66d7fa4c6a0ba2a186ce64
+  metadata.gz: 14a30482ccd6a222fb278191ef74269491f7846d0151e82e9083451e8a87c8a73c5791f35472cebc2787ce66279aa018fcbab6667c0f4a8a4f89e7a82d2e6504
+  data.tar.gz: 3cac7854f49ef7989b284f14c5c1cdc96e1181cd2e003419f2557886ec96021b0e002d404b78d38d2511c00a8c52592cc30b5009c8db5d4aec2c730101d90453

data/.rubocop_todo.yml

@@ -13,6 +13,9 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/ParameterLists:
+  Enabled: false
+
 Metrics/PerceivedComplexity:
   Enabled: false
 

data/README.md

@@ -5,7 +5,7 @@
 Deploy Docker container.
 
 ## Status
-Under development
+Under development. Any incompatible change will happen without notice.
 
 ## Installation
 

data/lib/hako/commander.rb

@@ -15,7 +15,8 @@ module Hako
     def deploy(force: false, tag: 'latest', dry_run: false)
       containers = load_containers(tag, dry_run: dry_run)
       scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
-      scheduler = load_scheduler(@app.yaml['scheduler'], scripts, force: force, dry_run: dry_run)
+      volumes = @app.yaml.fetch('volumes', [])
+      scheduler = load_scheduler(@app.yaml['scheduler'], scripts, volumes: volumes, force: force, dry_run: dry_run)
 
       scripts.each { |script| script.before_deploy(containers) }
       scheduler.deploy(containers)
@@ -25,7 +26,8 @@ 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, dry_run: dry_run)
+      volumes = @app.yaml.fetch('volumes', [])
+      scheduler = load_scheduler(@app.yaml['scheduler'], scripts, volumes: volumes, dry_run: dry_run)
 
       exit_code = with_oneshot_signal_handlers(scheduler) do
         scheduler.oneshot(containers, commands, env)
@@ -77,8 +79,8 @@ module Hako
       DefinitionLoader.new(@app, dry_run: dry_run).load(tag, with: with)
     end
 
-    def load_scheduler(yaml, scripts, force: false, dry_run: false)
-      Loader.new(Hako::Schedulers, 'hako/schedulers').load(yaml.fetch('type')).new(@app.id, yaml, scripts: scripts, force: force, dry_run: dry_run)
+    def load_scheduler(yaml, scripts, volumes: [], force: false, dry_run: false)
+      Loader.new(Hako::Schedulers, 'hako/schedulers').load(yaml.fetch('type')).new(@app.id, yaml, volumes: volumes, scripts: scripts, force: force, dry_run: dry_run)
     end
 
     def load_script(yaml, dry_run:)

data/lib/hako/container.rb

@@ -18,6 +18,7 @@ module Hako
       cpu
       memory
       links
+      mount_points
     ].each do |name|
       define_method(name) do
         @definition[name]
@@ -57,6 +58,7 @@ module Hako
       {
         'docker_labels' => {},
         'links' => [],
+        'mount_points' => [],
       }
     end
 

data/lib/hako/scheduler.rb

@@ -6,8 +6,9 @@ module Hako
     class ValidationError < Error
     end
 
-    def initialize(app_id, options, scripts:, dry_run:, force:)
+    def initialize(app_id, options, volumes:, scripts:, dry_run:, force:)
       @app_id = app_id
+      @volumes = volumes
       @scripts = scripts
       @dry_run = dry_run
       @force = force

data/lib/hako/schedulers/ecs.rb

@@ -226,6 +226,10 @@ module Hako
         task_definition.container_definitions.each do |c|
           container_definitions[c.name] = c
         end
+
+        if different_volumes?(task_definition.volumes)
+          return true
+        end
         if definitions.any? { |definition| different_definition?(definition, container_definitions.delete(definition[:name])) }
           return true
         end
@@ -235,6 +239,23 @@ module Hako
         true
       end
 
+      def different_volumes?(actual_volumes)
+        if @volumes.size != actual_volumes.size
+          return true
+        end
+        actual_volumes.each do |actual_volume|
+          expected_volume = @volumes[actual_volume.name]
+          if expected_volume.nil?
+            return true
+          end
+          if expected_volume['source_path'] != actual_volume.host.source_path
+            return true
+          end
+        end
+
+        false
+      end
+
       def different_definition?(expected_container, actual_container)
         EcsDefinitionComparator.new(expected_container).different?(actual_container)
       end
@@ -244,6 +265,7 @@ module Hako
           @ecs.register_task_definition(
             family: @app_id,
             container_definitions: definitions,
+            volumes: volumes_definition,
           ).task_definition
         else
           :noop
@@ -267,12 +289,22 @@ module Hako
           @ecs.register_task_definition(
             family: "#{@app_id}-oneshot",
             container_definitions: definitions,
+            volumes: volumes_definition,
           ).task_definition
         else
           :noop
         end
       end
 
+      def volumes_definition
+        @volumes.map do |name, volume|
+          {
+            name: name,
+            host: { source_path: volume['source_path'] },
+          }
+        end
+      end
+
       def front_container(front, front_port)
         environment = front.env.map { |k, v| { name: k, value: v } }
         {
@@ -285,6 +317,7 @@ module Hako
           essential: true,
           environment: environment,
           docker_labels: front.docker_labels,
+          mount_points: front.mount_points,
         }
       end
 
@@ -300,6 +333,7 @@ module Hako
           essential: true,
           environment: environment,
           docker_labels: app.docker_labels,
+          mount_points: app.mount_points,
         }
       end
 

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -6,7 +6,7 @@ module Hako
         @expected_container = expected_container
       end
 
-      CONTAINER_KEYS = %i[image cpu memory links docker_labels].freeze
+      CONTAINER_KEYS = %i[image cpu memory links docker_labels mount_points].freeze
       PORT_MAPPING_KEYS = %i[container_port host_port protocol].freeze
       ENVIRONMENT_KEYS = %i[name value].freeze
 

data/lib/hako/version.rb

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

metadata

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