zygote 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebe118f907539d05c38e4364bd52a89e6d0191a
-  data.tar.gz: 52be5146b4bf92e912ee2ff8fb0c43a3a3fbe0e7
+  metadata.gz: 17f4ff9e36a97406df1f302a2d1f9dfe032b7f4c
+  data.tar.gz: d8d6687b0044e9c7959215730778997bb7622c8a
 SHA512:
-  metadata.gz: 8fca27b1b6f6fb84e97fd01f058bf651bbaa08915e895d085561a1379eefdfb79079fd8e1cb722c9b3a17763302df584e1914e08af6f5a8efd9eb81896a641c5
-  data.tar.gz: ef8dbc472d282de13ae75c6566a033cbd68e31858c1c67bb619ea4c228f9c5a69145d487e5ceb85d4a4a3757f2f176eebcc78548463d271a73ef9f0de378c7be
+  metadata.gz: 89ba2dacebfc644368c4d50b8f7258ca9a66ef5eb287ad90f735fe9ae560b40191a1d56b55612d7b90b1fcb90af53c6756308f74593a93fa91e066e3c61d6225
+  data.tar.gz: e35fa72f680a85e18ebffb1fa4043aa54dc665a4b4a8562ce238cef93c608c69ae114c1357936b8a24fe215ea1d74cf08ca666218f71af819cd48b528603fb70

data/lib/zygote/http.rb

@@ -98,6 +98,15 @@ class ZygoteWeb < Genesis::Http::Handler
    end
 
   def self::cell_config=(value)
+    # Merge common args into submenus
+    value['index']['cells'].each do |_cell, data|
+      if data['args'] && data['menu']['submenu']
+        common_args = data['args']
+        data['menu']['submenu'].each do |_, subdata|
+          subdata['args'] = common_args.deep_merge(subdata['args'] || {})
+        end
+      end
+    end
     @@cell_config = value
   end
 end

data/lib/zygote/test.rb

@@ -7,7 +7,6 @@ require 'em-synchrony'
 require 'em-synchrony/em-http'
 
 module Zygote
-
   module TestConfig
     extend self
     attr_reader :config_path, :cells, :port, :fixtures

data/lib/zygote/version.rb

@@ -1,4 +1,4 @@
 # Namespace for our gem
 module Zygote
-  VERSION = '0.0.2'
+  VERSION = '0.0.5'
 end

data/views/menu.erb

@@ -44,9 +44,12 @@ choose --timeout ${menu-timeout} --default ${menu-default} selected || goto canc
 set menu-timeout 0
 goto ${selected}
 
-# Generated menu entries for each cell
-<% cells.each do | cell, _ |  %>
-<%= partial("#{cell}/menu".to_sym, :opts => opts) %>
+# Generated chain entries for each top-level menu
+<% cells.each do | cell, data |  %>
+  <% unless data['menu']['submenu'] %>
+:<%= cell %>
+chain --replace --autofree  http://${dhcp-server}/cell/<%= cell %>/<%= data['menu']['action'] || 'boot' %><%= params.to_query.empty? ? "" : "?#{params.to_query}" %>
+  <% end %>
 <% end %>
 
 # Render any submenus
@@ -69,13 +72,12 @@ choose --timeout ${submenu-timeout} --default ${submenu-default} selected || got
 set submenu-timeout 0
 goto ${selected}
 
-# Now generate the boot entries for each submenu label
+# Generate chains for each submenu entry
   <% data['menu']['submenu'].each do |entry, data| %>
     <% local_params = (data['params'] || {}).merge(params) %>
     <% parmstr = {entry: entry}.merge(local_params).map{ |k,v| "#{k}=#{v}"}.join('&').gsub('?','').gsub(' ','') %>
 :<%= cell %>-<%= entry %>
-# FIXME: allow overriding the boot action here, but leave it as default
-chain --replace --autofree  http://${dhcp-server}/cell/<%= cell %>/boot<%= parmstr.empty? ? "" : "?#{parmstr}" %>
+chain --replace --autofree  http://${dhcp-server}/cell/<%= cell %>/<%= data['action'] || 'boot' %><%= parmstr.empty? ? "" : "?#{parmstr}" %>
   <% end %>
 <% end %>
 
@@ -115,4 +117,3 @@ goto start
 set submenu-timeout 0
 clear submenu-default
 goto start
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zygote
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Dale Hamel
@@ -151,7 +151,7 @@ files:
 - lib/zygote/version.rb
 - views/boot.erb
 - views/menu.erb
-homepage: http://rubygems.org/gems/zygote
+homepage: https://github.com/dalehamel/zygote-gem
 licenses:
 - MIT
 metadata: {}