kucodiff 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59e1b9b9b4ac8a580ad3f6d8cc5d67b81fdd18de
-  data.tar.gz: 98be6f305b643cd96c419bf2287dc18f67a97e48
+SHA256:
+  metadata.gz: e0c86b43c39bc7d8aa5fcb41035d254e8ce47e89969d97b4b1d0e5829ffeb139
+  data.tar.gz: b2da356c812dd537b04dfb5c327165ce895d182f1dc5a180cb1c335df93640d7
 SHA512:
-  metadata.gz: 34ada378819ea565b3a14ff9a3229072e45bd18a7c26d860b1cb274dc8ce5414a11e1623167dbd794ce0e44a67fab82479473b6027d682802b7d129d5f77038e
-  data.tar.gz: 233c20efb8dc84254cd1b049d1dfb9764dca5cec5d55c9694de42d252382586481a866dd46d92d922b42140b1dfdeff0f1d29b9affd26d5e1a6a57eea641df06
+  metadata.gz: 5ab4d4c2642f15fdf86798402f60115afd74787a81b49e6ce664f39e8d36873af440316c0c297d2543721ec43b11a4d22301810948786b5e4a6fc4b545b1f4e2
+  data.tar.gz: fdd69911a3a957c611a947044cf8f16293eac9fcc707c4d712409dd019fef6c979bb9f2ddec1f5098da167beab165d63dbd460a16b06c36e303e5ce2e74d2731

data/lib/kucodiff/version.rb

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

data/lib/kucodiff.rb

@@ -31,26 +31,39 @@ module Kucodiff
     private
 
     def read(file)
-      content = if file.end_with?('.yml', '.yaml')
-        YAML.load_stream(File.read(file)) # TODO: test need for stream
-      else raise ArgumentError, "unknown file format in #{file}"
-      end.first
+      content =
+        if file.end_with?('.yml', '.yaml')
+          if RUBY_VERSION >= "2.6.0"
+            YAML.load_stream(File.read(file), filename: file) # uncovered
+          else
+            YAML.load_stream(File.read(file), file) # uncovered
+          end
+        else
+          raise ArgumentError, "unknown file format in #{file}"
+        end.first
 
-      hashify_container_env!(content)
+      template = template(content)
+      template.dig("spec", "containers")&.each do |container|
+        hashify_named_array!(container, "env", first: true)
+        hashify_named_array!(container, "volumeMounts", first: false)
+      end
+      hashify_named_array!(template["spec"], "volumes", first: false)
       hashify_required_env!(content)
 
       flat_hash(content)
     end
 
-    # make env comparable
-    def hashify_container_env!(content)
-      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|
-          value_key = (v.keys - ['name']).first
-          h[v.fetch('name')] = v.fetch(value_key)
-        end
+    def hashify_named_array!(object, key, first:)
+      return if !object || !(array = object[key])
+      object[key] = array.to_h do |v|
+        keep = (v.keys - ['name'])
+        value =
+          if first
+            v.fetch(keep.first)
+          else
+            v.slice(*keep)
+          end
+        [v.fetch('name'), value]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kucodiff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -31,15 +31,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Smart diff for kubernetes configs to ensure symmetric configuration