hako 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db06d64418cd4a7dcd0217e8c6ada22c9fd100fb
-  data.tar.gz: 5f962c2f0b257e6486d69c5bde8f4d16a38663ed
+  metadata.gz: bb5ba73f8d811faf60da24c071c8287b1c3dc439
+  data.tar.gz: 1a8548db2c69d4e9fc75b0b60a2119bff2f5c505
 SHA512:
-  metadata.gz: 55589bac643779f00ed7eaf18c40106e262610685ba747affd57f21001a38ebf0c31f6f0cbdd14f87bea34ca3a5adb6969e116fc149a12737ffe193d80812dde
-  data.tar.gz: 5d6f39b9a9d2dc9452ebb412981fe0f255b9485faa82819a24a8f2e29554908333693491d84108e1e47fd0ed8016bcc92d84bfb5202d768e25df28cac9225a2e
+  metadata.gz: d0f4de4bb3bd8838879bd3ea09054b641658685b8bf3538329e89374c0d4ad8e749c24dd1c89fcad92148580c84bb870f95964f1271fc69fdbdb9c18f2d8ea90
+  data.tar.gz: b4cb1198bfd64381b703949cd7c24ddc34f6beb4ce13a34b39f977ee921093bc0d79defa381e092cc2c326ac526bc42940bb8bf0d06f5a1ef49cb32cc07d53a5

data/.rubocop_todo.yml

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

data/lib/hako/commander.rb

@@ -1,9 +1,10 @@
-require 'hako/after_scripts'
+require 'hako/container'
 require 'hako/env_expander'
 require 'hako/error'
 require 'hako/front_config'
 require 'hako/fronts'
 require 'hako/schedulers'
+require 'hako/scripts'
 
 module Hako
   class Commander
@@ -11,7 +12,6 @@ module Hako
 
     def initialize(app)
       @app = app
-      $LOAD_PATH << @app.root_path.join('lib')
     end
 
     def deploy(force: false, tag: 'latest')
@@ -19,14 +19,16 @@ 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, docker_labels, front, force: force)
+      app = Container.new(
+        'image_tag' => "#{image}:#{tag}",
+        'docker_labels' => @app.yaml.fetch('docker_labels', {}),
+      )
+      scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config) }
 
-      after_scripts.each(&:after_deploy)
+      scripts.each { |script| script.before_deploy(app) }
+      scheduler.deploy(app, env, app_port, front, force: force)
+      scripts.each { |script| script.after_deploy(app) }
     end
 
     def oneshot(commands, tag: 'latest')
@@ -34,7 +36,7 @@ module Hako
       scheduler = load_scheduler(@app.yaml['scheduler'])
       image = @app.yaml.fetch('image') { raise Error.new('image must be set') }
       image_tag = "#{image}:#{tag}"
-      exit scheduler.oneshot(image_tag, env, commands)
+      exit scheduler.oneshot(Container.new('image_tag' => image_tag), env, commands)
     end
 
     def status
@@ -42,9 +44,9 @@ module Hako
     end
 
     def remove
-      after_scripts = @app.yaml.fetch('after_scripts', []).map { |config| load_after_script(config) }
+      scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config) }
       load_scheduler(@app.yaml['scheduler']).remove
-      after_scripts.each(&:after_remove)
+      scripts.each(&:after_remove)
     end
 
     private
@@ -81,10 +83,10 @@ module Hako
       Hako::Fronts.const_get(camelize(front_config.type)).new(front_config)
     end
 
-    def load_after_script(config)
+    def load_script(config)
       type = config.fetch('type')
-      require "hako/after_scripts/#{type}"
-      Hako::AfterScripts.const_get(camelize(type)).new(@app, config)
+      require "hako/scripts/#{type}"
+      Hako::Scripts.const_get(camelize(type)).new(@app, config)
     end
 
     def camelize(name)

data/lib/hako/container.rb

@@ -0,0 +1,20 @@
+module Hako
+  class Container
+    def initialize(definition)
+      @definition = definition
+    end
+
+    %w[
+      image_tag
+      docker_labels
+    ].each do |name|
+      define_method(name) do
+        @definition[name]
+      end
+
+      define_method("#{name}=") do |val|
+        @definition[name] = val
+      end
+    end
+  end
+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, _docker_labels, _front_config, _options)
+    def deploy(_app, _env, _app_port, _front_config, _options)
       raise NotImplementedError
     end
 

data/lib/hako/schedulers/echo.rb

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

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, docker_labels, front, force: false)
+      def deploy(app, env, app_port, 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, docker_labels, front.config, front_env, front_port)
+        task_definition = register_task_definition(app, env, 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
@@ -50,8 +50,8 @@ module Hako
         Hako.logger.info 'Deployment completed'
       end
 
-      def oneshot(image_tag, env, commands)
-        task_definition = register_task_definition_for_oneshot(image_tag)
+      def oneshot(app, env, 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, env, commands)
         Hako.logger.info "Started task: #{task.task_arn}"
@@ -195,26 +195,26 @@ module Hako
         EcsDefinitionComparator.new(expected_container).different?(actual_container)
       end
 
-      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, docker_labels)
-        if task_definition_changed?(front, app)
+      def register_task_definition(app, env, front_config, front_env, front_port)
+        front_def = front_container(front_config, front_env, front_port)
+        app_def = app_container(app, env)
+        if task_definition_changed?(front_def, app_def)
           @ecs.register_task_definition(
             family: @app_id,
-            container_definitions: [front, app],
+            container_definitions: [front_def, app_def],
           ).task_definition
         else
           :noop
         end
       end
 
-      def register_task_definition_for_oneshot(image_tag)
+      def register_task_definition_for_oneshot(app)
         @ecs.register_task_definition(
           family: "#{@app_id}-oneshot",
           container_definitions: [
             {
               name: 'oneshot',
-              image: image_tag,
+              image: app.image_tag,
               cpu: @cpu,
               memory: @memory,
               links: [],
@@ -239,18 +239,18 @@ module Hako
         }
       end
 
-      def app_container(image_tag, env, docker_labels)
+      def app_container(app, env)
         environment = env.map { |k, v| { name: k, value: v } }
         {
           name: 'app',
-          image: image_tag,
+          image: app.image_tag,
           cpu: @cpu,
           memory: @memory,
           links: [],
           port_mappings: [],
           essential: true,
           environment: environment,
-          docker_labels: docker_labels,
+          docker_labels: app.docker_labels,
         }
       end
 

data/lib/hako/{after_scripts.rb → scripts.rb}

@@ -1,4 +1,4 @@
 module Hako
-  module AfterScripts
+  module Scripts
   end
 end

data/lib/hako/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -118,10 +118,10 @@ files:
 - exe/hako
 - hako.gemspec
 - lib/hako.rb
-- lib/hako/after_scripts.rb
 - lib/hako/application.rb
 - lib/hako/cli.rb
 - lib/hako/commander.rb
+- lib/hako/container.rb
 - lib/hako/env_expander.rb
 - lib/hako/env_provider.rb
 - lib/hako/env_providers.rb
@@ -137,6 +137,7 @@ files:
 - lib/hako/schedulers/ecs.rb
 - lib/hako/schedulers/ecs_definition_comparator.rb
 - lib/hako/schedulers/ecs_elb.rb
+- lib/hako/scripts.rb
 - lib/hako/templates/nginx.conf.erb
 - lib/hako/templates/nginx.location.conf.erb
 - lib/hako/version.rb