hako 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2f20543086d4292c74952e667ec1fa478ff5523
-  data.tar.gz: 44621548e4f4fb71afccfc1dce353c12c4d1b698
+  metadata.gz: 790a66a0b27267656b3f0b5b39a81fa2b54ee772
+  data.tar.gz: 08bdb98df7dda625874ecb89a0d2b1d2dec14da6
 SHA512:
-  metadata.gz: ea22eaa39ae95445b241f8952c5642b2bcdc5782376e620be9f858a747a9af9f264927dbf794aaee862b5aa108b12c49c9fc134d7a89411f673b9ba6c54ba9af
-  data.tar.gz: 59ce8bf11524a1e186735c02b9a110d447e065aee375bf4df31b49a286e1ca322ceb0caf0ab5c48ce6a70bc745ab3189e4c1bf78d7586dd7d27a163ab844cd85
+  metadata.gz: cf57c0ce8f75f05fc37709da163324b520dc36912aeb9e6065a218f64311309255512455eae6ac0891c1fe1d428e00c251a14468ea2f0498d303a35abfff3549
+  data.tar.gz: e2bf166333f4cda8fe99f5ea22d51a88131991278b6191e4b5ed3e14217559dd5e15b424783212fb91ce3342e7f726a7726ddccaad66d7fa4c6a0ba2a186ce64

data/lib/hako/commander.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-require 'hako/app_container'
-require 'hako/container'
+require 'hako/definition_loader'
 require 'hako/env_expander'
 require 'hako/error'
-require 'hako/fronts'
 require 'hako/loader'
 require 'hako/schedulers'
 require 'hako/scripts'
@@ -76,35 +74,13 @@ module Hako
     end
 
     def load_containers(tag, dry_run:, with: nil)
-      app = AppContainer.new(@app, @app.yaml['app'].merge('tag' => tag), dry_run: dry_run)
-      front =
-        if @app.yaml.key?('front')
-          load_front(@app.yaml['front'], dry_run: dry_run)
-        end
-
-      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
-      if with
-        keys = ['app'] + with
-        containers.keys.each do |key|
-          unless keys.include?(key)
-            containers.delete(key)
-          end
-        end
-      end
-      containers
+      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)
     end
 
-    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, dry_run:)
       Loader.new(Hako::Scripts, 'hako/scripts').load(yaml.fetch('type')).new(@app, yaml, dry_run: dry_run)
     end

data/lib/hako/container.rb

@@ -3,6 +3,8 @@ require 'hako/version'
 
 module Hako
   class Container
+    attr_reader :definition
+
     def initialize(app, definition, dry_run:)
       @app = app
       @definition = default_config.merge(definition)

data/lib/hako/definition_loader.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+require 'set'
+require 'hako/app_container'
+require 'hako/container'
+require 'hako/fronts'
+require 'hako/loader'
+
+module Hako
+  class DefinitionLoader
+    def initialize(app, dry_run:)
+      @app = app
+      @dry_run = dry_run
+    end
+
+    def load(tag, with: nil)
+      additional_containers = @app.yaml.fetch('additional_containers', {})
+      container_names = ['app']
+      if with
+        container_names.concat(with)
+      else
+        if @app.yaml.key?('front')
+          container_names << 'front'
+        end
+        container_names.concat(additional_containers.keys)
+      end
+
+      load_containers_from_name(tag, container_names, additional_containers)
+    end
+
+    private
+
+    def load_containers_from_name(tag, container_names, additional_containers)
+      names = Set.new(container_names)
+      containers = {}
+      while containers.size < names.size
+        names.difference(containers.keys).each do |name|
+          containers[name] =
+            case name
+            when 'app'
+              AppContainer.new(@app, @app.yaml['app'].merge('tag' => tag), dry_run: @dry_run)
+            when 'front'
+              load_front(@app.yaml['front'], dry_run: @dry_run)
+            else
+              Container.new(@app, additional_containers.fetch(name), dry_run: @dry_run)
+            end
+
+          containers[name].links.each do |link|
+            m = link.match(/\A([^:]+):([^:]+)\z/)
+            names << (m ? m[1] : link)
+          end
+        end
+      end
+      containers
+    end
+
+    def load_front(yaml, dry_run:)
+      Loader.new(Hako::Fronts, 'hako/fronts').load(yaml.fetch('type')).new(@app, yaml, dry_run: dry_run)
+    end
+  end
+end

data/lib/hako/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -110,6 +110,7 @@ files:
 - lib/hako/cli.rb
 - lib/hako/commander.rb
 - lib/hako/container.rb
+- lib/hako/definition_loader.rb
 - lib/hako/env_expander.rb
 - lib/hako/env_provider.rb
 - lib/hako/env_providers.rb