Merge pull request #11 from config-files-api/extend_grub_cfg

extend grub.cfg with full path for set-default

CHANGELOG

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 11 13:40:06 UTC 2016 - jreidinger@suse.com
+
+- extend grub.cfg model to construct also full path usable for
+  grub2-set-default (bnc#986005)
+- 0.5.0
+
 -------------------------------------------------------------------
 Thu May 12 08:20:09 UTC 2016 - jreidinger@suse.com
 

cfa_grub2.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cfa_grub2"
-  s.version     = "0.4.1"
+  s.version     = "0.5.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Josef Reidinger"]
   s.email       = ["jreidinger@suse.cz"]

lib/cfa/grub2/grub_cfg.rb

@@ -12,8 +12,14 @@ class GrubCfg < BaseModel
       # @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,14 +30,31 @@ def self.serialize(_string)
         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)
         super(Parser, PATH, file_handler: file_handler)
       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

spec/grub_cfg_spec.rb

@@ -25,4 +25,38 @@
       )
     end
   end
+
+  describe "#boot_entries" do
+    it "gets boot entries list with title: and path: elements" do
+      expect(config.boot_entries).to eq(
+        [
+          {
+            title: "openSUSE Leap 42.1",
+            path:  "openSUSE Leap 42.1"
+          },
+          {
+            title: "openSUSE Leap 42.1, with Linux 4.1.12-1-default",
+            path:  "Advanced options for openSUSE Leap 42.1>" \
+              "openSUSE Leap 42.1, with Linux 4.1.12-1-default"
+          },
+          {
+            title: "openSUSE Leap 42.1, with Linux 4.1.12-1-default " \
+              "(recovery mode)",
+            path:  "Advanced options for openSUSE Leap 42.1>" \
+              "openSUSE Leap 42.1, with Linux 4.1.12-1-default (recovery mode)"
+          },
+          {
+            title: "halt",
+            path:  "halt"
+          }
+        ]
+      )
+    end
+  end
+
+  describe "#save" do
+    it "raises NotImplementedError" do
+      expect { config.save }.to raise_error(NotImplementedError)
+    end
+  end
 end