hako 0.8.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 872f90813b982a8a19c5b4cf901aa06eb401216b
-  data.tar.gz: 02e799d33ceaa061a85578b48929b2eaa4c0922c
+  metadata.gz: 2ed263f551648e6f8339ae4493a1346edef6ac80
+  data.tar.gz: 4d10d78c93bef27b471759c828d26bb6ad5c896c
 SHA512:
-  metadata.gz: f6089d93829d5c5866857bb10104a5a145801efd7ca3672aec0e6e58704d735416404a435b780d0f5d897a0c838de545c3ea051e060584f5a4db8a28d0aeb824
-  data.tar.gz: 50227fd8d3abfff03896b85fbb96a9deb9c53246e26c05724d9e0bc01d30cb53c70b1d3667ef782751b80da7003381ce738fa3f63cc5b8dab6c45e8acf3937a6
+  metadata.gz: b71c6b89b1316596432acbad9b9114fb893210d8810b8583478db132e8e43fa77ad02b98522d4536fe9bcb76e4039d788dd1b3675ffe1f3742eb989cea648d23
+  data.tar.gz: e2de4aa6a1bfc2c7c67887ec472c108cc88a07beed8fd8e22e949024d4c910cba05c5dc8332fb2169df4f9dedd9d81646f53aed11d7665ef2b2e58cff0a96081

data/examples/hello-lb.yml

@@ -21,7 +21,7 @@ app:
   env:
     $providers:
       - type: file
-        path: examples/hello.env
+        path: hello.env
     PORT: 3000
     MESSAGE: '#{username}-san'
 front:

data/lib/hako/commander.rb

@@ -24,21 +24,23 @@ module Hako
       scripts.each { |script| script.after_deploy(containers) }
     end
 
-    def oneshot(commands, tag:, containers:, env: {})
-      containers = load_containers(tag, dry_run: false, with: containers)
-      scheduler = load_scheduler(@app.yaml['scheduler'])
+    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)
+
       with_oneshot_signal_handlers(scheduler) do
         exit scheduler.oneshot(containers, commands, env)
       end
     end
 
     def status
-      load_scheduler(@app.yaml['scheduler']).status
+      load_scheduler(@app.yaml['scheduler'], []).status
     end
 
     def remove
       scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
-      load_scheduler(@app.yaml['scheduler']).remove
+      load_scheduler(@app.yaml['scheduler'], scripts).remove
       scripts.each(&:after_remove)
     end
 
@@ -89,8 +91,8 @@ module Hako
       containers
     end
 
-    def load_scheduler(yaml, force: false, dry_run: false)
-      Loader.new(Hako::Schedulers, 'hako/schedulers').load(yaml.fetch('type')).new(@app.id, yaml, force: force, dry_run: dry_run)
+    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)
     end
 
     def load_front(yaml, dry_run:)

data/lib/hako/scheduler.rb

@@ -6,7 +6,15 @@ module Hako
     class ValidationError < Error
     end
 
-    def initialize(_app_id, _options)
+    def initialize(app_id, options, scripts:, dry_run:, force:)
+      @app_id = app_id
+      @scripts = scripts
+      @dry_run = dry_run
+      @force = force
+      configure(options)
+    end
+
+    def configure(_options)
     end
 
     def deploy(_containers, _options)

data/lib/hako/schedulers/echo.rb

@@ -4,19 +4,17 @@ require 'hako/scheduler'
 module Hako
   module Schedulers
     class Echo < Scheduler
-      def initialize(app_id, _options)
-        @app_id = app_id
-      end
-
-      def deploy(containers, env, app_port, force: false)
-        puts "Deploy #{containers.fetch('app').image_tag} with app_port=#{app_port}, force=#{force}"
+      def deploy(containers)
+        app = containers.fetch('app')
+        puts "Deploy #{app.image_tag} with app_port=#{app.port}, force=#{@force}, dry_run=#{@dry_run}"
         puts 'Environment variables:'
-        env.each do |key, val|
+        app.env.each do |key, val|
           puts "  #{key}=#{val.inspect}"
         end
       end
 
-      def oneshot(app, env, commands)
+      def oneshot(containers, commands, env)
+        app = containers.fetch('app')
         puts "Run #{app.image_tag} with oneshot commands=#{commands.inspect}"
         puts 'Environment variables:'
         env.each do |key, val|

data/lib/hako/schedulers/ecs.rb

@@ -11,17 +11,16 @@ module Hako
       DEFAULT_CLUSTER = 'default'
       DEFAULT_FRONT_PORT = 10000
 
-      def initialize(app_id, options, force:, dry_run:)
-        @app_id = app_id
+      attr_reader :task
+
+      def configure(options)
         @cluster = options.fetch('cluster', DEFAULT_CLUSTER)
         @desired_count = options.fetch('desired_count') { validation_error!('desired_count must be set') }
         region = options.fetch('region') { validation_error!('region must be set') }
         @role = options.fetch('role', nil)
         @ecs = Aws::ECS::Client.new(region: region)
-        @elb = EcsElb.new(app_id, Aws::ElasticLoadBalancing::Client.new(region: region), options.fetch('elb', nil))
+        @elb = EcsElb.new(@app_id, Aws::ElasticLoadBalancing::Client.new(region: region), options.fetch('elb', nil))
         @ec2 = Aws::EC2::Client.new(region: region)
-        @force = force
-        @dry_run = dry_run
         @started_at = nil
         @container_instance_arn = nil
       end
@@ -71,6 +70,7 @@ module Hako
         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
 

data/lib/hako/script.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+require 'hako/scripts'
+
+module Hako
+  class Script
+    def initialize(app, options, dry_run:)
+      @app = app
+      @dry_run = dry_run
+      configure(options)
+    end
+
+    def configure(_options)
+    end
+
+    def before_deploy(_containers)
+    end
+
+    def after_deploy(_containers)
+    end
+
+    def oneshot_started(_scheduler)
+    end
+  end
+end

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -125,6 +125,7 @@ files:
 - lib/hako/schedulers/ecs.rb
 - lib/hako/schedulers/ecs_definition_comparator.rb
 - lib/hako/schedulers/ecs_elb.rb
+- lib/hako/script.rb
 - lib/hako/scripts.rb
 - lib/hako/templates/nginx.conf.erb
 - lib/hako/templates/nginx.location.conf.erb