daff 1.3.19 → 1.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5779d0129f0184e4c86479f7440a1e2c8505f872
-  data.tar.gz: 52eb0674f40911afc12b9b9ed0ac56f22a0926c6
+  metadata.gz: 789c2b60552eec41ff58691630caade704b305ef
+  data.tar.gz: 9952f96cbeb8c69fb24ef6986bf331262a7afa45
 SHA512:
-  metadata.gz: 822b821a2b9dd5feb1539b5a5c72797e91c5829cdabd0c5dcb50f150d7df0a22d40e407b3385567f33254a204d77d2bef18daf9f3948c96d1cc1e2d59da3232a
-  data.tar.gz: 44d38a2e32fdf8f2e47bc112f206268f996c88e1b6e6b3dce25019a7c905dafb562f59a4330458b95ca888f5316cd697027831b83c3ac310b3627836c878ae41
+  metadata.gz: c7e34325bb072173c308b36003d75247c715b12ce43cb4f86c6cb61cd0ff7ec21ef58f9ba99ee9df03ef4e7524731b6bf5414a2788a225301ce00531398f6c5f
+  data.tar.gz: 0d1324b67cb9a37853fcf7af02c5357153d9b23fc9c53e7629e17ae9cc6f4415cee46d8c22a414bf425743f34fe7d90548f8c3fd550ceb4ff4fc2c8a6adb0c36

data/lib/daff.rb

@@ -16,14 +16,14 @@ def haxe_me(source_name)
   end
   old_get = instance_method(:[]) rescue nil
   define_method(:[]) do |x|
-    return old_get.bind(self).(x) if x.is_a?(Fixnum)
+    return old_get.bind(self).(x) if x.is_a?(Integer)
     tag = _haxe_vars_[x]
     return instance_variable_get(tag) if tag
     method x
   end
   old_set = instance_method(:[]=) rescue nil
   define_method(:[]=) do |x,y|
-    return old_set.bind(self).(x,y) if x.is_a?(Fixnum)
+    return old_set.bind(self).(x,y) if x.is_a?(Integer)
     instance_variable_set(_haxe_vars_[x],y)
   end
   define_method(:haxe_name) do
@@ -57,10 +57,12 @@ require_relative 'lib/coopy/combined_table_body'
 require_relative 'lib/coopy/combined_table_head'
 require_relative 'lib/coopy/compare_flags'
 require_relative 'lib/coopy/compare_table'
+require_relative 'lib/coopy/conflict_info'
 require_relative 'lib/coopy/coopy'
 require_relative 'lib/coopy/cross_match'
 require_relative 'lib/coopy/csv'
 require_relative 'lib/coopy/diff_render'
+require_relative 'lib/coopy/diff_summary'
 require_relative 'lib/coopy/flat_cell_builder'
 require_relative 'lib/coopy/row'
 require_relative 'lib/coopy/highlight_patch'

data/lib/lib/coopy/compare_table.rb

@@ -425,7 +425,10 @@ module Coopy
           align.link(-1,i3) if !used.include?(i3)
         end
       end
-      align.link(0,0) if ha > 0 && hb > 0
+      if ha > 0 && hb > 0 
+        align.link(0,0)
+        align.headers(0,0)
+      end
     end
     
     def align_columns(align,a,b)

data/lib/lib/coopy/conflict_info.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class ConflictInfo 
+    
+    def initialize(row,col,pvalue,lvalue,rvalue)
+      @row = row
+      @col = col
+      @pvalue = pvalue
+      @lvalue = lvalue
+      @rvalue = rvalue
+    end
+    
+    attr_accessor :row
+    attr_accessor :col
+    attr_accessor :pvalue
+    attr_accessor :lvalue
+    attr_accessor :rvalue
+  haxe_me ["coopy", "ConflictInfo"]
+  end
+
+end

data/lib/lib/coopy/coopy.rb

@@ -13,6 +13,7 @@ module Coopy
     
     attr_accessor :format_preference
     attr_accessor :delim_preference
+    attr_accessor :csv_eol_preference
     attr_accessor :extern_preference
     attr_accessor :output_format
     attr_accessor :output_format_set
@@ -31,6 +32,7 @@ module Coopy
       @extern_preference = false
       @format_preference = nil
       @delim_preference = nil
+      @csv_eol_preference = nil
       @output_format = "copy"
       @output_format_set = false
       @nested_output = false
@@ -67,6 +69,10 @@ module Coopy
           when "ssv"
             @format_preference = "csv"
             @delim_preference = ";"
+            @format_preference = "csv"
+          when "psv"
+            @format_preference = "csv"
+            @delim_preference = [128169].pack("U")
           when "sqlite3"
             @format_preference = "sqlite"
           when "sqlite"
@@ -133,7 +139,7 @@ module Coopy
       @format_preference = "csv" if @format_preference == "sqlite" && !@extern_preference
       if render == nil 
         if @format_preference == "csv" 
-          csv = ::Coopy::Csv.new(@delim_preference)
+          csv = ::Coopy::Csv.new(@delim_preference,@csv_eol_preference)
           txt = csv.render_table(t)
         elsif @format_preference == "ndjson" 
           txt = ::Coopy::Ndjson.new(t).render
@@ -153,12 +159,12 @@ module Coopy
       txt
     end
     
-    def save_tables(name,os,use_color)
+    def save_tables(name,os,use_color,is_diff)
       self.set_format(@output_format) if @output_format != "copy"
       txt = ""
       self.check_format(name)
       render = nil
-      render = ::Coopy::TerminalDiffRender.new(@flags) if use_color
+      render = ::Coopy::TerminalDiffRender.new(@flags,@delim_preference,is_diff) if use_color
       order = os.get_order
       return self.save_table(name,os.one,render) if order.length == 1
       return self.render_tables(name,os) if @format_preference == "html" || @format_preference == "www"
@@ -270,22 +276,27 @@ module Coopy
       output
     end
     
-    def run_diff(parent,a,b,flags,output)
-      ct = ::Coopy::Coopy.compare_tables3(parent,a,b,flags)
-      align = ct.align
-      td = ::Coopy::TableDiff.new(align,flags)
-      o = ::Coopy::SimpleTable.new(0,0)
-      os = ::Coopy::Tables.new(o)
-      td.hilite_with_nesting(os)
+    def use_color(flags,output)
       use_color = flags.terminal_format == "ansi"
       if flags.terminal_format == nil 
-        if (output == nil || output == "-") && (@output_format == "copy" || @output_format == "csv") 
+        if (output == nil || output == "-") && (@output_format == "copy" || @output_format == "csv" || @output_format == "psv") 
           if @io != nil 
             use_color = @io.is_tty if @io.is_tty_known
           end
         end
       end
-      self.save_tables(output,os,use_color)
+      use_color
+    end
+    
+    def run_diff(parent,a,b,flags,output)
+      ct = ::Coopy::Coopy.compare_tables3(parent,a,b,flags)
+      align = ct.align
+      td = ::Coopy::TableDiff.new(align,flags)
+      o = ::Coopy::SimpleTable.new(0,0)
+      os = ::Coopy::Tables.new(o)
+      td.hilite_with_nesting(os)
+      use_color = self.use_color(flags,output)
+      self.save_tables(output,os,use_color,true)
     end
     
     public
@@ -322,6 +333,7 @@ module Coopy
       csv = ::Coopy::Csv.new(@delim_preference)
       output = ::Coopy::SimpleTable.new(0,0)
       csv.parse_table(txt,output)
+      @csv_eol_preference = csv.get_discovered_eol if @csv_eol_preference == nil
       output.trim_blank if output != nil
       output
     end
@@ -658,6 +670,24 @@ module Coopy
               @flags.padding_strategy = args[i + 1]
               args.slice!(i,2)
               break
+            elsif tag == "-e" || tag == "--eol" 
+              more = true
+              ending = args[i + 1]
+              if ending == "crlf" 
+                ending = "\r\n"
+              elsif ending == "lf" 
+                ending = "\n"
+              elsif ending == "cr" 
+                ending = "\r"
+              elsif ending == "auto" 
+                ending = nil
+              else 
+                io.write_stderr("Expected line ending of either 'crlf' or 'lf' but got " + _hx_str(ending) + "\n")
+                return 1
+              end
+              @csv_eol_preference = ending
+              args.slice!(i,2)
+              break
             end
           end
         end
@@ -692,57 +722,69 @@ module Coopy
           io.write_stderr("\n")
           return 0
         end
-        io.write_stderr("daff can produce and apply tabular diffs.\n")
-        io.write_stderr("Call as:\n")
-        io.write_stderr("  daff [--color] [--no-color] [--output OUTPUT.csv] a.csv b.csv\n")
-        io.write_stderr("  daff [--output OUTPUT.html] a.csv b.csv\n")
-        io.write_stderr("  daff [--output OUTPUT.csv] parent.csv a.csv b.csv\n")
-        io.write_stderr("  daff [--output OUTPUT.ndjson] a.ndjson b.ndjson\n")
-        io.write_stderr("  daff [--www] a.csv b.csv\n")
-        io.write_stderr("  daff patch [--inplace] [--output OUTPUT.csv] a.csv patch.csv\n")
-        io.write_stderr("  daff merge [--inplace] [--output OUTPUT.csv] parent.csv a.csv b.csv\n")
-        io.write_stderr("  daff trim [--output OUTPUT.csv] source.csv\n")
-        io.write_stderr("  daff render [--output OUTPUT.html] diff.csv\n")
-        io.write_stderr("  daff copy in.csv out.tsv\n")
-        io.write_stderr("  daff git\n")
-        io.write_stderr("  daff version\n")
-        io.write_stderr("\n")
-        io.write_stderr("The --inplace option to patch and merge will result in modification of a.csv.\n")
-        io.write_stderr("\n")
-        io.write_stderr("If you need more control, here is the full list of flags:\n")
-        io.write_stderr("  daff diff [--output OUTPUT.csv] [--context NUM] [--all] [--act ACT] a.csv b.csv\n")
-        io.write_stderr("     --act ACT:     show only a certain kind of change (update, insert, delete)\n")
-        io.write_stderr("     --all:         do not prune unchanged rows or columns\n")
-        io.write_stderr("     --all-rows:    do not prune unchanged rows\n")
-        io.write_stderr("     --all-columns: do not prune unchanged columns\n")
-        io.write_stderr("     --color:       highlight changes with terminal colors (default in terminals)\n")
-        io.write_stderr("     --context NUM: show NUM rows of context\n")
-        io.write_stderr("     --id:          specify column to use as primary key (repeat for multi-column key)\n")
-        io.write_stderr("     --ignore:      specify column to ignore completely (can repeat)\n")
-        io.write_stderr("     --index:       include row/columns numbers from original tables\n")
-        io.write_stderr("     --input-format [csv|tsv|ssv|json]: set format to expect for input\n")
-        io.write_stderr("     --no-color:    make sure terminal colors are not used\n")
-        io.write_stderr("     --ordered:     assume row order is meaningful (default for CSV)\n")
-        io.write_stderr("     --output-format [csv|tsv|ssv|json|copy|html]: set format for output\n")
-        io.write_stderr("     --padding [dense|sparse|smart]: set padding method for aligning columns\n")
-        io.write_stderr("     --table NAME:  compare the named table, used with SQL sources\n")
-        io.write_stderr("     --unordered:   assume row order is meaningless (default for json formats)\n")
-        io.write_stderr("     -w / --ignore-whitespace: ignore changes in leading/trailing whitespace\n")
-        io.write_stderr("     -i / --ignore-case: ignore differences in case\n")
-        io.write_stderr("\n")
-        io.write_stderr("  daff render [--output OUTPUT.html] [--css CSS.css] [--fragment] [--plain] diff.csv\n")
-        io.write_stderr("     --css CSS.css: generate a suitable css file to go with the html\n")
-        io.write_stderr("     --fragment:    generate just a html fragment rather than a page\n")
-        io.write_stderr("     --plain:       do not use fancy utf8 characters to make arrows prettier\n")
-        io.write_stderr("     --www:         send output to a browser\n")
-        return 1
+        if args.length < 1 
+          io.write_stderr("daff can produce and apply tabular diffs.\n")
+          io.write_stderr("Call as:\n")
+          io.write_stderr("  daff [--color] [--no-color] [--output OUTPUT.csv] a.csv b.csv\n")
+          io.write_stderr("  daff [--output OUTPUT.html] a.csv b.csv\n")
+          io.write_stderr("  daff [--output OUTPUT.csv] parent.csv a.csv b.csv\n")
+          io.write_stderr("  daff [--output OUTPUT.ndjson] a.ndjson b.ndjson\n")
+          io.write_stderr("  daff [--www] a.csv b.csv\n")
+          io.write_stderr("  daff patch [--inplace] [--output OUTPUT.csv] a.csv patch.csv\n")
+          io.write_stderr("  daff merge [--inplace] [--output OUTPUT.csv] parent.csv a.csv b.csv\n")
+          io.write_stderr("  daff trim [--output OUTPUT.csv] source.csv\n")
+          io.write_stderr("  daff render [--output OUTPUT.html] diff.csv\n")
+          io.write_stderr("  daff copy in.csv out.tsv\n")
+          io.write_stderr("  daff in.csv\n")
+          io.write_stderr("  daff git\n")
+          io.write_stderr("  daff version\n")
+          io.write_stderr("\n")
+          io.write_stderr("The --inplace option to patch and merge will result in modification of a.csv.\n")
+          io.write_stderr("\n")
+          io.write_stderr("If you need more control, here is the full list of flags:\n")
+          io.write_stderr("  daff diff [--output OUTPUT.csv] [--context NUM] [--all] [--act ACT] a.csv b.csv\n")
+          io.write_stderr("     --act ACT:     show only a certain kind of change (update, insert, delete)\n")
+          io.write_stderr("     --all:         do not prune unchanged rows or columns\n")
+          io.write_stderr("     --all-rows:    do not prune unchanged rows\n")
+          io.write_stderr("     --all-columns: do not prune unchanged columns\n")
+          io.write_stderr("     --color:       highlight changes with terminal colors (default in terminals)\n")
+          io.write_stderr("     --context NUM: show NUM rows of context\n")
+          io.write_stderr("     --id:          specify column to use as primary key (repeat for multi-column key)\n")
+          io.write_stderr("     --ignore:      specify column to ignore completely (can repeat)\n")
+          io.write_stderr("     --index:       include row/columns numbers from original tables\n")
+          io.write_stderr("     --input-format [csv|tsv|ssv|psv|json]: set format to expect for input\n")
+          io.write_stderr("     --eol [crlf|lf|cr|auto]: separator between rows of csv output.\n")
+          io.write_stderr("     --no-color:    make sure terminal colors are not used\n")
+          io.write_stderr("     --ordered:     assume row order is meaningful (default for CSV)\n")
+          io.write_stderr("     --output-format [csv|tsv|ssv|psv|json|copy|html]: set format for output\n")
+          io.write_stderr("     --padding [dense|sparse|smart]: set padding method for aligning columns\n")
+          io.write_stderr("     --table NAME:  compare the named table, used with SQL sources\n")
+          io.write_stderr("     --unordered:   assume row order is meaningless (default for json formats)\n")
+          io.write_stderr("     -w / --ignore-whitespace: ignore changes in leading/trailing whitespace\n")
+          io.write_stderr("     -i / --ignore-case: ignore differences in case\n")
+          io.write_stderr("\n")
+          io.write_stderr("  daff render [--output OUTPUT.html] [--css CSS.css] [--fragment] [--plain] diff.csv\n")
+          io.write_stderr("     --css CSS.css: generate a suitable css file to go with the html\n")
+          io.write_stderr("     --fragment:    generate just a html fragment rather than a page\n")
+          io.write_stderr("     --plain:       do not use fancy utf8 characters to make arrows prettier\n")
+          io.write_stderr("     --www:         send output to a browser\n")
+          return 1
+        end
       end
       cmd1 = args[0]
       offset = 1
       if !Lambda.has(["diff","patch","merge","trim","render","git","version","copy"],cmd1) 
-        if (cmd1.index(".",nil || 0) || -1) != -1 || (cmd1.index("--",nil || 0) || -1) == 0 
+        if (cmd1.index("--",nil || 0) || -1) == 0 
           cmd1 = "diff"
           offset = 0
+        elsif (cmd1.index(".",nil || 0) || -1) != -1 
+          if args.length == 2 
+            cmd1 = "diff"
+            offset = 0
+          elsif args.length == 1 
+            cmd1 = "copy"
+            offset = 0
+          end
         end
       end
       if cmd1 == "git" 
@@ -816,7 +858,9 @@ module Coopy
       elsif cmd1 == "render" 
         self.render_table(output,a)
       elsif cmd1 == "copy" 
-        self.save_table(output,a)
+        os = ::Coopy::Tables.new(a)
+        os.add("untitled")
+        self.save_tables(output,os,self.use_color(@flags,output),false)
       end
       if ok 
         return 0
@@ -835,7 +879,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.3.19"
+    @version = "1.3.25"
     
     def Coopy.diff_as_html(local,remote,flags = nil)
       comp = ::Coopy::TableComparisonState.new

data/lib/lib/coopy/csv.rb

@@ -4,7 +4,7 @@
 module Coopy
   class Csv 
     
-    def initialize(delim = ",")
+    def initialize(delim = ",",eol = nil)
       @cursor = 0
       @row_ended = false
       if delim == nil 
@@ -12,6 +12,8 @@ module Coopy
       else 
         @delim = delim
       end
+      @discovered_eol = nil
+      @preferred_eol = eol
     end
     
     protected
@@ -20,10 +22,14 @@ module Coopy
     attr_accessor :row_ended
     attr_accessor :has_structure
     attr_accessor :delim
+    attr_accessor :discovered_eol
+    attr_accessor :preferred_eol
     
     public
     
     def render_table(t)
+      eol = @preferred_eol
+      eol = "\r\n" if eol == nil
       result = ""
       txt = ""
       v = t.get_cell_view
@@ -39,7 +45,7 @@ module Coopy
             txt += self.render_cell(v,stream.get_cell(x))
           end
         end
-        txt += "\r\n"
+        txt += eol
       end
       txt
     end
@@ -48,17 +54,45 @@ module Coopy
       return "NULL" if d == nil
       str = v.to_s(d)
       need_quote = false
-      begin
+      if str.length > 0 
+        need_quote = true if str[0] == " " || str[str.length - 1] == " "
+      end
+      if !need_quote 
         _g1 = 0
         _g = str.length
         while(_g1 < _g) 
           i = _g1
           _g1+=1
           ch = str[i]
-          if ch == "\"" || ch == "'" || ch == @delim || ch == "\r" || ch == "\n" || ch == "\t" || ch == " " 
+          if ch == "\"" || ch == "'" || ch == "\r" || ch == "\n" || ch == "\t" 
             need_quote = true
             break
           end
+          if ch == @delim[0] 
+            if @delim.length == 1 
+              need_quote = true
+              break
+            end
+            if i + @delim.length <= str.length 
+              match = true
+              begin
+                _g3 = 1
+                _g2 = @delim.length
+                while(_g3 < _g2) 
+                  j = _g3
+                  _g3+=1
+                  if str[i + j] != @delim[j] 
+                    match = false
+                    break
+                  end
+                end
+              end
+              if match 
+                need_quote = true
+                break
+              end
+            end
+          end
         end
       end
       result = ""
@@ -66,8 +100,8 @@ module Coopy
       line_buf = ""
       begin
         _g11 = 0
-        _g2 = str.length
-        while(_g11 < _g2) 
+        _g4 = str.length
+        while(_g11 < _g4) 
           i1 = _g11
           _g11+=1
           ch1 = str[i1]
@@ -165,14 +199,39 @@ module Coopy
           first_non_underscore = i if ch != 95 && i < first_non_underscore
           if @has_structure 
             if !quoting 
-              break if ch == (@delim[0].ord rescue nil)
+              if ch == (@delim[0].ord rescue nil) 
+                break if @delim.length == 1
+                if i + @delim.length <= txt.length 
+                  match = true
+                  begin
+                    _g3 = 1
+                    _g2 = @delim.length
+                    while(_g3 < _g2) 
+                      j = _g3
+                      _g3+=1
+                      if txt[i + j] != @delim[j] 
+                        match = false
+                        break
+                      end
+                    end
+                  end
+                  if match 
+                    last_processed += @delim.length - 1
+                    break
+                  end
+                end
+              end
               if ch == 13 || ch == 10 
                 ch2 = (txt[i + 1].ord rescue nil)
                 if ch2 != nil 
                   if ch2 != ch 
-                    last_processed+=1 if ch2 == 13 || ch2 == 10
+                    if ch2 == 13 || ch2 == 10 
+                      @discovered_eol = _hx_str([ch].pack("U")) + _hx_str([ch2].pack("U")) if @discovered_eol == nil
+                      last_processed+=1
+                    end
                   end
                 end
+                @discovered_eol = [ch].pack("U") if @discovered_eol == nil
                 @row_ended = true
                 break
               end
@@ -217,6 +276,14 @@ module Coopy
       self.parse_cell_part(txt)
     end
     
+    def get_discovered_eol 
+      @discovered_eol
+    end
+    
+    def set_preferred_eol(eol)
+      @preferred_eol = eol
+    end
+    
   haxe_me ["coopy", "Csv"]
   end
 

data/lib/lib/coopy/diff_summary.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class DiffSummary 
+    
+    def initialize
+    end
+    
+    attr_accessor :row_deletes
+    attr_accessor :row_inserts
+    attr_accessor :row_updates
+    attr_accessor :row_reorders
+    attr_accessor :col_deletes
+    attr_accessor :col_inserts
+    attr_accessor :col_updates
+    attr_accessor :col_renames
+    attr_accessor :col_reorders
+    attr_accessor :row_count_initial_with_header
+    attr_accessor :row_count_final_with_header
+    attr_accessor :row_count_initial
+    attr_accessor :row_count_final
+    attr_accessor :col_count_initial
+    attr_accessor :col_count_final
+  haxe_me ["coopy", "DiffSummary"]
+  end
+
+end

data/lib/lib/coopy/merger.rb

@@ -26,6 +26,7 @@ module Coopy
     attr_accessor :column_mix_local
     attr_accessor :column_mix_remote
     attr_accessor :conflicts
+    attr_accessor :conflict_infos
     
     def shuffle_dimension(dim_units,len,fate,cl,cr)
       at = 0
@@ -98,6 +99,7 @@ module Coopy
     
     def apply 
       @conflicts = 0
+      @conflict_infos = Array.new
       ct = ::Coopy::Coopy.compare_tables3(@parent,@local,@remote)
       align = ct.align
       @order = align.to_order
@@ -130,6 +132,7 @@ module Coopy
                   else 
                     @local.set_cell(col.l,row.l,::Coopy::Merger.make_conflicted_cell(view,pcell,lcell,rcell))
                     @conflicts+=1
+                    self.add_conflict_info(row.l,col.l,view,pcell,lcell,rcell)
                   end
                 end
               end
@@ -174,8 +177,16 @@ module Coopy
       @conflicts
     end
     
+    def get_conflict_infos 
+      @conflict_infos
+    end
+    
     # protected - in ruby this doesn't play well with static/inline methods
     
+    def add_conflict_info(row,col,view,pcell,lcell,rcell)
+      @conflict_infos.push(::Coopy::ConflictInfo.new(row,col,view.to_s(pcell),view.to_s(lcell),view.to_s(rcell)))
+    end
+    
     def Merger.make_conflicted_cell(view,pcell,lcell,rcell)
       view.to_datum("((( " + _hx_str(view.to_s(pcell)) + " ))) " + _hx_str(view.to_s(lcell)) + " /// " + _hx_str(view.to_s(rcell)))
     end

data/lib/lib/coopy/mover.rb

@@ -157,8 +157,8 @@ module Coopy
       end
       blks.sort! {|a,b|
         diff = blk_len[b] - blk_len[a]
-        return diff if diff != 0
-        a - b
+        diff = a - b if diff == 0
+        diff
       }
       moved = Array.new
       while(blks.length > 0) 

data/lib/lib/coopy/table_diff.rb

@@ -51,6 +51,16 @@ module Coopy
     attr_accessor :diff_found
     attr_accessor :schema_diff_found
     attr_accessor :preserve_columns
+    attr_accessor :row_deletes
+    attr_accessor :row_inserts
+    attr_accessor :row_updates
+    attr_accessor :row_reorders
+    attr_accessor :col_deletes
+    attr_accessor :col_inserts
+    attr_accessor :col_updates
+    attr_accessor :col_renames
+    attr_accessor :col_reorders
+    attr_accessor :column_units_updated
     attr_accessor :nested
     attr_accessor :nesting_present
     
@@ -267,6 +277,16 @@ module Coopy
       @top_line_done = false
       @diff_found = false
       @schema_diff_found = false
+      @row_deletes = 0
+      @row_inserts = 0
+      @row_updates = 0
+      @row_reorders = 0
+      @col_deletes = 0
+      @col_inserts = 0
+      @col_updates = 0
+      @col_renames = 0
+      @col_reorders = 0
+      @column_units_updated = {}
     end
     
     def setup_tables 
@@ -445,6 +465,7 @@ module Coopy
             if @active_column != nil 
               @active_column[j] = 1 if @allow_update
             end
+            @col_inserts+=1 if @allow_update
           end
           if cunit.r < 0 && cunit.lp >= 0 
             @have_schema = true
@@ -452,6 +473,7 @@ module Coopy
             if @active_column != nil 
               @active_column[j] = 1 if @allow_update
             end
+            @col_deletes+=1 if @allow_update
           end
           if cunit.r >= 0 && cunit.lp >= 0 
             if @p.get_height >= @rp_header && @b.get_height >= @rb_header 
@@ -462,7 +484,10 @@ module Coopy
                 act = "("
                 act += @v.to_s(pp)
                 act += ")"
-                @active_column[j] = 1 if @active_column != nil
+                if @active_column != nil 
+                  @active_column[j] = 1
+                  @col_renames+=1
+                end
               end
             end
           end
@@ -470,6 +495,7 @@ module Coopy
             act = ":" + _hx_str(act)
             @have_schema = true
             @active_column = nil if @active_column != nil
+            @col_reorders+=1
           end
           @schema.push(act)
         end
@@ -823,7 +849,8 @@ module Coopy
       [ll_out,rr_out,pp_out]
     end
     
-    def scan_row(unit,output,at,i)
+    def scan_row(unit,output,at,i,out)
+      row_update = false
       begin
         _g1 = 0
         _g = @column_units.length
@@ -898,6 +925,10 @@ module Coopy
           end
           cell = dd
           if have_dd_to && @allow_update 
+            if !row_update 
+              @row_updates+=1 if out == 0
+              row_update = true
+            end
             @active_column[j] = 1 if @active_column != nil
             if @sep == "" 
               if @builder.need_separator 
@@ -926,6 +957,10 @@ module Coopy
               cell = @builder.conflict(dd,dd_to_alt,dd_to)
               @act = @conflict_sep
             end
+            if !@column_units_updated.include?(j) 
+              @column_units_updated[j] = true
+              @col_updates+=1
+            end
           end
           @act = "+" if @act == "" && @have_addition
           if @act == "+++" 
@@ -1019,8 +1054,9 @@ module Coopy
               @publish = @flags.show_unchanged
               dummy = false
               if out == 1 
-                @publish = @active_row[i] > 0
-                dummy = @active_row[i] == 3
+                value = @active_row[i]
+                @publish = value != nil && value > 0
+                dummy = value != nil && value == 3
                 next if dummy && showed_dummy
                 next if !@publish
               end
@@ -1046,14 +1082,19 @@ module Coopy
               @have_addition = false
               skip = false
               @act = ""
-              @act = ":" if reordered
+              if reordered 
+                @act = ":"
+                @row_reorders+=1 if out == 0
+              end
               if unit.p < 0 && unit.l < 0 && unit.r >= 0 
                 skip = true if !@allow_insert
                 @act = "+++"
+                @row_inserts+=1 if out == 0 && !skip
               end
               if (unit.p >= 0 || !@has_parent) && unit.l >= 0 && unit.r < 0 
                 skip = true if !@allow_delete
                 @act = "---"
+                @row_deletes+=1 if out == 0 && !skip
               end
               if skip 
                 if !@publish 
@@ -1061,7 +1102,7 @@ module Coopy
                 end
                 next
               end
-              self.scan_row(unit,output,at,i)
+              self.scan_row(unit,output,at,i,out)
             end
           end
         end
@@ -1118,6 +1159,26 @@ module Coopy
       @align.comp
     end
     
+    def get_summary 
+      ds = ::Coopy::DiffSummary.new
+      ds.row_deletes = @row_deletes
+      ds.row_inserts = @row_inserts
+      ds.row_updates = @row_updates
+      ds.row_reorders = @row_reorders
+      ds.col_deletes = @col_deletes
+      ds.col_inserts = @col_inserts
+      ds.col_updates = @col_updates
+      ds.col_renames = @col_renames
+      ds.col_reorders = @col_reorders
+      ds.row_count_initial_with_header = @align.get_source.get_height
+      ds.row_count_final_with_header = @align.get_target.get_height
+      ds.row_count_initial = @align.get_source.get_height - @align.get_source_header - 1
+      ds.row_count_final = @align.get_target.get_height - @align.get_target_header - 1
+      ds.col_count_initial = @align.get_source.get_width
+      ds.col_count_final = @align.get_target.get_width
+      ds
+    end
+    
   haxe_me ["coopy", "TableDiff"]
   end
 

data/lib/lib/coopy/terminal_diff_render.rb

@@ -4,7 +4,7 @@
 module Coopy
   class TerminalDiffRender 
     
-    def initialize(flags = nil)
+    def initialize(flags = nil,delim = nil,diff = true)
       @align_columns = true
       @wide_columns = false
       @use_glyphs = true
@@ -14,6 +14,12 @@ module Coopy
         @wide_columns = true if flags.padding_strategy == "sparse"
         @use_glyphs = flags.use_glyphs
       end
+      if delim != nil 
+        @delim = delim
+      else 
+        @delim = ","
+      end
+      @diff = diff
     end
     
     protected
@@ -26,6 +32,8 @@ module Coopy
     attr_accessor :wide_columns
     attr_accessor :use_glyphs
     attr_accessor :flags
+    attr_accessor :delim
+    attr_accessor :diff
     
     public
     
@@ -43,14 +51,14 @@ module Coopy
       @v = t.get_cell_view
       @codes = {}
       @codes["header"] = "\x1B[0;1m"
+      @codes["minor"] = "\x1B[33m"
+      @codes["done"] = "\x1B[0m"
       @codes["meta"] = "\x1B[0;1m"
       @codes["spec"] = "\x1B[35;1m"
       @codes["add"] = "\x1B[32;1m"
       @codes["conflict"] = "\x1B[33;1m"
       @codes["modify"] = "\x1B[34;1m"
       @codes["remove"] = "\x1B[31;1m"
-      @codes["minor"] = "\x1B[2m"
-      @codes["done"] = "\x1B[0m"
       sizes = nil
       sizes = self.pick_sizes(t) if @align_columns
       begin
@@ -65,7 +73,6 @@ module Coopy
             while(_g1 < w) 
               x = _g1
               _g1+=1
-              txt += _hx_str(@codes["minor"]) + "," + _hx_str(@codes["done"]) if x > 0
               if sizes != nil 
                 spaces = target - at
                 begin
@@ -78,6 +85,7 @@ module Coopy
                   end
                 end
               end
+              txt += _hx_str(@codes["minor"]) + _hx_str(@delim) + _hx_str(@codes["done"]) if x > 0
               txt += self.get_text(x,y,true)
               if sizes != nil 
                 bit = self.get_text(x,y,false)
@@ -101,7 +109,7 @@ module Coopy
     def get_text(x,y,color)
       val = @t.get_cell(x,y)
       cell = ::Coopy::DiffRender.render_cell(@t,@v,x,y)
-      if color 
+      if color && @diff 
         code = nil
         code = @codes[cell.category] if cell.category != nil
         if cell.category_given_tr != nil 
@@ -127,6 +135,8 @@ module Coopy
             val = _hx_str(code) + _hx_str(val.to_s) + _hx_str(@codes["done"])
           end
         end
+      elsif color && !@diff 
+        val = _hx_str(@codes["header"]) + _hx_str(val.to_s) + _hx_str(@codes["done"]) if y == 0
       elsif @use_glyphs 
         val = cell.pretty_value
       else 
@@ -159,7 +169,8 @@ module Coopy
               y = _g1
               _g1+=1
               txt = self.get_text(x,y,false)
-              row = y if txt == "@@" && row == -1
+              row = y if txt == "@@" && row == -1 && @diff
+              row = y if row == -1 && !@diff
               len = txt.length
               mmin = len if y == row
               m += len

data/lib/lib/rb/boot.rb

@@ -18,10 +18,10 @@ module Rb
     
     def Boot.__instanceof(o,cl)
       return false if cl == nil
-      if cl == Fixnum 
-        return o.is_a? Fixnum
+      if cl == Integer 
+        return o.is_a? Integer
       elsif cl == Float 
-        return o.is_a?(Float) || o.is_a?(Fixnum)
+        return o.is_a?(Float) || o.is_a?(Integer)
       elsif cl == TrueClass 
         return ((o.is_a? TrueClass)||(o.is_a? FalseClass))
       elsif cl == String 

data/lib/lib/type.rb

@@ -14,7 +14,7 @@
           return ValueType.tbool
         when "String"
           return ValueType.tclass(String)
-        when "Fixnum"
+        when "Integer"
           return ValueType.tint
         when "Float"
           return ValueType.tfloat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.3.19
+  version: 1.3.25
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -32,10 +32,12 @@ files:
 - lib/lib/coopy/combined_table_head.rb
 - lib/lib/coopy/compare_flags.rb
 - lib/lib/coopy/compare_table.rb
+- lib/lib/coopy/conflict_info.rb
 - lib/lib/coopy/coopy.rb
 - lib/lib/coopy/cross_match.rb
 - lib/lib/coopy/csv.rb
 - lib/lib/coopy/diff_render.rb
+- lib/lib/coopy/diff_summary.rb
 - lib/lib/coopy/flat_cell_builder.rb
 - lib/lib/coopy/highlight_patch.rb
 - lib/lib/coopy/highlight_patch_unit.rb
@@ -113,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master)](https://travis-ci.org/paulfitz/daff)