RubyGems - csv-diff-report - Versions diffs - 0.3.5 → 0.4.1 - Mend

csv-diff-report 0.3.5 → 0.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

checksums.yaml +4 -4
data/lib/csv-diff-report/cli.rb +3 -1
data/lib/csv-diff-report/html.rb +35 -13
data/lib/csv-diff-report/report.rb +4 -3
metadata +3 -3

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56cdc0f5cb3e6c6032e8cbd9de325bceede2a895
-  data.tar.gz: 729b39b7a6373da8fd499d228930a01fbce695d0
+  metadata.gz: 62b8aefdb52e2872454da14a06c24fa6619f164b
+  data.tar.gz: 7224773cd94a741c278990ab924bb5aea3b8fbde
 SHA512:
-  metadata.gz: 3650d3644596522ee283c80c792d3c3d35832ed630843ef02492708911e09683c1c3d58fe8023664b995e3dd5c4d46eeec347b8c991df15cf8c1006f9f82355b
-  data.tar.gz: 1747526e29d2dd0fabe3a20bc8dbadaa405d506ab56ccb822610f516b383897c697cf3407f7ed5cd5cc5868106f621b2c4a3b2894faf95a0f60632b78435a045
+  metadata.gz: 881ef630cda8f08a5d766190a884b8224b12377bd507abc2a934283a4c3f678318f4ac64d194d576e361b7137f65ca5e407a4249dba8c2c86cdbf66ba532747d
+  data.tar.gz: fe758fdb2ee804dfa627c8b4397307e80f385aedbd34b2816683b9f0441744dcc901f80320e98b64e88234e8c1be199f2519a95f1219e487ac8dc9836c49a3a5

data/lib/csv-diff-report/cli.rb CHANGED

@@ -67,6 +67,8 @@ class CSVDiff
             short_key: 'i'
         usage_break 'Diff Options:'
+        keyword_arg :options_file, 'Path to an options file that contains settings based on file types. ' +
+            'Defaults to searching for a file named .csvdiff in the FROM or current directory.'
         flag_arg :ignore_case, 'If true, field comparisons are performed without regard to case.'
         flag_arg :diff_common_fields_only, 'If true, only fields in both files are compared.',
             short_key: 'C'
@@ -90,7 +92,7 @@ class CSVDiff
             short_key: 'o'
         keyword_arg :output_fields, 'The names or indexes of the fields to include in the diff output.',
             short_key: 'O', on_parse: :parse_fields
-        keyword_arg :include_matched, 'If true, fields that match on lines with differences are included ' +
+        flag_arg :include_matched, 'If true, fields that match on lines with differences are included ' +
             'in the diff output; by default, matching fields are not included in the diff output.'

data/lib/csv-diff-report/html.rb CHANGED

@@ -1,4 +1,8 @@
 require 'cgi'
+begin
+    require 'lcs-diff'
+rescue LoadError
+end
 class CSVDiff
@@ -14,11 +18,13 @@ class CSVDiff
             content << '<html>'
             content << '<head>'
             content << '<title>Diff Report</title>'
-            content << '<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">'
+            content << '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
             content << html_styles
             content << '</head>'
             content << '<body>'
+            @lcs_available = !!defined?(Diff::LCS)
             html_summary(content)
             @diffs.each do |file_diff|
                 html_diff(content, file_diff) if file_diff.diffs.size > 0
@@ -38,14 +44,15 @@ class CSVDiff
         def html_styles
             style = <<-EOT
                 <style>
-                    @font-face {font-family: Calibri;}
+                    @font-face {font-family: Calibri, Helvetica, sans-serif;}
-                    h1 {font-family: Calibri; font-size: 16pt;}
-                    h2 {font-family: Calibri; font-size: 14pt; margin: 1em 0em .2em;}
-                    h3 {font-family: Calibri; font-size: 12pt; margin: 1em 0em .2em;}
-                    body {font-family: Calibri; font-size: 11pt;}
+                    h1 {font-family: Calibri, Helvetica, sans-serif; font-size: 16pt;}
+                    h2 {font-family: Calibri, Helvetica, sans-serif; font-size: 14pt; margin: 1em 0em .2em;}
+                    h3 {font-family: Calibri, Helvetica, sans-serif; font-size: 12pt; margin: 1em 0em .2em;}
+                    body {font-family: Calibri, Helvetica, sans-serif; font-size: 11pt;}
                     p {margin: .2em 0em;}
-                    table {font-family: Calibri; font-size: 10pt; line-height: 12pt; border-collapse: collapse;}
+                    code {font-size: 8pt; white-space: pre;}
+                    table {font-family: Calibri, Helvetica, sans-serif; font-size: 10pt; line-height: 12pt; border-collapse: collapse;}
                     th {background-color: #00205B; color: white; font-size: 11pt; font-weight: bold; text-align: left;
                         border: 1px solid #DDDDFF; padding: 1px 5px;}
                     td {border: 1px solid #DDDDFF; padding: 1px 5px;}
@@ -69,7 +76,9 @@ class CSVDiff
         def html_summary(body)
             body << '<h2>Summary</h2>'
-            body << '<p>Source Locations:</p>'
+            body << "<p>Diff report generated at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}.</p>"
+            body << '<h3>Source Locations</h3>'
             body << '<table>'
             body << '<tbody>'
             body << "<tr><th>From:</th><td>#{@left}</td></tr>"
@@ -77,7 +86,7 @@ class CSVDiff
             body << '</tbody>'
             body << '</table>'
             body << '<br>'
-            body << '<p>Files:</p>'
+            body << '<h3>Files</hs>'
             body << '<table>'
             body << '<thead>'
             body << "<tr><th rowspan=2>File</th><th colspan=2 class='center'>Lines</th><th colspan=4 class='center'>Diffs</th></tr>"
@@ -160,12 +169,25 @@ class CSVDiff
                         style = chg.downcase if i == 1
                     elsif file_diff.options[:include_matched]
                         style = 'matched'
-                        d = file_diff.right[key] && file_diff.right[key][field]
+                        new = file_diff.right[key] && file_diff.right[key][field]
                     end
                     body << '<td>'
-                    body << "<span class='delete'>#{CGI.escapeHTML(old.to_s)}</span>" if old
-                    body << '<br>' if old && old.to_s.length > 10
-                    body << "<span#{style ? " class='#{style}'" : ''}>#{CGI.escapeHTML(new.to_s)}</span>"
+                    if style == 'update' && @lcs_available && old && new && (old.to_s.lines.count > 1 || new.to_s.lines.count > 1)
+                        body << '<code>'
+                        Diff::LCS.diff(old.lines, new.lines).each_with_index do |chg_set, j|
+                            body << '...' unless j == 0
+                            chg_set.each do |lcs_diff|
+                                body << "#{lcs_diff.position}&nbsp;&nbsp;<span class='#{
+                                    lcs_diff.action == '+' ? 'add' : 'delete'}'>#{
+                                    CGI.escapeHTML(lcs_diff.element.to_s.chomp)}</span>"
+                            end
+                        end
+                        body << '</code>'
+                    else
+                        body << "<span class='delete'>#{CGI.escapeHTML(old.to_s)}</span>" if old
+                        body << '<br>' if old && old.to_s.length > 10
+                        body << "<span#{style ? " class='#{style}'" : ''}>#{CGI.escapeHTML(new.to_s)}</span>"
+                    end
                     body << '</td>'
                 end
                 body << '</tr>'

data/lib/csv-diff-report/report.rb CHANGED

@@ -83,13 +83,13 @@ class CSVDiff
                 echo "Performing file diff:"
                 echo "  From File:    #{@left}"
                 echo "  To File:      #{@right}"
-                opt_file = load_opt_file(@left.dirname)
+                opt_file = load_opt_file(options.fetch(:options_file, @left.dirname))
                 diff_file(@left.to_s, @right.to_s, options, opt_file)
             elsif @left.directory? && @right.directory?
                 echo "Performing directory diff:"
                 echo "  From directory:  #{@left}"
                 echo "  To directory:    #{@right}"
-                opt_file = load_opt_file(@left)
+                opt_file = load_opt_file(options.fetch(:options_file, @left))
                 if fts = options[:file_types]
                     file_types = find_matching_file_types(fts, opt_file)
                     file_types.each do |file_type|
@@ -133,7 +133,8 @@ class CSVDiff
         # Loads an options file from +dir+
         def load_opt_file(dir)
-            opt_path = Pathname(dir + '.csvdiff')
+            opt_path = Pathname(dir)
+            opt_path += '.csvdiff' if opt_path.directory?
             opt_path = Pathname('.csvdiff') unless opt_path.exist?
             if opt_path.exist?
                 echo "Loading options from '#{opt_path}'"

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv-diff-report
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.1
 platform: ruby
 authors:
 - Adam Gardiner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv-diff
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key:
 specification_version: 4
 summary: CSV Diff Report is a library for generating diff reports using the CSV Diff