flight-router 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc4a4a9e436ddae085ce9b7181274c3c7a584a5e
-  data.tar.gz: dc51759267978ce980b03c4256721409eb81268e
+  metadata.gz: 325e52b29287f4ee46f0f8649e792510fb05bde4
+  data.tar.gz: cb8d86c71d5dec4603785b2bdc0b49f623c065ec
 SHA512:
-  metadata.gz: a445ffdde6e6fac670e05171ab1984bc1e7cd95cc28cf023687c3345d3c8a88b7a77d8223d894079755cc46efbbc4be32ddb2363d0c7c073f753856ccc8f0b0a
-  data.tar.gz: 6638f0b3295529c77b05637f667fff3b154ccda79ddb64db7bd2f3bb6ec73aaffda7b00f31a2fa5524d98d8657b023843a5cf6f379ccdc4b100a8b0fcf95f486
+  metadata.gz: 42f2661f2e769ede07fb04085563846b29c21e74ab3a0144f2379dfcf63edb192eb3b2c84b370b13aa766b7f12768e6c4507a0bad34b4b3a8306cecef2d80c16
+  data.tar.gz: 2d353119113aba5eacc9bc7aca9867fd4cf704ba8746cab1363233d13b906a6baf4445cbd9d908c3e90b0882bfeb875c965a80e6afedca74bafe6f8b5599c4ba

data/CHANGELOG/0.1.12.md

@@ -0,0 +1,5 @@
+# Changelog : 0.1.12
+
+## commits
+
+* fix command args

data/lib/flight/router/container.rb

@@ -18,43 +18,14 @@ module Flight::Router
       end
 
       image :auth do
-        command "format-for-auth" do |kind:|
-          [kind]
-        end
         command "password-hash" do |kind:|
-          [kind, kind]
+          {kind: kind, salt: kind}
         end
         command "sign" do |auth:|
-          [map[:auth][auth][:key]]
+          {key: map[:auth][auth][:key]}
         end
         command "renew" do |auth:,verify:|
-          [map[:auth][auth][:key], "--verify", map[:auth][verify][:verify]]
-        end
-      end
-
-      image :datastore do
-        command "find" do |kind:,scope:|
-          scope = Base64.strict_encode64(JSON.generate(scope))
-          [kind, scope]
-        end
-        command "modify" do |scope:|
-          scope = Base64.strict_encode64(JSON.generate(scope))
-          [scope]
-        end
-        command "format-for-upload" do |kind:,path:|
-          [kind, path]
-        end
-      end
-
-      image :reset_password do
-        command "send-email" do
-          []
-        end
-      end
-
-      image :aws_s3 do
-        command "copy" do |bucket:|
-          [bucket]
+          {key: map[:auth][auth][:key], verify: map[:auth][verify][:verify]}
         end
       end
     end
@@ -118,15 +89,16 @@ module Flight::Router
           unless info = map[:image][image]
             raise "image not defined: [#{image}]"
           end
-          if opts[:env] || info[:env]
-            puts_env(path, "#{i}.env", (info[:env] || {}).merge(opts[:env] || {}))
+          env = opts.delete(:env)
+          if env || info[:env]
+            puts_env(path, "#{i}.env", (info[:env] || {}).merge(env || {}))
           end
-          if block = @builder[image][key]
+          if block = @builder[image] && @builder[image][key]
             command_args = instance_exec(**opts,&block)
           else
-            raise "unknown image/key pair: #{image}/#{key}"
+            command_args = opts
           end
-          "#{info[:name]} flight_#{image} #{key} #{command_args.join(" ")}"
+          {image: info[:name], command: ["flight_#{image}",key,JSON.generate(command_args)]}
         }
       end
 

data/lib/flight/router/version.rb

@@ -1,5 +1,5 @@
 module Flight
   module Router
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight-router
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - shun@getto.systems
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,7 @@ files:
 - CHANGELOG/0.1.1.md
 - CHANGELOG/0.1.10.md
 - CHANGELOG/0.1.11.md
+- CHANGELOG/0.1.12.md
 - CHANGELOG/0.1.2.md
 - CHANGELOG/0.1.3.md
 - CHANGELOG/0.1.4.md