kucodiff 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0bc5d52a96c4780c31fbea4a698abcc7d68a1e
-  data.tar.gz: da7a31d7540bec7f8acb108d0cede6d417d6f359
+  metadata.gz: 59e1b9b9b4ac8a580ad3f6d8cc5d67b81fdd18de
+  data.tar.gz: 98be6f305b643cd96c419bf2287dc18f67a97e48
 SHA512:
-  metadata.gz: 5ce396f5b2f5c7617a045d53768c9bc5ce9d4dd7ffaee09f4c56fc5464884d96793eaa95cd7db3fc0a88502c14ff7da578815e35ca87a582419b63e61e10ff7e
-  data.tar.gz: 0438ca56fa8b57dbf8bf0530a1d5dd456f43f6b3f11a2054518bd121fc597df9cce3577da7eecdaf55bb1cf54583d601338f7b7f76379010952214f2993fa397
+  metadata.gz: 34ada378819ea565b3a14ff9a3229072e45bd18a7c26d860b1cb274dc8ce5414a11e1623167dbd794ce0e44a67fab82479473b6027d682802b7d129d5f77038e
+  data.tar.gz: 233c20efb8dc84254cd1b049d1dfb9764dca5cec5d55c9694de42d252382586481a866dd46d92d922b42140b1dfdeff0f1d29b9affd26d5e1a6a57eea641df06

data/lib/kucodiff/version.rb

@@ -1,3 +1,3 @@
 module Kucodiff
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/kucodiff.rb

@@ -2,13 +2,20 @@ require 'yaml'
 
 module Kucodiff
   class << self
-    def diff(files, ignore: false, expected: {})
+    def diff(files, ignore: false, indent_pod: false, 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|
-        result = different_keys(base_template, read(other))
+        other_template = read(other)
+        result =
+          if indent_pod
+            different_keys_pod_indented(base_template, other_template)
+          else
+            different_keys(base_template, other_template)
+          end
         result.reject! { |k| k =~ ignore } if ignore
         all["#{base}-#{other}"] = result.sort
       end
@@ -37,7 +44,7 @@ module Kucodiff
 
     # make env comparable
     def hashify_container_env!(content)
-      containers = content.fetch('spec', {}).fetch('template', {}).fetch('spec', {}).fetch('containers', [])
+      containers = template(content).fetch('spec', {}).fetch('containers', [])
       containers.each do |container|
         next unless container['env']
         container['env'] = container['env'].each_with_object({}) do |v, h|
@@ -49,10 +56,28 @@ module Kucodiff
 
     def hashify_required_env!(content)
       key = 'samson/required_env'
-      annotations = content.fetch('spec', {}).fetch('template', {}).fetch('metadata', {}).fetch('annotations', {})
+      annotations = template(content).fetch('metadata', {}).fetch('annotations', {})
       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] }]
+        else
+          template
+        end
+      end
+
+      diff = different_keys(*templates)
+      diff.select! { |k| k.start_with?(prefix) } if ignore_unindented
+      diff
+    end
+
     def different_keys(a, b)
       (a.keys + b.keys).uniq.select { |k| a[k] != b[k] }
     end
@@ -61,6 +86,10 @@ module Kucodiff
       a + b - (a & b)
     end
 
+    def template(content)
+      content['kind'] == "Pod" ? content : content.fetch('spec', {}).fetch('template', {})
+    end
+
     # http://stackoverflow.com/questions/9647997/converting-a-nested-hash-into-a-flat-hash
     def flat_hash(input, base = nil, all = {})
       if input.is_a?(Array)

metadata

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