cfa 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed36ef61432f274fddde803ec94e699e1cdaa96c
-  data.tar.gz: 5ab4d242ebbbec5a794ed6b2309d76396f7a69ee
+  metadata.gz: 20d0d56ba26b5b824817fedbd1dd5111952bfc15
+  data.tar.gz: a3d8b0c17b1727c18ee25aea940db711a7d5714c
 SHA512:
-  metadata.gz: b7f9e87b62d41a80f332c123317a3ab01368ea2c32c544b7338b3dd0977f9fe3d1ed28e5c8807c58a9ec50bdf3b77a3c9eb029a3ce2c56bb01fe634b646bfdda
-  data.tar.gz: c60aa0011596224752a97a0b8ecc6df8b883603e9c559df15920d3609ff9f763eec59c988bd8eca884938e83ffb6c0359145a3646863fd7c57ee88707c5363b8
+  metadata.gz: aa97b3fed3d901bc8901d58d57b4612d4455b0a4552d4e90c190865c0a1bd62627ff8e36accf05cbb8efa9855b8b36a2551de482ce31451f85dfd3eb70f47138
+  data.tar.gz: f6a930470d3151060eb00e0f24d5f7cbb0db0f103e13ab84997a7dc04fef1098cd99d0cdf5b949061174cbf386fbefa42328270beb1ba9e2b655c40bdf68a1df

data/lib/cfa/augeas_parser.rb

@@ -147,7 +147,7 @@ module CFA
     # @return [Array<Hash{Symbol => Object}>] a frozen array as it is
     #    just a copy of the real data
     def data
-      @data.select { |e| e[:operation] != :remove }.freeze
+      @data.reject { |e| e[:operation] == :remove }.freeze
     end
 
     # low level access to all AugeasElement including ones marked for removal
@@ -238,8 +238,10 @@ module CFA
       return false if self.class != other.class
       other_data = other.data # do not compute again
       data.each_with_index do |entry, index|
-        return false if entry[:key] != other_data[index][:key]
-        return false if entry[:value] != other_data[index][:value]
+        other_entry = other_data[index]
+        return false unless other_entry
+        return false if entry[:key] != other_entry[:key]
+        return false if entry[:value] != other_entry[:value]
       end
 
       true

data/lib/cfa/augeas_parser/writer.rb

@@ -236,11 +236,13 @@ module CFA
       # @see https://github.com/hercules-team/augeas/wiki/Path-expressions
       def set_new_value(path, located_entry)
         aug.set(path, located_entry.entry_value)
-        prefix = path[/(^.*)\[[^\]]*\]/, 1] || path
-        # we need to get new path as set can look like [last() + 1]
-        # which creates new entry and we do not want to add subtree to new
-        # entries
-        new_path = aug.match(prefix + "[last()]").first
+        # we need to get new path as path used in aug.set can contains
+        # "[last() + 1]", so adding subtree to it, adds additional entry.
+        # So here, we replace "[last() + 1]" with "[last()]" so it will match
+        # path created by previous aug.set
+        match_str = path.gsub(/\[\s*last\(\)\s*\+\s*1\]/, "[last()]")
+
+        new_path = aug.match(match_str).first
         add_subtree(located_entry.entry_tree, new_path)
       end
 

metadata

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