cfa_grub2 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 742ec03eb883061f44bf8ec4e239d02bb066bc59
-  data.tar.gz: 16c6d6a421cf3dd6394dde66033f4dd51573245e
+  metadata.gz: af13a6ea41486f646e9debfb46c3a809e4a97391
+  data.tar.gz: afb3f9b421872d38c9ec9604ac687d1490c4edcf
 SHA512:
-  metadata.gz: 27bac49cf26b7edacfd9172121f37d407846e368bee860bd1aa73c689467f59d3619aab786013595dcd05d754677eee0aee9ce29a8a7c81d20318bfde5c55a26
-  data.tar.gz: 504b1a9a1fb9027a25161dddd22e159760b2b738c951ce2863c50690d84bfb66c4e0ecf521e64750a834243c2c919fb78108645028454716547bef8acc9b93f2
+  metadata.gz: e0c0df8ced8a6302c4bfef86296e839f3c81275d52470eda36faa9be5739dd37ca7fe99c46616d93cdf8f0b7b04cdf8cc0267984e99a4beefbf9236081fb911a
+  data.tar.gz: 733243ede8cf8c5f866487d6999249c31d903ec7ab6e41de0232586c9d199ba48854f3d91f22962ad15ed973f961b7059f2062e00aa5a71d5e88204d262e06aa

data/lib/cfa/grub2/default.rb

@@ -70,15 +70,14 @@ module CFA
 
       def xen_hypervisor_params
         @xen_hypervisor_params ||= KernelParams.new(
-          data["GRUB_CMDLINE_XEN_DEFAULT"],
-          "GRUB_CMDLINE_XEN_DEFAULT"
+          data["GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"],
+          "GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"
         )
       end
 
       def xen_kernel_params
         @xen_kernel_params ||= KernelParams.new(
-          data["GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"],
-          "GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"
+          data["GRUB_CMDLINE_XEN_DEFAULT"], "GRUB_CMDLINE_XEN_DEFAULT"
         )
       end
 
@@ -186,6 +185,7 @@ module CFA
         def add_parameter(key, value, placer = AppendPlacer.new)
           element = placer.new_element(@tree)
 
+          element[:operation] = :add
           element[:key]   = key
           element[:value] = value
         end
@@ -193,31 +193,29 @@ module CFA
         # Removes parameter from kernel command line.
         # @param matcher [Matcher] to find entry to remove
         def remove_parameter(matcher)
-          @tree.data.reject!(&matcher)
+          @tree.data.select(&matcher).each { |e| e[:operation] = :remove }
         end
 
         # Represents parsed kernel parameters tree. Parses in initialization
         # and backserilized by `to_string`.
         # TODO: replace it via augeas parser when someone write lense
         class ParamTree
-          attr_reader :data
-
           def initialize(line)
-            line ||= ""
-            pairs = line.split(/\s/)
-                        .reject(&:empty?)
-                        .map { |e| e.split("=", 2) }
+            pairs = (line || "").split(/\s/)
+                                .reject(&:empty?)
+                                .map { |e| e.split("=", 2) }
 
             @data = pairs.map do |k, v|
               {
-                key:   k,
-                value: v || true, # kernel param without value have true
+                key:       k,
+                value:     v || true, # kernel param without value have true
+                operation: :keep
               }
             end
           end
 
           def to_string
-            snippets = @data.map do |e|
+            snippets = data.map do |e|
               if e[:value] == true
                 e[:key]
               else
@@ -227,6 +225,14 @@ module CFA
 
             snippets.join(" ")
           end
+
+          def data
+            @data.select { |e| e[:operation] != :remove }.freeze
+          end
+
+          def all_data
+            @data
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfa_grub2
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfa
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0.5'
 description: Models allowing easy read and modification of GRUB2 configuration files.
   It is a plugin for cfa framework.
 email:
@@ -56,8 +56,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Models for GRUB2 configuration files.
 test_files: []
+has_rdoc: