yaml-search-diff 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ede66c1158322d5b1a4b1dfccd0c17d256ecbb3213f9b65abe426e760c3414b
-  data.tar.gz: 5b02036252af257ad9781e4e6e1c956dafac2ed63fb4716092b31836b288ff39
+  metadata.gz: 5e354e9c4e84ded8557e8c2e81e2b2d593fecc4d2c43bb40860f61fff8d1984c
+  data.tar.gz: 991c2647aedd8c768e27b25bdd1c1666acd915a3f18d27f6caa1b4ff28aacd30
 SHA512:
-  metadata.gz: 34b64892c5d08e78ce5249da70a581d90a2f4aec3d3de741edbe27ee8436502fb08cd4ea1f9578f572c6d106579c0ef2150097858622a56e53150424e7983975
-  data.tar.gz: f43a8d58d724ffbed84ac9166fbf371cc61be556e4d5b22c65f010cb113c51aa83dc5f4238f22bd5f5c1469986845a247b9dda65d5f528357b6ca2cfa358fc50
+  metadata.gz: 11f7371de2a93afb6a1bbdeb661b34bcac376e38d5ca41eb4b75dbed5a92d0d4ec30c6b73aa223348cdb7836161d4d9af452b255d0dd5e931e5eac4903526582
+  data.tar.gz: e8ac694b6e5c0b87c600b04e436583914a6cde2acbd0daf6e7cfd58c55da3128520864efcd73fbba520343d77ebc23fae23bf5ed26413615f3eca66f064ea71f

data/bin/ysdiff

@@ -12,4 +12,13 @@ file_2 = ARGV[2]
 yml_1 = open(file_1) {|f| YAML.load(f)}
 yml_2 = open(file_2) {|f| YAML.load(f)}
 
-puts YamlSearchDiff.run(key: key, yml_1: yml_1, yml_2: yml_2)
+invalid_files = []
+invalid_files << file_1 unless yml_1.is_a?(Hash)
+invalid_files << file_2 unless yml_2.is_a?(Hash)
+
+if invalid_files.empty?
+  puts YamlSearchDiff.run(key: key, yml_1: yml_1, yml_2: yml_2)
+else
+  STDERR.puts "Couldn't parse following files as Hash: #{invalid_files.join(', ')}"
+  exit 1
+end

data/lib/yaml_search_diff.rb

@@ -2,47 +2,64 @@ require 'yaml'
 require 'diffy'
 
 class YamlSearchDiff
-  def self.run(key:, yml_1:, yml_2:)
-    partial_1 = dfs(yml_1, key)
-    partial_2 = dfs(yml_2, key)
-
-    Diffy::Diff.new(
-      YAML.dump(nested_sort_hash(partial_1)),
-      YAML.dump(nested_sort_hash(partial_2))
-    )
-  end
+  class << self
+    def run(key:, yml_1:, yml_2:)
+      return "" unless yml_1.is_a?(Hash) && yml_2.is_a?(Hash)
 
-  private
+      searched_1 = catch(:has_key) { dfs(yml_1, key) }
+      searched_2 = catch(:has_key) { dfs(yml_2, key) }
 
-    def self.dfs(hash, key)
-      keys = hash.keys.sort_by(&:to_s)
-      keys.each do |k|
-        return hash[k] if k == key
-        dfs(hash[k], key) if hash[k].is_a?(Hash)
-      end
-      nil
+      sorted_1 = sort_yml(searched_1)
+      sorted_2 = sort_yml(searched_2)
+
+      Diffy::Diff.new(
+        YAML.dump(sorted_1),
+        YAML.dump(sorted_2)
+      )
     end
 
-    def self.nested_sort_hash(hash)
-      hash.each do |k, v|
-        if v.is_a?(Hash)
-          hash[k] = nested_sort_hash(v)
-        elsif v.is_a?(Array)
-          hash[k] = nested_sort_array(v)
+    private
+
+      def dfs(hash, key)
+        keys = hash.keys.sort_by(&:to_s)
+        keys.each do |k|
+          throw :has_key, hash[k] if k == key
+          dfs(hash[k], key) if hash[k].is_a?(Hash)
         end
+        {}
       end
-      hash.sort.to_h
-    end
 
-    def self.nested_sort_array(array)
-      array.each_with_index do |v, i|
-        if v.is_a?(Hash)
-          array[i] = nested_sort_hash(v)
-        elsif v.is_a?(Array)
-          array[i] = nested_sort_array(v)
+      def sort_yml(yml)
+        if yml.is_a?(Hash)
+          nested_sort_hash(yml)
+        elsif yml.is_a?(Array)
+          nested_sort_array(yml)
+        else
+          yml
         end
       end
-      array.sort_by(&:to_s)
-    end
+
+      def nested_sort_hash(hash)
+        hash.each do |k, v|
+          if v.is_a?(Hash)
+            hash[k] = nested_sort_hash(v)
+          elsif v.is_a?(Array)
+            hash[k] = nested_sort_array(v)
+          end
+        end
+        hash.sort_by { |k, v| k.to_s }.to_h
+      end
+
+      def nested_sort_array(array)
+        array.each_with_index do |v, i|
+          if v.is_a?(Hash)
+            array[i] = nested_sort_hash(v)
+          elsif v.is_a?(Array)
+            array[i] = nested_sort_array(v)
+          end
+        end
+        array.sort_by(&:to_s)
+      end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-search-diff
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Natsuki Inoue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy