yaml-search-diff 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f4ea3b99a59f3c69dbdd417c631e9a0b87efac4e2ef264b9cbfc1c4f4e1b69
-  data.tar.gz: 9ed236c0c25fdf2a1720ffdbc887f86729e2c6ad1e36119de917c2488c0c25af
+  metadata.gz: 43c8d977451539a04e29673ecd6c5fc7b14f2523ddacba5b818dfaaf6d37ab0d
+  data.tar.gz: b534be13e379921eee993728ad8018567736542ff31904ebe5ec41c0079b2e41
 SHA512:
-  metadata.gz: 9880529db1951de26788f9e955c0f2201d24157443a06f0f1d2abc84593c59e2b6e713df63db9c79d48777f88cc9c223a1c36888df20bbffe7d483e05fd1af08
-  data.tar.gz: '08edb263794ddf7f9339d1d1c375055d5f0c8994db5fdaa581ed05d5b86fbdc229d7a811b2bc266c217c2424603b5f68ced275e202d1d102225afcbd29c40548'
+  metadata.gz: e7cf20666840ea29c9427b308c527c8f7b9632539f3b6c9c29d5996cb88e4b591a2f180927dc62c1317433ba6e16c8074fc5c44e776e21357ac33a1452368757
+  data.tar.gz: 4254b55411edb43987487a5c9d3b5028f9806fbc7640db7873ce1ab66042692ba7ee866b4174e332a66b428b3f2659c6412568d692ef3fee25df8b02e351a8c2

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,76 @@ 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 = key.include?(':') ? search_dig(key, yml_1) : search(key, yml_1)
+      searched_2 = key.include?(':') ? search_dig(key, yml_2) : search(key, yml_2)
 
-    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
+      Diffy::Diff.new(
+        YAML.dump(searched_1),
+        YAML.dump(searched_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 search(key, yml)
+        searched = catch(:has_key) { dfs(yml, key) }
+        sort_yml(searched)
+      end
+
+      def search_dig(key, yml)
+        splitted_keys = key.split(':')
+        first_key = splitted_keys.first
+
+        searched = catch(:has_key) { dfs(yml, first_key) }
+        digged = searched.dig(*splitted_keys[1..])
+
+        sort_yml(digged)
+      end
+
+      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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: yaml-search-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Natsuki Inoue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
-dependencies: []
+date: 2021-07-18 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:
@@ -22,7 +36,8 @@ files:
 homepage: https://rubygems.org/gems/yaml-search-diff
 licenses:
 - MIT
-metadata: {}
+metadata:
+  documentation_uri: https://github.com/summertree128/yaml-search-diff
 post_install_message:
 rdoc_options: []
 require_paths: