zygote 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8fc6a0060bf25373dbb4474d2153fa33d3607c1
-  data.tar.gz: 038eb2df69c93c43bb74be0aaa7f1b91f349d825
+  metadata.gz: 904d623bda334f025745e1596c6669fd01d32edd
+  data.tar.gz: 7ec24e21f6e3d7ca851010b0be999540d5c655b9
 SHA512:
-  metadata.gz: 8749da303b7c726c441e8b84141e986b8e741303d72823fff62f8ad13bca6b54658899b8c7031958a2bca7e96c9e9cff3530c8b2ca38cd1e7849fde3acb06ba2
-  data.tar.gz: c04444a77335f7ed272728fcf7949ce8db3deff24e8e583ee300b667865bd00acd4d4b28566e67d9fd784616a3251d9924835c632c1a088f4f25de7057fa15a4
+  metadata.gz: 892e6aab33ea5ab41e2d555bcbddb60d4c880406b85bf2acd9b7151a9b83c50fc1d46cea1ad0efdafa338864ad467a9535e7a5d32200962214680a7d43a90d32
+  data.tar.gz: 6d7bbf2e03252486e8b34175d0e6bd74d21247620ea64ff13febbf9576c0c94ec4fc1e8d95fda5324f18f7c089ceb4bb56abf17605fed3d5de4396258511ef44

data/lib/zygote/http.rb

@@ -57,9 +57,10 @@ module Zygote
         # Clean params into a simple hash
         cleaned = clean_params(params.to_h)
         # Add the cell to the parameters
+        delegated = cleaned['delegated']
         cell = cleaned['cell']
         # Merge the cleaned params in with any cell options
-        cell_opts = Zygote::Web.cell_config['index']['cells'][cell] || {}
+        cell_opts = Zygote::Web.cell_config['index']['cells'][delegated || cell] || {}
         opts = cell_opts.merge('params' => cleaned || {})
         body { erb :"#{cell}/#{cleaned['action']}".to_sym, locals: { opts: opts } }
       end

data/lib/zygote/util.rb

@@ -47,5 +47,11 @@ def discover_domain
 end
 
 def kernel_params(hash)
-  hash.map { |k, v| v == true ? k : "#{k}=#{v}" }.join(' ')
+  hash.map do |k, v|
+    if v.is_a? Array
+      v.map { |x| "#{k}=#{x}" }
+    else
+      "#{k}=#{v}"
+    end
+  end.join(' ')
 end

data/lib/zygote/version.rb

@@ -1,4 +1,4 @@
 # Namespace for our gem
 module Zygote
-  VERSION = '0.2.13'.freeze
+  VERSION = '0.2.14'.freeze
 end

data/views/menu.erb

@@ -73,11 +73,12 @@ set submenu-timeout 0
 goto ${selected}
 
 # Generate chains for each submenu entry
-  <% data['menu']['submenu'].each do |entry, data| %>
-    <% local_params = (data['params'] || {}).merge(params) %>
+  <% data['menu']['submenu'].each do |entry, subdata| %>
+    <% local_params = (subdata['params'] || {}).merge(params) %>
+    <% local_params.merge!({ delegated: cell}) if data['delegate'] %>
     <% parmstr = {entry: entry}.merge(local_params).to_query %>
 :<%= cell %>-<%= entry %>
-chain --replace --autofree  http://${dhcp-server}/cell/<%= cell %>/<%= data['action'] || 'boot' %><%= parmstr.empty? ? "" : "?#{parmstr}" %>
+chain --replace --autofree  http://${dhcp-server}/cell/<%= data['delegate'] || cell %>/<%= subdata['action'] || 'boot' %><%= parmstr.empty? ? "" : "?#{parmstr}" %>
   <% end %>
 <% end %>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zygote
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Dale Hamel
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Differentiate servers with iPXE