kucodiff 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0c86b43c39bc7d8aa5fcb41035d254e8ce47e89969d97b4b1d0e5829ffeb139
-  data.tar.gz: b2da356c812dd537b04dfb5c327165ce895d182f1dc5a180cb1c335df93640d7
+  metadata.gz: 55d4cc59d67c00541e565e4e405d475baa13f2eb838997aca3914c9235a76933
+  data.tar.gz: 54dda7b72c618c8c290b41d8927e5b43fa95cc84e7c4b34d579652685493a685
 SHA512:
-  metadata.gz: 5ab4d4c2642f15fdf86798402f60115afd74787a81b49e6ce664f39e8d36873af440316c0c297d2543721ec43b11a4d22301810948786b5e4a6fc4b545b1f4e2
-  data.tar.gz: fdd69911a3a957c611a947044cf8f16293eac9fcc707c4d712409dd019fef6c979bb9f2ddec1f5098da167beab165d63dbd460a16b06c36e303e5ce2e74d2731
+  metadata.gz: 4ecb7b4155cce7a0ecca4ab341b7e75341fc9f5aced7358387fe61162415eea325b78077c6223d93821cb12b69ca68888ffb7ed11c5a703b474446bb56d66ed2
+  data.tar.gz: 36a03f8dcf963e873872142a881a4383201b35bd321a2538844445350ca08500cf6eae9c7e7a27f82e379c30cbcb88f9ef78a46b4228a3485dfd177861cece5a

data/lib/kucodiff/version.rb

@@ -1,3 +1,3 @@
 module Kucodiff
-  VERSION = "0.4.0"
+  VERSION = "0.6.1"
 end

data/lib/kucodiff.rb

@@ -2,20 +2,18 @@ require 'yaml'
 
 module Kucodiff
   class << self
-    def diff(files, ignore: false, indent_pod: false, expected: {})
+    def diff(files, ignore: false, indent_pod: true, expected: {})
       raise ArgumentError, "Need 2+ files" if files.size < 2
 
       base = files.shift
-      base_template = read(base)
 
       diff = files.each_with_object({}) do |other, all|
+        # re-read both since we modify them
+        base_template = read(base)
         other_template = read(other)
-        result =
-          if indent_pod
-            different_keys_pod_indented(base_template, other_template)
-          else
-            different_keys(base_template, other_template)
-          end
+
+        pod_indented!(base_template, other_template) if indent_pod
+        result = different_keys(base_template, other_template)
         result.reject! { |k| k =~ ignore } if ignore
         all["#{base}-#{other}"] = result.sort
       end
@@ -73,22 +71,23 @@ module Kucodiff
       annotations[key] = Hash[annotations[key].strip.split(/[\s,]/).map { |k| [k, true] }] if annotations[key]
     end
 
-    def different_keys_pod_indented(*templates)
-      ignore_unindented = false
-      prefix = "spec.template."
-
-      templates.map! do |template|
-        if template["kind"] == "Pod"
-          ignore_unindented = true
-          Hash[template.map { |k,v| [prefix + k, v] }]
+    # templates are flat hashes already
+    def pod_indented!(*templates)
+      kinds = templates.map { |t| t["kind"] }
+      return if (kinds & ["Pod", "PodTemplate"]).empty? || kinds.uniq.size == 1
+
+      templates.each do |template|
+        case template["kind"]
+        when "Pod"
+          # all good
+        when "PodTemplate"
+          template.select! { |k, _| k.start_with?("template.") }
+          template.transform_keys! { |k| k.sub("template.", "") }
         else
-          template
+          template.select! { |k, _| k.start_with?("spec.template.") }
+          template.transform_keys! { |k| k.sub("spec.template.", "") }
         end
       end
-
-      diff = different_keys(*templates)
-      diff.select! { |k| k.start_with?(prefix) } if ignore_unindented
-      diff
     end
 
     def different_keys(a, b)
@@ -100,7 +99,11 @@ module Kucodiff
     end
 
     def template(content)
-      content['kind'] == "Pod" ? content : content.fetch('spec', {}).fetch('template', {})
+      case content['kind']
+      when "Pod" then content
+      when "PodTemplate" then content.fetch('template')
+      else content.dig('spec', 'template') || {}
+      end
     end
 
     # http://stackoverflow.com/questions/9647997/converting-a-nested-hash-into-a-flat-hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kucodiff
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it