flight-router 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 399b54c8a12e99a763a8c48858535c80189369bd
-  data.tar.gz: b669e27ac40e1e587ec55c14688705f33c487fb2
+  metadata.gz: d9cf91ae07af699660ecb7ce20b12617b5eeb607
+  data.tar.gz: dce7b4e633f2f2c48f560aa9f6ff129a1272c259
 SHA512:
-  metadata.gz: 59cfbdbf9b0a02b3e12576bb450f49eba90b51ac0519611430ab6ceb889fb96aef079e9ff635c6cdffd7307f682f008d56fa30787880510b396ff3470aa3f37b
-  data.tar.gz: 187b023e5ec77a356a69def1649d6030de81e34b4bd9fe3f527675c9559a1151c69afc0584925088bfb0ca0cec8dc68e6ef742d137bac93b01c01917a64a343a
+  metadata.gz: 4f39f597c69900258589d88439c01e302f1d7b4dc8adc5ceebbeaf31907ecc71074f3ea454a84896f3d7e9b7a1de53d6e689b577ee2eef4b829715bf5191b9c2
+  data.tar.gz: 6be43f864da7534e73251cb9349571eec286f9d74564bd04e6bda0e88206b5e300e26e7c5f31bac5cc8cc732146475f5f26d7cb455b5a567438452034f32803c

data/CHANGELOG/0.1.16.md

@@ -0,0 +1,5 @@
+# Changelog : 0.1.16
+
+## commits
+
+* feature cmd

data/lib/flight/router/container.rb

@@ -49,6 +49,13 @@ module Flight::Router
     def app
       @app
     end
+    def cmd(image,command,**opts)
+      @cmd.push(
+        image: image,
+        command: command,
+        opts: opts,
+      )
+    end
 
     def config
       @config ||= {}
@@ -78,9 +85,10 @@ module Flight::Router
 
       _app = @app
       @app = @app.deep_merge(config).deep_merge(opts)
-      commands = parse_command(path, instance_exec(&block))
+      @cmd = []
+      instance_exec(&block)
 
-      @config[path.join("/")] = @app.deep_merge(commands: commands)
+      @config[path.join("/")] = @app.deep_merge(commands: parse_command(path, @cmd))
 
       @app = _app
     end
@@ -94,7 +102,11 @@ module Flight::Router
       end
 
       def parse_command(path,commands)
-        commands.each.with_index(1).map{|(image,key,opts),i|
+        commands.each.with_index(1).map{|cmd,i|
+          image = cmd[:image]
+          command = cmd[:command]
+          opts = cmd[:opts]
+
           unless info = map[:image][image]
             raise "image not defined: [#{image}]"
           end
@@ -102,12 +114,13 @@ module Flight::Router
           if env || info[:env]
             puts_env(path, "#{i}.env", (info[:env] || {}).merge(env || {}))
           end
-          if block = @builder[image] && @builder[image][key]
+          if block = @builder[image] && @builder[image][command]
             command_args = instance_exec(**opts,&block)
           else
             command_args = opts
           end
-          {image: info[:name], command: ["flight_#{image}",key,JSON.generate(command_args)]}
+
+          {image: info[:name], command: ["flight_#{image}",command,JSON.generate(command_args)]}
         }
       end
 

data/lib/flight/router/version.rb

@@ -1,5 +1,5 @@
 module Flight
   module Router
-    VERSION = "0.1.15"
+    VERSION = "0.1.16"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight-router
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - shun@getto.systems
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - CHANGELOG/0.1.13.md
 - CHANGELOG/0.1.14.md
 - CHANGELOG/0.1.15.md
+- CHANGELOG/0.1.16.md
 - CHANGELOG/0.1.2.md
 - CHANGELOG/0.1.3.md
 - CHANGELOG/0.1.4.md