dorian-yaml-compare 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb6914c636ac9da87f840c4791845f6ac23d483e136f472d08b67e61a284dd7
-  data.tar.gz: 13f3ada06ad6990193eeddade67eb8573b508de4f07439ff9e0419546c9b7e56
+  metadata.gz: 0a61a09c5ae8574d6ff57f6355e6d05618a2018c061874d860902ea419707cb4
+  data.tar.gz: a0cd44f5ef8521d815319e6ffc27689e82403c1b81627002f90f57b04a5fa466
 SHA512:
-  metadata.gz: 4df6fa9e9cfae5482c12e02ce84438984c76da48af6ce6a66f6653528c3237d752943e8d09fdb0712723bffd0371851e7725f8edb2d6c2780f313aa49d2f6478
-  data.tar.gz: 1d8eb292169bfc5f9627c1ee7f0c3a7552dca3aa0ab6e381cde7a939d2d619e033f8a5f212cc0675ee4637221e8d746b6f1780be1c0a57d97561e2c2b0dea738
+  metadata.gz: 257acd3703e8b1428b7e284801cfdcf5c9dde36796586bf82cc849f001a254fae985686b7e13051ee0afcc6fa6e2361e1820501a5d910e879fbdb183ecbe224e
+  data.tar.gz: c670e51c2c16c85321f5c4a546a1a69724d90990a67a1512ac8808bdecfae406f59b591973509c2cfca1cf5334c98f2c8de3e22e7fbe312b3e2d102be764a921

data/bin/yaml-compare

@@ -1,5 +1,52 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "dorian/yaml/compare"
-Dorian::Yaml::Compare.run
+require "yaml"
+
+def compare(hash1, hash2, current: "")
+  if hash1.is_a?(Array)
+    hash1.each.with_index { |_, i| compare(hash1[i], hash2[i], current:) }
+  elsif hash1.is_a?(String) || hash2.is_a?(String)
+    if !hash1.is_a?(String)
+      puts "key \"#{current}\" is a string in #{ARGV[1]}"
+    elsif !hash2.is_a?(String)
+      puts "key \"#{current}\" is a string in #{ARGV[0]}"
+    end
+  else
+    (hash1.keys + hash2.keys).uniq.each do |key|
+      full_key = [current, key].reject(&:empty?).join(".")
+      if !hash1.key?(key)
+        puts "missing key \"#{full_key}\" from #{ARGV[0]}"
+      elsif !hash2.key?(key)
+        puts "missing key \"#{full_key}\" from #{ARGV[1]}"
+      else
+        compare(hash1[key], hash2[key], current: full_key)
+      end
+    end
+  end
+end
+
+def with_captured_stdout(&block)
+  original_stdout = $stdout
+  $stdout = StringIO.new
+  block.call
+  $stdout.string
+ensure
+  $stdout = original_stdout
+end
+
+if ARGV.size < 2 || ARGV.size > 4
+  puts "USAGE: yaml-compare FILE1 FILE2 [ROOT1] [ROOT2]"
+  exit
+end
+
+file1 = YAML.safe_load_file(ARGV[0])
+file2 = YAML.safe_load_file(ARGV[1])
+root1 = ARGV[2]
+root2 = ARGV[3]
+file1 = file1[root1] unless root1.nil?
+file2 = file2[root2] unless root2.nil?
+
+output = with_captured_stdout { compare(file1, file2) }
+
+abort output unless output.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dorian-yaml-compare
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dorian Marié
@@ -21,7 +21,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/yaml-compare
-- lib/dorian/yaml/compare.rb
 homepage: https://github.com/dorianmariecom/yaml-compare
 licenses:
 - MIT

data/lib/dorian/yaml/compare.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require "yaml"
-
-module Dorian
-  module Yaml
-    class Compare
-      def self.run
-        if ARGV.size < 2 || ARGV.size > 4
-          puts "USAGE: yaml-compare FILE1 FILE2 [ROOT1] [ROOT2]"
-          exit
-        end
-
-        file1 = YAML.safe_load_file(ARGV[0])
-        file2 = YAML.safe_load_file(ARGV[1])
-        root1 = ARGV[2]
-        root2 = ARGV[3]
-        file1 = file1[root1] unless root1.nil?
-        file2 = file2[root2] unless root2.nil?
-
-        output = with_captured_stdout { compare(file1, file2) }
-
-        abort output unless output.empty?
-      end
-
-      def self.compare(hash1, hash2, current: "")
-        if hash1.is_a?(Array)
-          hash1.each.with_index { |_, i| compare(hash1[i], hash2[i], current:) }
-        elsif hash1.is_a?(String) || hash2.is_a?(String)
-          if !hash1.is_a?(String)
-            puts "key \"#{current}\" is a string in #{ARGV[1]}"
-          elsif !hash2.is_a?(String)
-            puts "key \"#{current}\" is a string in #{ARGV[0]}"
-          end
-        else
-          (hash1.keys + hash2.keys).uniq.each do |key|
-            full_key = [current, key].reject(&:empty?).join(".")
-            if !hash1.key?(key)
-              puts "missing key \"#{full_key}\" from #{ARGV[0]}"
-            elsif !hash2.key?(key)
-              puts "missing key \"#{full_key}\" from #{ARGV[1]}"
-            else
-              compare(hash1[key], hash2[key], current: full_key)
-            end
-          end
-        end
-      end
-
-      def self.with_captured_stdout(&block)
-        original_stdout = $stdout
-        $stdout = StringIO.new
-        block.call
-        $stdout.string
-      ensure
-        $stdout = original_stdout
-      end
-    end
-  end
-end