kucodiff 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0c86b43c39bc7d8aa5fcb41035d254e8ce47e89969d97b4b1d0e5829ffeb139
-  data.tar.gz: b2da356c812dd537b04dfb5c327165ce895d182f1dc5a180cb1c335df93640d7
+  metadata.gz: 626cbfd398f264adaf284a4842ea250babe4d8bcb506f1700cb1629c2cfb3e3e
+  data.tar.gz: d3d33300480d745da896131cb1dba9881358b3d478e91ff516a3446661e33313
 SHA512:
-  metadata.gz: 5ab4d4c2642f15fdf86798402f60115afd74787a81b49e6ce664f39e8d36873af440316c0c297d2543721ec43b11a4d22301810948786b5e4a6fc4b545b1f4e2
-  data.tar.gz: fdd69911a3a957c611a947044cf8f16293eac9fcc707c4d712409dd019fef6c979bb9f2ddec1f5098da167beab165d63dbd460a16b06c36e303e5ce2e74d2731
+  metadata.gz: 2a87916da814015b02fcb1e5fa9b8027702eeab15a6104e3c9af2bb682daf98763d4260416962b70dda6b5b23f5e97bdfb7bc0877fb3989c1acf871f72b0c9fd
+  data.tar.gz: a4f29440331c0eae9a2447751e6c3b6653019d1f3f0198e591915ea8888495bf8667aa961097c5b23bd3a31c63c9f3b69a4313677c837376d8b1098f16b36256

data/lib/kucodiff/version.rb

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

data/lib/kucodiff.rb

@@ -10,12 +10,8 @@ module Kucodiff
 
       diff = files.each_with_object({}) do |other, all|
         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 +69,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 +97,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.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it