diff_matcher 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae30490620e0407789851f3b58ecdbf8c0de16b4ec6695b19a77d1809cadfe59
-  data.tar.gz: a00b708d6ded4b931c75858c41040e10fc4362d3fbeb55c2f6f63ee8eaf20164
+  metadata.gz: a39a9962e5431cf3cbacda911c0154150733fd65510c5840ab9c67a87bb05991
+  data.tar.gz: 6b6cc7b445d393cbe1d2644de6b15ba78268e68f70b97934f8e1b4b868e29ec9
 SHA512:
-  metadata.gz: 35619bf1f55bdb50a50f69e90483c233236cec6bce7f721dcf8e007533653cadec5b492499d795de648af323d31c4d4142a60daac2386d37641ee41a354c7fa9
-  data.tar.gz: 47a9e874d8da2f0d5b623b5077487d1b07138a6d74d04eae2ee32c873f841332cc4ffc26e9cc61c36402176a6636ba2c0b14b56985a24136475261b709b3a9af
+  metadata.gz: 50f9c16a0a4f4012b8df6a79e2f2f1ac9133a565c7e8746949a4259ddd8a42bea14478f9423f26ed76abc6c6a1772ab78264576dd37d1497ca7cc9afc75c8a79
+  data.tar.gz: 89f284d344accf4a9aeb1d5b75cb20ab9466683601dd31d99d4b588325eaa7793d1a43c614ed33780078e285e7c3395108ad02386cc8a8ea8b6a101dde7b0c26

data/exe/diff-csv

@@ -55,7 +55,7 @@
 #   Where, - 1 missing, + 1 additional
 
 require 'csv'
-require 'diff_matcher'
+require 'diff_matcher/cli'
 
 COL_SEP=ENV.fetch("COL_SEP", "\t")
 KEY=ENV.fetch("KEY", "id")
@@ -72,18 +72,7 @@ def records(file, key=KEY, col_sep=COL_SEP)
   end
 end
 
-data0 = records(File.open(ARGV[0]))
-data1 = records(File.open(ARGV[1]))
-
-diff_opts = {
-  color_enabled: true,
-  ignore_additional: ENV['IGNORE_ADDITIONAL'],
-  quiet: !ENV['VERBOSE']
-}
-
-diff=DiffMatcher.difference(data0, data1, diff_opts)
-
-if diff
-  puts diff
-  exit 1
-end
+DiffMatcher::CLI.diff(
+  records(File.open(ARGV[0])),
+  records(File.open(ARGV[1]))
+)

data/exe/diff-json

@@ -1,14 +1,8 @@
 #!/usr/bin/env ruby
-require 'diff_matcher'
+require 'diff_matcher/cli'
 require 'json'
 
-expected, actual = ARGV.first(2).map do |f|
-  JSON.parse(File.read(f))
-end
-
-diff=DiffMatcher.difference(expected, actual, color_scheme: :default)
-
-if diff
-  puts diff
-  exit 1
-end
+DiffMatcher::CLI.diff(
+  JSON.parse(File.read(ARGV[-2])),
+  JSON.parse(File.read(ARGV[-1]))
+)

data/exe/diff-match

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'diff_matcher/cli'
+
+DiffMatcher::CLI.diff(
+  eval(File.read(ARGV[-2])),
+  eval(File.read(ARGV[-1]))
+)

data/exe/diff-match-json

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'diff_matcher/cli'
+require 'json'
+
+DiffMatcher::CLI.diff(
+  eval(File.read(ARGV[-2])),
+  JSON.parse(File.read(ARGV[-1]))
+)

data/lib/diff_matcher/cli.rb

@@ -0,0 +1,19 @@
+require 'diff_matcher'
+
+module DiffMatcher
+  module CLI
+    def self.diff(expected, actual, opts={})
+      # TODO maybe parse opts from command line instead of ENV vars...
+      diff_opts = {
+        color_enabled: true,
+        ignore_additional: ENV['IGNORE_ADDITIONAL'],
+        quiet: !ENV['VERBOSE']
+      }
+
+      if (diff_string = DiffMatcher.difference(expected, actual, diff_opts))
+        puts diff_string
+        exit 1
+      end
+    end
+  end
+end

data/lib/diff_matcher/version.rb

@@ -1,3 +1,3 @@
 module DiffMatcher
-  VERSION = "2.8.0"
+  VERSION = "2.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff_matcher
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - locochris
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies: []
 description: |
   DiffMatcher matches input data (eg. from a JSON API) against values,
@@ -18,6 +18,8 @@ email: chris@locomote.com.au
 executables:
 - diff-csv
 - diff-json
+- diff-match
+- diff-match-json
 - diff-mysql
 extensions: []
 extra_rdoc_files: []
@@ -39,8 +41,11 @@ files:
 - doc/more_tapas_spec.rb
 - exe/diff-csv
 - exe/diff-json
+- exe/diff-match
+- exe/diff-match-json
 - exe/diff-mysql
 - lib/diff_matcher.rb
+- lib/diff_matcher/cli.rb
 - lib/diff_matcher/difference.rb
 - lib/diff_matcher/escape_to_html.rb
 - lib/diff_matcher/rspec.rb
@@ -60,7 +65,7 @@ licenses:
 - BSD
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,9 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Generates a diff by matching against user-defined matchers written in ruby.
 test_files: