yaml_tools 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe18af8ef1c5ccad515bc83b88c2a663d143e56d49a30efe748b772b9ff3572b
-  data.tar.gz: 6fc99c8e0aa6ef9385ba82a1999b763fcab26f1a6298f6f02c4228c932e8b23a
+  metadata.gz: 4d03ebf934f0bed962b211a4042b698ce44674b8785a82a8fbb2a87de49e29e7
+  data.tar.gz: a0fd98dc358d594229f624eba8505549344abe620f99b2aff17289e37fa7df3e
 SHA512:
-  metadata.gz: 1c771e0e390a84bf7bac523e6a81f630ee46d20540b1b4bcd251c6840a6747b0d4a54059d4325f6c655ddbec95395730db98aae2dbcee67153d94e57a96b8b01
-  data.tar.gz: eb91e0ccc7c759123cee799b7b5422975a55dff273b6e965aba62a438f64aab246e9418a2e6ccff1fe9bea2eedb2bade562dcbaa668c2e2ea7f4640f4d6fc6da
+  metadata.gz: b06e324d082bb922fab275f5cbc576888f975601ebe66147d47c49e56648f6db7221484eb89dc6d7d49ad04226ec3ad7b37ad9e7b216e3f28a02e99c34f8726a
+  data.tar.gz: 8f3b1223c70be6c69171e20169f8b8b82e7fb500f6f206b418e2467efdd89b6d02acb21649b30dc81cf72bd8af243b0e4dd545df355881786fd980572a0140fe

data/lib/tools/combine.rb

@@ -123,60 +123,6 @@ module YAMLTools
       level
     end
 
-    # def flatten_merge_keys(s)
-    #   level = []
-
-    #   sourceChildren = s.each_slice(2).to_a
-
-    #   mergeKeys = sourceChildren.find_all {|i| i[0].value == "<<" }
-
-    #   if (mergeKeys.length > 0) then
-    #     if (mergeKeys.length == 1) then
-    #       # Add merge key
-    #       level << mergeKeys.first[0]
-    #       level << mergeKeys.first[1]
-    #     else
-    #       newSequence = Psych::Nodes::Sequence.new(nil, nil, true, Psych::Nodes::Sequence::FLOW)
-
-    #       mergeKeys.each {|m|
-    #         if (m[1].is_a?(Psych::Nodes::Alias)) then
-    #           newSequence.children << m[1]
-    #         elsif (m[1].is_a?(Psych::Nodes::Sequence)) then
-    #           newSequence.children.concat(m[1].children)
-    #         end
-    #       }
-
-    #       level << Psych::Nodes::Scalar.new("<<")
-    #       level << newSequence
-    #     end
-    #   end
-
-    #   sourceChildren.each {|sourcePair|
-    #     sourceKey = sourcePair[0]
-    #     sourceValue = sourcePair[1]
-
-    #     if (sourceValue.is_a?(Psych::Nodes::Mapping)) then
-    #       childLevel = flatten_merge_keys(sourceValue.children)
-
-    #       newMapping = Psych::Nodes::Mapping.new(sourceValue.anchor, sourceValue.tag, sourceValue.implicit, sourceValue.style)
-
-    #       if (childLevel.length > 0) then
-    #         newMapping.children.push(*childLevel)
-    #       end
-
-    #       level << sourceKey
-    #       level << newMapping
-    #     else
-    #       if (sourceKey.value != "<<") then
-    #         level << sourceKey
-    #         level << sourceValue
-    #       end
-    #     end
-    #   }
-
-    #   level
-    # end
-
     def combine_files(sourceFilePath, differenceFilePath)
       sourceFile = File.open(sourceFilePath, "r")
       differenceFile = File.open(differenceFilePath, "r")

data/lib/tools/compare.rb

@@ -81,11 +81,7 @@ module YAMLTools
                   level << destinationKey
                   level << destinationValue
                 end
-              else
-                # Bad data
               end
-            else
-              # Bad data
             end
           elsif (destinationValue.is_a?(Psych::Nodes::Mapping)) then
             childLevel = processLevel(sourceValue.children, destinationValue.children, includeAnchorDependencies)

data/lib/tools/utility.rb

@@ -12,8 +12,7 @@ module YAMLTools
     output = stream.to_yaml
 
     # Remove initial document start
-    document_start = (output.index("---\n") || size - 1) + 4
-    output.slice!(0, document_start)
+    output.slice!(0, 4) if (output.start_with?("---\n"))
 
     output
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_tools
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Atlas Systems, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec