dapp 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603b492e55fefd66b058c89a437dbb5c893580b1
-  data.tar.gz: 7f749d8657cd2a57eb11c34c8bd9269ea920d6a8
+  metadata.gz: d181fb38e748b19b264a4915a3a6fb3e6667d2c1
+  data.tar.gz: 38223cc898561220d439c6aadc61e41eebd3cf7e
 SHA512:
-  metadata.gz: 2f60e6e78c30217324faf06da93f57a0d3be2ee2f9d3b8280235a28102723b24db5a6dd6cb6a101001881d5978a74c92b276379f92ac7fbbd182a6f81fbc2ff1
-  data.tar.gz: 7d24c671310b496855f9855c8986330cd8e374ab7d619d4957249a0372166190e1052eec6f4235661efef4176f458860f16189261dd99d2b01482eaa457db052
+  metadata.gz: 266c75c205201e46cfdf8a0c3056b22cf883cceb1afcf5eddd68eb3139545249f561984afd6bbf933e9f79f5734fd04a4a9a0fb0c4ca6d31f94a10babdce0b63
+  data.tar.gz: 0ce677db9c3c6a93558f67853174bd2f54a919f794eb3da8cee28f1a4542cb0a20f8df9b7400d237996cd2f4b34a493b268a6f02d12590d76cea4a67327165df

data/lib/dapp/kube/dapp/command/secret_edit.rb

@@ -19,17 +19,39 @@ module Dapp
 
               tmp_file_path = kube_tmp_chart_path(file_path)
               tmp_file_path.binwrite(decoded_data)
-              system(kube_secret_editor, tmp_file_path.to_s)
 
-              encoded_data = begin
-                if options[:values]
-                  kube_secret_values(tmp_file_path)
-                else
-                  kube_secret_file(tmp_file_path)
+              loop do
+                begin
+                  system(kube_secret_editor, tmp_file_path.to_s)
+
+                  encoded_data = begin
+                    if options[:values]
+                      encoded_values = yaml_load_file(file_path)
+
+                      decoded_values = kube_helm_decode_json(secret, yaml_load_file(file_path))
+                      updated_decoded_values = yaml_load_file(tmp_file_path)
+
+                      deep_delete_if_key_not_exist(encoded_values, updated_decoded_values)
+
+                      modified_decoded_values = deep_select_modified_keys(updated_decoded_values, decoded_values)
+                      encoded_values.in_depth_merge(kube_helm_encode_json(secret, modified_decoded_values))
+                        .sort
+                        .to_h
+                        .to_yaml
+                    else
+                      kube_secret_file(tmp_file_path)
+                    end
+                  end
+
+                  IO.binwrite(file_path, "#{encoded_data}\n")
+                  break
+                rescue ::Dapp::Error::Base => e
+                  log_warning(e.net_status[:data][:message])
+                  print 'Do you want to change file (Y/n)?'
+                  response = $stdin.noecho(&:gets).tap { print "\n" }
+                  return if response.strip == 'n'
                 end
               end
-
-              IO.binwrite(file_path, "#{encoded_data}\n")
             end
           end
 
@@ -38,6 +60,36 @@ module Dapp
             %w(vim vi nano).each { |editor| return editor unless shellout("which #{editor}").exitstatus.nonzero? }
             raise Error::Command, code: :editor_not_found
           end
+
+          private
+
+          def deep_select_modified_keys(hash1, hash2)
+            {}.tap do |hash|
+              hash1.each do |k, v|
+                next if hash2[k] == v
+                hash[k] = begin
+                  if hash2[k].is_a?(Hash) && v.is_a?(Hash)
+                    deep_select_modified_keys(v, hash2[k])
+                  else
+                    v
+                  end
+                end
+              end
+            end
+          end
+
+          def deep_delete_if_key_not_exist(hash1, hash2)
+            hash1.delete_if do |k, v|
+              if hash2.key?(k)
+                if hash2[k].is_a?(Hash) && v.is_a?(Hash)
+                  deep_delete_if_key_not_exist(v, hash2[k])
+                end
+                false
+              else
+                true
+              end
+            end
+          end
         end
       end
     end

data/lib/dapp/kube/error/base.rb

@@ -1,11 +1,7 @@
 module Dapp
   module Kube
     module Error
-      class Base < ::Dapp::Error::Base
-        def initialize(net_status = {})
-          super({context: 'kube'}.merge(net_status))
-        end
-      end
+      class Base < ::Dapp::Error::Base; end
     end
   end
 end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.14.2'.freeze
+  VERSION = '0.14.3'.freeze
   BUILD_CACHE_VERSION = 16
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout