hako 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa60150931b4feefab4ad228b97c82d3ba55ae15
-  data.tar.gz: 7acd8ff5d8d24a8582ec86191f96b2b1c01c3b59
+  metadata.gz: fae55ff67c1a85f1505702a1264c3e9b4db5731c
+  data.tar.gz: 7daf5a6420831633edb17698ebd3ce2973fa8ca2
 SHA512:
-  metadata.gz: 0cd2ecd94673857ac68323b2b2250f25587560d66873eea56fb926ac92496fd431fe342702f972cf44f31e7efb7119ef3f28f4328f5b06eea40766c999ae7ddc
-  data.tar.gz: 1e77d755d310a60c7fb8981de62026ff805cad5b43f44b019052f8832dc280788548a777d6a709033b5af80827e6b6626b1575205f4b5e1283cdac7360565ae7
+  metadata.gz: 6c78607e33a941e24056c06a2ca6dd155c54a66e7c90ff53fae76cb2eb4f7d4d0fe9af6c603fd5279a3c03a3cda70efd8d8d276392ccec12131d738e5a3044cd
+  data.tar.gz: b54c0b53e8ded575e36558e56205829e80441a7dea61b44f8d3db33e297d06e5bea2848f9f39d6a690622053ae487f6585592d8dfef649a7f2cdc6d05e41a5d2

data/.rubocop.yml

@@ -2,6 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   DisplayCopNames: true
+  TargetRubyVersion: 2.2  # TODO: Upgrade to 2.3
 
 Style/GuardClause:
   Enabled: false

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.1
-  - 2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - ruby-head
 before_install:
   - gem install bundler

data/examples/front.yml

@@ -0,0 +1,8 @@
+type: nginx
+image_tag: hako-nginx
+memory: 32
+cpu: 32
+s3:
+  region: ap-northeast-1
+  bucket: nanika
+  prefix: hako/front_config

data/examples/hello-lb.yml

@@ -25,14 +25,7 @@ app:
     PORT: 3000
     MESSAGE: '#{username}-san'
 front:
-  type: nginx
-  image_tag: hako-nginx
-  memory: 32
-  cpu: 32
-  s3:
-    region: ap-northeast-1
-    bucket: nanika
-    prefix: hako/front_config
+  <<: !include front.yml
   extra:
     locations:
       /:

data/examples/hello.yml

@@ -17,14 +17,7 @@ app:
     PORT: 3000
     MESSAGE: '#{username}-san'
 front:
-  type: nginx
-  image_tag: hako-nginx
-  memory: 32
-  cpu: 32
-  s3:
-    region: ap-northeast-1
-    bucket: nanika
-    prefix: hako/front_config
+  !include front.yml
 additional_containers:
   redis:
     image_tag: redis:3.0

data/lib/hako/application.rb

@@ -1,4 +1,4 @@
-require 'yaml'
+require 'hako/yaml_loader'
 
 module Hako
   class Application
@@ -8,15 +8,7 @@ module Hako
       path = Pathname.new(yaml_path)
       @id = path.basename.sub_ext('').to_s
       @root_path = path.parent
-      @yaml = YAML.load(load_default_yaml(@root_path) + path.read)
-    end
-
-    private
-
-    def load_default_yaml(root_path)
-      root_path.join('default.yml').read
-    rescue Errno::ENOENT
-      ''
+      @yaml = YamlLoader.load(path)
     end
   end
 end

data/lib/hako/cli.rb

@@ -5,10 +5,11 @@ module Hako
     desc 'deploy FILE', 'Run deployment'
     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'
     def deploy(yaml_path)
       require 'hako/application'
       require 'hako/commander'
-      Commander.new(Application.new(yaml_path)).deploy(force: options[:force], tag: options[:tag])
+      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'

data/lib/hako/commander.rb

@@ -13,18 +13,13 @@ module Hako
       @app = app
     end
 
-    def deploy(force: false, tag: 'latest')
-      app = AppContainer.new(@app, @app.yaml['app'].merge('tag' => tag))
-      front = load_front(@app.yaml['front'])
-      scheduler = load_scheduler(@app.yaml['scheduler'])
-      scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config) }
+    def deploy(force: false, tag: 'latest', dry_run: false)
+      containers = load_containers(tag, dry_run: dry_run)
+      scheduler = load_scheduler(@app.yaml['scheduler'], force: force, dry_run: dry_run)
+      scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
 
-      containers = { 'app' => app, 'front' => front }
-      @app.yaml.fetch('additional_containers', {}).each do |name, container|
-        containers[name] = Container.new(@app, container)
-      end
       scripts.each { |script| script.before_deploy(containers) }
-      scheduler.deploy(containers, force: force)
+      scheduler.deploy(containers)
       scripts.each { |script| script.after_deploy(containers) }
     end
 
@@ -39,29 +34,34 @@ module Hako
     end
 
     def remove
-      scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config) }
+      scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
       load_scheduler(@app.yaml['scheduler']).remove
       scripts.each(&:after_remove)
     end
 
     private
 
-    def load_environment(env)
-      env = env.dup
-      providers = load_providers(env.delete(PROVIDERS_KEY) || [])
-      EnvExpander.new(providers).expand(env)
+    def load_containers(tag, dry_run:)
+      app = AppContainer.new(@app, @app.yaml['app'].merge('tag' => tag), dry_run: dry_run)
+      front = load_front(@app.yaml['front'], dry_run: dry_run)
+
+      containers = { 'app' => app, 'front' => front }
+      @app.yaml.fetch('additional_containers', {}).each do |name, container|
+        containers[name] = Container.new(@app, container, dry_run: dry_run)
+      end
+      containers
     end
 
-    def load_scheduler(yaml)
-      Loader.new(Hako::Schedulers, 'hako/schedulers').load(yaml.fetch('type')).new(@app.id, yaml)
+    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)
     end
 
-    def load_front(yaml)
-      Loader.new(Hako::Fronts, 'hako/fronts').load(yaml.fetch('type')).new(@app, yaml)
+    def load_front(yaml, dry_run:)
+      Loader.new(Hako::Fronts, 'hako/fronts').load(yaml.fetch('type')).new(@app, yaml, dry_run: dry_run)
     end
 
-    def load_script(yaml)
-      Loader.new(Hako::Scripts, 'hako/scripts').load(yaml.fetch('type')).new(@app, yaml)
+    def load_script(yaml, dry_run:)
+      Loader.new(Hako::Scripts, 'hako/scripts').load(yaml.fetch('type')).new(@app, yaml, dry_run: dry_run)
     end
   end
 end

data/lib/hako/container.rb

@@ -1,8 +1,9 @@
 module Hako
   class Container
-    def initialize(app, definition)
+    def initialize(app, definition, dry_run:)
       @app = app
       @definition = default_config.merge(definition)
+      @dry_run = dry_run
     end
 
     %w[
@@ -31,8 +32,13 @@ module Hako
 
     def expand_env(env)
       env = env.dup
-      providers = load_providers(env.delete(PROVIDERS_KEY) || [])
-      EnvExpander.new(providers).expand(env)
+      provider_types = env.delete(PROVIDERS_KEY) || []
+      if @dry_run
+        env
+      else
+        providers = load_providers(provider_types)
+        EnvExpander.new(providers).expand(env)
+      end
     end
 
     def load_providers(provider_configs)

data/lib/hako/front.rb

@@ -20,8 +20,8 @@ module Hako
 
     attr_reader :s3
 
-    def initialize(app, config)
-      super(app, config)
+    def initialize(*)
+      super
       @s3 = S3Config.new(@definition.fetch('s3'))
     end
 

data/lib/hako/schedulers/ecs.rb

@@ -10,7 +10,7 @@ module Hako
       DEFAULT_CLUSTER = 'default'.freeze
       DEFAULT_FRONT_PORT = 10000
 
-      def initialize(app_id, options)
+      def initialize(app_id, options, force:, dry_run:)
         @app_id = app_id
         @cluster = options.fetch('cluster', DEFAULT_CLUSTER)
         @desired_count = options.fetch('desired_count') { validation_error!('desired_count must be set') }
@@ -19,30 +19,39 @@ module Hako
         @ecs = Aws::ECS::Client.new(region: region)
         @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
       end
 
-      def deploy(containers, force: false)
-        @force_mode = force
+      def deploy(containers)
         app = containers.fetch('app')
         front = containers.fetch('front')
         front_port = determine_front_port
-        task_definition = register_task_definition(containers, 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
-        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)}"
-        end
-        service = create_or_update_service(task_definition.task_definition_arn, front_port)
-        if service == :noop
-          Hako.logger.info "Service isn't changed"
+        definitions = create_definitions(containers, front_port)
+
+        if @dry_run
+          definitions.each do |d|
+            Hako.logger.info "Add container #{d}"
+          end
         else
-          Hako.logger.info "Updated service: #{service.service_arn}"
-          wait_for_ready(service)
+          task_definition = register_task_definition(definitions)
+          if task_definition == :noop
+            Hako.logger.info "Task definition isn't changed"
+            task_definition = @ecs.describe_task_definition(task_definition: @app_id).task_definition
+          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)}"
+          end
+          service = create_or_update_service(task_definition.task_definition_arn, front_port)
+          if service == :noop
+            Hako.logger.info "Service isn't changed"
+          else
+            Hako.logger.info "Updated service: #{service.service_arn}"
+            wait_for_ready(service)
+          end
+          Hako.logger.info 'Deployment completed'
         end
-        Hako.logger.info 'Deployment completed'
       end
 
       def oneshot(app, commands)
@@ -172,7 +181,7 @@ module Hako
       end
 
       def task_definition_changed?(definitions)
-        if @force_mode
+        if @force
           return true
         end
         task_definition = @ecs.describe_task_definition(task_definition: @app_id).task_definition
@@ -193,15 +202,7 @@ module Hako
         EcsDefinitionComparator.new(expected_container).different?(actual_container)
       end
 
-      def register_task_definition(containers, front_port)
-        definitions = containers.map do |name, container|
-          case name
-          when 'front'
-            front_container(container, front_port)
-          else
-            app_container(name, container)
-          end
-        end
+      def register_task_definition(definitions)
         if task_definition_changed?(definitions)
           @ecs.register_task_definition(
             family: @app_id,
@@ -212,6 +213,17 @@ module Hako
         end
       end
 
+      def create_definitions(containers, front_port)
+        containers.map do |name, container|
+          case name
+          when 'front'
+            front_container(container, front_port)
+          else
+            app_container(name, container)
+          end
+        end
+      end
+
       def register_task_definition_for_oneshot(app)
         @ecs.register_task_definition(
           family: "#{@app_id}-oneshot",

data/lib/hako/version.rb

@@ -1,3 +1,3 @@
 module Hako
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/hako/yaml_loader.rb

@@ -0,0 +1,41 @@
+require 'psych'
+
+module Hako
+  module YamlLoader
+    class << self
+      def load(path)
+        class_loader = Psych::ClassLoader.new
+        scanner = Psych::ScalarScanner.new(class_loader)
+        prev_path = @current_path
+        @current_path = path
+        visitor = Visitor.new(scanner, class_loader) do |_, val|
+          load(@current_path.parent.join(val))
+        end
+        path.open do |f|
+          visitor.accept(Psych.parse(f))
+        end
+      ensure
+        @current_path = prev_path
+      end
+    end
+
+    class Visitor < Psych::Visitors::ToRuby
+      INCLUDE_TAG = 'tag:include'.freeze
+      SHOVEL = '<<'.freeze
+
+      def initialize(scanner, class_loader, &block)
+        super(scanner, class_loader)
+        @domain_types[INCLUDE_TAG] = [INCLUDE_TAG, block]
+      end
+
+      def revive_hash(hash, o)
+        super(hash, o).tap do |r|
+          if r[SHOVEL].is_a?(Hash)
+            h = r.delete(SHOVEL)
+            r.merge!(h)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -112,6 +112,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/front.yml
 - examples/hello-lb.yml
 - examples/hello.env
 - examples/hello.yml
@@ -142,6 +143,7 @@ files:
 - lib/hako/templates/nginx.conf.erb
 - lib/hako/templates/nginx.location.conf.erb
 - lib/hako/version.rb
+- lib/hako/yaml_loader.rb
 homepage: https://github.com/eagletmt/hako
 licenses: []
 metadata: {}