yaml-search-diff 0.3.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe797299e547a76b27a00f2ec699e2e7c6b65914ebc9f933a695e0f9ecb5e0a1
-  data.tar.gz: 3536d4575f5928597a901507065fc9c6e756ad5b8b08452b4dfae348175aeb1f
+  metadata.gz: 0a964579c858c001a695e4e8980610a173e8a9ecda23314d6176ae4bc479b7f5
+  data.tar.gz: 3f433f709a403a3b763acd73e284fee83af3ab56ea6274fe5a49026c6a739c75
 SHA512:
-  metadata.gz: a7895768fbc626464c82234b09d4bb993211bbe6e5bb3bf3c9e96ac28e204e2ff2e04150d409dce400817c41678ab208908e93f306d18298b1120517bf41b568
-  data.tar.gz: 04e8bdac6a64bb9fe2dbff84622b6c2a40daa7f66e758daff934817f33e1acad519758247c7ba310fb5e120a8e01ac84d436f71bb1462cc4b20bb1b8f82eeaf1
+  metadata.gz: c1f90c9aade7f5d77e35fa7ae1b6b793f0289adb5efb6d23520c6f40754719565f24fdcc5e83f165d57b9e164e86a5b4c1f395c21f5163a12c331bd802bbe818
+  data.tar.gz: c9449015aa16aea33c8dacc2c4b0013d423b88ae9aaf45db7a21c16c49da21d78fbaa57a50caaf5a97ad0c08a74e72f9808c0d75c5b3517ec433bcb7d8433f3c

data/bin/ysdiff

@@ -12,4 +12,14 @@ 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?
+  ysdiff = YamlSearchDiff.new
+  puts ysdiff.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,28 +2,63 @@ 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)
+
+  def initialize
+    @scalar_scanner = Psych::ScalarScanner.new(Psych::ClassLoader.new)
+  end
+
+  def run(key:, yml_1:, yml_2:)
+    return "" unless yml_1.is_a?(Hash) && yml_2.is_a?(Hash)
+
+    searched_1 = key.include?(':') ? search_dig(key, yml_1) : search(key, yml_1)
+    searched_2 = key.include?(':') ? search_dig(key, yml_2) : search(key, yml_2)
 
     Diffy::Diff.new(
-      YAML.dump(nested_sort_hash(partial_1)),
-      YAML.dump(nested_sort_hash(partial_2))
+      YAML.dump(searched_1),
+      YAML.dump(searched_2)
     )
   end
 
   private
 
-    def self.dfs(hash, key)
+    def search(key, yml)
+      tokenized_key = @scalar_scanner.tokenize(key)
+      searched = catch(:has_key) { dfs(yml, tokenized_key) }
+      sort_yml(searched)
+    end
+
+    def search_dig(key, yml)
+      tokenized_keys = key.split(':').map {|k| @scalar_scanner.tokenize(k) }
+      return sort_yml(yml) if tokenized_keys.size.zero?
+
+      first_key = tokenized_keys.first
+
+      searched = catch(:has_key) { dfs(yml, first_key) }
+      digged = searched.dig(*tokenized_keys[1..])
+
+      sort_yml(digged)
+    end
+
+    def dfs(hash, key)
       keys = hash.keys.sort_by(&:to_s)
       keys.each do |k|
-        return hash[k] if k == key
+        throw :has_key, hash[k] if k == key
         dfs(hash[k], key) if hash[k].is_a?(Hash)
       end
-      nil
+      {}
+    end
+
+    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
 
-    def self.nested_sort_hash(hash)
+    def nested_sort_hash(hash)
       hash.each do |k, v|
         if v.is_a?(Hash)
           hash[k] = nested_sort_hash(v)
@@ -31,10 +66,10 @@ class YamlSearchDiff
           hash[k] = nested_sort_array(v)
         end
       end
-      hash.sort.to_h
+      hash.sort_by { |k, v| k.to_s }.to_h
     end
 
-    def self.nested_sort_array(array)
+    def nested_sort_array(array)
       array.each_with_index do |v, i|
         if v.is_a?(Hash)
           array[i] = nested_sort_hash(v)

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: yaml-search-diff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Natsuki Inoue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
-dependencies: []
+date: 2021-07-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: A commandline tool to showdiff of a specific key in yaml files.
 email: summertree128@gmail.com
 executables: