cfa_grub2 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93cc348d9e1a1dd06316140467707b47da506f72
-  data.tar.gz: 73f5149f68c8d695c80eb1f6c1a716f217c06095
+  metadata.gz: a60eb146945a4ae05b7e509bad70449658672833
+  data.tar.gz: 7e6156243b4226fa7d03854e438dabe9e8ed50f4
 SHA512:
-  metadata.gz: c31fba86ee7ee5bd067b7de229e4e9c08f289ec8ded40565832d851605c1bcbbe67dd56a913bf0967d9a0267e26aa4c66247107b6cbc6ae14ee9ec7affd680a9
-  data.tar.gz: dadb5317fe00cfa0bf8b3004c42b6262286f4af74ec947d0deaf02018b1d727d61ca874c6dbaff178451d48d662fd472928b943b926881e7fb87adf661a126a1
+  metadata.gz: ee49030b6c3d2607d41a7bbed201f971485931e295acad5a15073bb26527a5c91270ebef2546e49f6a64635d3673f63e08b6596244b92c4375fcb92afac866ad
+  data.tar.gz: 0aaa5993b75ccbe6ea8fe77698abaefff2b923f2d238d399bf8508f944dbb04f0a3a7aceab6024cd6fbd32c088673fc3ce1ba19f11b09f9e9b879233ad2297ec

data/lib/cfa/grub2/grub_cfg.rb

@@ -12,13 +12,13 @@ module CFA
       # @private only internal parser
       class Parser
         def self.parse(string)
-          submenu = ""
+          submenu = []
           string.lines.each_with_object([]) do |line, result|
             case line
             when /menuentry\s+'/ then result << parse_entry(line, submenu)
-            when /^}\s*\n/ then submenu = ""
+            when /^\s*}\s*\n/ then submenu.pop
             when /submenu\s+'/
-              submenu = line[/\s*submenu\s+'([^']+)'.*/, 1]
+              submenu.push(line[/\s*submenu\s+'([^']+)'.*/, 1])
             end
           end
         end
@@ -34,9 +34,10 @@ module CFA
 
         def self.parse_entry(line, submenu)
           entry = line[/\s*menuentry\s+'([^']+)'.*/, 1]
+          submenu.push(entry)
           {
             title: entry,
-            path:  submenu.empty? ? entry : "#{submenu}>#{entry}"
+            path:  submenu.join(">")
           }
         end
         private_class_method :parse_entry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfa_grub2
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfa