cfa 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4abe1cefacc4777f6016b432b3a306f16b1b7ac
-  data.tar.gz: 359c1f958762e205c5313e0027dda5a09a10bc5c
+  metadata.gz: ed36ef61432f274fddde803ec94e699e1cdaa96c
+  data.tar.gz: 5ab4d242ebbbec5a794ed6b2309d76396f7a69ee
 SHA512:
-  metadata.gz: c8bdb5a5aa8391dfb8c46448b760868e257b71e195daa38cc7d272f1729e52d7c20be9acd6fa2632b63ec4bfb736c7bba41a3293b6e7d3e12d319d0a786fd885
-  data.tar.gz: 69296e9dbd626125d6e0612f580cbbd12266e004794231c9b61c980bd66114ee90f84cafd22393fc6b1000ce4b42d92f6ff724b2ce34c6ff96d77feba2c604cb
+  metadata.gz: b7f9e87b62d41a80f332c123317a3ab01368ea2c32c544b7338b3dd0977f9fe3d1ed28e5c8807c58a9ec50bdf3b77a3c9eb029a3ce2c56bb01fe634b646bfdda
+  data.tar.gz: c60aa0011596224752a97a0b8ecc6df8b883603e9c559df15920d3609ff9f763eec59c988bd8eca884938e83ffb6c0359145a3646863fd7c57ee88707c5363b8

data/lib/cfa/augeas_parser.rb

@@ -1,3 +1,4 @@
+require "set"
 require "augeas"
 require "forwardable"
 require "cfa/placer"
@@ -158,6 +159,19 @@ module CFA
       @data = []
     end
 
+    # Gets new unique id in numberic sequence. Useful for augeas models that
+    # using sequences like /etc/hosts . It have keys like "1", "2" and when
+    # adding new one it need to find new key.
+    def unique_id
+      # check all_data instead of data, as we have to not reuse deleted key
+      ids = Set.new(all_data.map { |e| e[:key] })
+      id = 1
+      loop do
+        return id.to_s unless ids.include?(id.to_s)
+        id += 1
+      end
+    end
+
     # @return [AugeasCollection] collection for *key*
     def collection(key)
       AugeasCollection.new(self, key)
@@ -217,7 +231,7 @@ module CFA
     # @param matcher [Matcher]
     # @return [Array<AugeasElement>] matching elements
     def select(matcher)
-      @data.select(&matcher)
+      data.select(&matcher)
     end
 
     def ==(other)

data/lib/cfa/augeas_parser/writer.rb

@@ -184,7 +184,7 @@ module CFA
         # one after another then the latter cannot affect the former
         @operations.reverse_each do |operation|
           case operation[:type]
-          when :remove then aug.rm(operation[:path])
+          when :remove then remove_entry(operation[:path])
           when :add
             located_entry = operation[:located_entry]
             add_entry(located_entry)
@@ -198,6 +198,28 @@ module CFA
 
       attr_reader :aug
 
+      # Removes entry from tree. If *path* does not exist, then tries if it
+      # has changed to a collection:
+      # If we remove and re-add a single key then because of the laziness
+      # Augeas will first see the addition, making a 2 member collection,
+      # so we need to remove "key[1]" instead of "key".
+      # @param path [String] original path name to remove
+      def remove_entry(path)
+        aug.rm(path_to_remove(path))
+      end
+
+      # Finds path to remove, as path can be meanwhile renumbered, see
+      # #remove_entry
+      def path_to_remove(path)
+        if aug.match(path).size == 1
+          path
+        elsif !aug.match(path + "[1]").empty?
+          path + "[1]"
+        else
+          raise "Unknown augeas path #{path}"
+        end
+      end
+
       # Adds entry to tree. At first it finds where to add it to be in correct
       # place and then sets its value. Recursive if needed. In recursive case
       # it is already known that whole sub-tree is also new and just added.
@@ -214,11 +236,11 @@ 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]
+        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
+        new_path = aug.match(prefix + "[last()]").first
         add_subtree(located_entry.entry_tree, new_path)
       end
 
@@ -267,9 +289,19 @@ module CFA
       # @return [String] where value should be written.
       def insert_after(preceding, located_entry)
         aug.insert(preceding.path, located_entry.key, false)
-        paths = aug.match(located_entry.prefix + "/*")
-        paths_index = paths.index(preceding.path) + 1
-        paths[paths_index]
+        path_after(preceding)
+      end
+
+      # Finds path immediately after preceding entry
+      # @param preceding [LocatedEntry]
+      def path_after(preceding)
+        paths = aug.match(preceding.prefix + "/*")
+        preceding_index = paths.index(preceding.path)
+        # it can happen, that insertion change previous entry from
+        # e.g. #comment to #comment[1]. Can happen only if it switch from
+        # single entry to collection
+        preceding_index ||= paths.index(preceding.path + "[1]")
+        paths[preceding_index + 1]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-augeas
@@ -61,10 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: CFA (Config Files API) provides an easy way to create models on top of configuration
   files
 test_files: []
-has_rdoc: