cfa_grub2 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 980d22ff2abc8443572231e3bcdcb02e28524d54
-  data.tar.gz: 99e71eff9882a44b33a1d8f5cdcf373983f56121
+  metadata.gz: ccccf211949a0bf114cf88bd50b2b83982cd90bf
+  data.tar.gz: 00dd35c6483ed401514bd4add453b4871aa1af79
 SHA512:
-  metadata.gz: 5e38508a7e950671d4f46e717d32a671781c3d19e6c16efac5581cb2b8a2f21590544d4da9a0abd496da0d79d3f49688f7109da073a7399938b336a617af3ffe
-  data.tar.gz: a2bc7ef39d834afd44190023a822fc8d4e92a55b1bc15487add26623d4fac4741df6e8f5485905bd0d13a614054483d2197dbec5e526f1c1575aa8e798622843
+  metadata.gz: 22589c1d3c5eea5f6d21df02d80defce53ae4c8565ac6dbc8024eed4b67adc47f2c3369dc9f3b01539e2f939ff8709b546b09e6c89c6a6718092cd21ea851ed5
+  data.tar.gz: 6630dfc137338357da5b8c6238fba6eeee116b804182d3a7fc1771ef668d4aaa60c2fc6de88c1aaa2c32bf229d0ca1284c95a2da1bd766ec660061fa9c5bbdc9

data/lib/cfa/grub2/device_map.rb

@@ -24,7 +24,7 @@ module CFA
       end
 
       def save(changes_only: false)
-        raise "Too much grub devices. Limit is 8." if grub_devices.size > 8
+        raise "Too many grub devices. Limit is 8." if grub_devices.size > 8
 
         super
       end

data/lib/cfa/grub2/grub_cfg.rb

@@ -12,8 +12,14 @@ module CFA
       # @private only internal parser
       class Parser
         def self.parse(string)
-          menu_lines = string.lines.grep(/menuentry\s*'/)
-          menu_lines.map { |line| line[/\s*menuentry\s*'([^']+)'.*/, 1] }
+          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 /submenu\s/ then submenu = line[/\s*submenu\s+'([^']+)'.*/, 1]
+            end
+          end
         end
 
         def self.serialize(_string)
@@ -24,6 +30,15 @@ module CFA
         def self.empty
           []
         end
+
+        def self.parse_entry(line, submenu)
+          entry = line[/\s*menuentry\s+'([^']+)'.*/, 1]
+          {
+            title: entry,
+            path:  submenu.empty? ? entry : "#{submenu}>#{entry}"
+          }
+        end
+        private_class_method :parse_entry
       end
 
       def initialize(file_handler: nil)
@@ -31,7 +46,15 @@ module CFA
       end
 
       # @return [Array<String>] sections from grub.cfg in order as they appear
+      # @deprecated use instead boot_entries
       def sections
+        data.map { |p| p[:title] }
+      end
+
+      # @return [Array<Hash>] return boot entries containing `title:` as shown
+      # on screen and `path:` whole path usable for grub2-set-default including
+      # also submenu part of path
+      def boot_entries
         data
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfa_grub2
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfa
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Models for GRUB2 configuration files.