daff 1.1.16 → 1.1.19

data/lib/daff.rb

@@ -7,19 +7,39 @@ if ruby_major<1 || (ruby_major==1 && (ruby_minor<9 || (ruby_minor==9 && ruby_pat
   $stderr.puts "Your current Ruby version is: #{RUBY_VERSION}. Haxe/Ruby generates code for version 1.9.3 or later."
   Kernel.exit 1
 end
+def haxe_me
+  _haxe_vars_ = {}
+  instance_methods(false).grep(/=$/).each do |v|
+    _haxe_vars_[v.to_s[0..-2].to_sym] = ('@'+v.to_s[0..-2]).to_sym
+  end
+  define_method(:[]) do |x|
+    tag = _haxe_vars_[x]
+    return instance_variable_get(tag) if tag
+    method x
+  end
+  define_method(:[]=) do |x,y|
+    instance_variable_set(_haxe_vars_[x],y)
+  end
+  class << self
+    define_method(:[]) do |x|
+      method x
+    end
+  end
+end
 
 require 'date'
 require_relative 'lib/hx_overrides'
 require_relative 'lib/lambda'
 require_relative 'lib/list'
-require_relative 'lib/_list/list_iterator'
+require_relative 'lib/x_list/list_iterator'
 require_relative 'lib/reflect'
 require_relative 'lib/string_buf'
-require_relative 'lib/sys'
+require_relative 'lib/hx_sys'
 require_relative 'lib/value_type'
 require_relative 'lib/type'
 require_relative 'lib/coopy/alignment'
 require_relative 'lib/coopy/bag'
+require_relative 'lib/coopy/cell_builder'
 require_relative 'lib/coopy/cell_info'
 require_relative 'lib/coopy/change'
 require_relative 'lib/coopy/change_type'
@@ -30,6 +50,7 @@ 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/flat_cell_builder'
 require_relative 'lib/coopy/row'
 require_relative 'lib/coopy/highlight_patch'
 require_relative 'lib/coopy/highlight_patch_unit'
@@ -57,7 +78,6 @@ require_relative 'lib/coopy/viewed_datum'
 require_relative 'lib/coopy/viterbi'
 require_relative 'lib/coopy/workspace'
 require_relative 'lib/haxe/imap'
-require_relative 'lib/haxe/log'
 require_relative 'lib/haxe/ds/int_map'
 require_relative 'lib/haxe/ds/string_map'
 require_relative 'lib/haxe/format/json_parser'
@@ -73,7 +93,7 @@ require_relative 'lib/haxe/io/error'
 require_relative 'lib/rb/boot'
 require_relative 'lib/rb/ruby_iterator'
 require_relative 'lib/sys/io/file_handle'
-require_relative 'lib/sys/io/file'
+require_relative 'lib/sys/io/hx_file'
 require_relative 'lib/sys/io/file_output'
 
 

data/lib/lib/coopy/alignment.rb

@@ -174,7 +174,7 @@ module Coopy
       while(ct_vp > 0 || ct_vl > 0 || ct_vr > 0) 
         ct+=1
         if ct > max_ct 
-          ::Haxe::Log._trace.call("Ordering took too long, something went wrong",{ file_name: "Alignment.hx", line_number: 153, class_name: "coopy.Alignment", method_name: "toOrder3"})
+          puts "Ordering took too long, something went wrong"
           break
         end
         xp = 0 if xp >= hp
@@ -294,6 +294,7 @@ module Coopy
       return order
     end
     
+  haxe_me
   end
 
 end

data/lib/lib/coopy/bag.rb

@@ -6,6 +6,7 @@ module Coopy
     def get_size() puts "Abstract Bag.get_size called" end
     def getItem(x) puts "Abstract Bag.getItem called" end
     def getItemView() puts "Abstract Bag.getItemView called" end
+  haxe_me
   end
 
 end

data/lib/lib/coopy/cell_builder.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class CellBuilder 
+    def needSeparator() puts "Abstract CellBuilder.needSeparator called" end
+    def setSeparator(separator) puts "Abstract CellBuilder.setSeparator called" end
+    def setConflictSeparator(separator) puts "Abstract CellBuilder.setConflictSeparator called" end
+    def setView(view) puts "Abstract CellBuilder.setView called" end
+    def update(local,remote) puts "Abstract CellBuilder.update called" end
+    def conflict(parent,local,remote) puts "Abstract CellBuilder.conflict called" end
+    def marker(label) puts "Abstract CellBuilder.marker called" end
+    def links(unit) puts "Abstract CellBuilder.links called" end
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/cell_info.rb

@@ -25,6 +25,7 @@ module Coopy
       return _hx_str(@pvalue) + "||" + _hx_str(@lvalue) + "::" + _hx_str(@rvalue)
     end
     
+  haxe_me
   end
 
 end

data/lib/lib/coopy/change.rb

@@ -43,6 +43,7 @@ module Coopy
       end
     end
     
+  haxe_me
   end
 
 end

data/lib/lib/coopy/compare.rb

@@ -93,6 +93,7 @@ module Coopy
       return true
     end
     
+  haxe_me
   end
 
 end

data/lib/lib/coopy/compare_flags.rb

@@ -15,6 +15,7 @@ module Coopy
       @always_show_header = true
       @acts = nil
       @ids = nil
+      @columns_to_ignore = nil
     end
     
     attr_accessor :ordered
@@ -27,6 +28,7 @@ module Coopy
     attr_accessor :always_show_header
     attr_accessor :acts
     attr_accessor :ids
+    attr_accessor :columns_to_ignore
     
     def allow_update 
       return true if @acts == nil
@@ -43,6 +45,32 @@ module Coopy
       return @acts.include?("delete")
     end
     
+    def get_ignored_columns 
+      return nil if @columns_to_ignore == nil
+      ignore = {}
+      begin
+        _g1 = 0
+        _g = @columns_to_ignore.length
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          ignore[@columns_to_ignore[i]] = true
+        end
+      end
+      return ignore
+    end
+    
+    def add_primary_key(column)
+      @ids = Array.new if @ids == nil
+      @ids.push(column)
+    end
+    
+    def ignore_column(column)
+      @columns_to_ignore = Array.new if @columns_to_ignore == nil
+      @columns_to_ignore.push(column)
+    end
+    
+  haxe_me
   end
 
 end

data/lib/lib/coopy/compare_table.rb

@@ -50,25 +50,43 @@ module Coopy
       align.meta = ::Coopy::Alignment.new if align.meta == nil
       self.align_columns(align.meta,a,b)
       column_order = align.meta.to_order
+      align.range(a.get_height,b.get_height)
+      align.tables(a,b)
+      align.set_rowlike(true)
+      w = a.get_width
+      ha = a.get_height
+      hb = b.get_height
+      av = a.get_cell_view
+      ids = nil
+      ignore = nil
+      if @comp.compare_flags != nil 
+        ids = @comp.compare_flags.ids
+        ignore = @comp.compare_flags.get_ignored_columns
+      end
       common_units = Array.new
+      ra_header = align.get_source_header
+      rb_header = align.get_source_header
       begin
         _g = 0
         _g1 = column_order.get_list
         while(_g < _g1.length) 
           unit = _g1[_g]
           _g+=1
-          common_units.push(unit) if unit.l >= 0 && unit.r >= 0 && unit.p != -1
+          if unit.l >= 0 && unit.r >= 0 && unit.p != -1 
+            if ignore != nil 
+              if unit.l >= 0 && ra_header >= 0 && ra_header < a.get_height 
+                name = av.to_s(a.get_cell(unit.l,ra_header))
+                next if ignore.include?(name)
+              end
+              if unit.r >= 0 && rb_header >= 0 && rb_header < b.get_height 
+                name1 = av.to_s(b.get_cell(unit.r,rb_header))
+                next if ignore.include?(name1)
+              end
+            end
+            common_units.push(unit)
+          end
         end
       end
-      align.range(a.get_height,b.get_height)
-      align.tables(a,b)
-      align.set_rowlike(true)
-      w = a.get_width
-      ha = a.get_height
-      hb = b.get_height
-      av = a.get_cell_view
-      ids = nil
-      ids = @comp.compare_flags.ids if @comp.compare_flags != nil
       if ids != nil 
         index = ::Coopy::IndexPair.new
         ids_as_map = {}
@@ -493,6 +511,7 @@ module Coopy
       return @indexes
     end
     
+  haxe_me
   end
 
 end

data/lib/lib/coopy/coopy.rb

@@ -384,6 +384,18 @@ module Coopy
               flags.ids.push(args[i + 1])
               args.slice!(i,2)
               break
+            elsif tag == "--ignore" 
+              more = true
+              flags.columns_to_ignore = Array.new if flags.columns_to_ignore == nil
+              flags.columns_to_ignore.push(args[i + 1])
+              args.slice!(i,2)
+              break
+            elsif tag == "--index" 
+              more = true
+              flags.always_show_order = true
+              flags.never_show_order = false
+              args.slice!(i,1)
+              break
             end
           end
         end
@@ -436,6 +448,7 @@ module Coopy
         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("     --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("     --color:       highlight changes with terminal colors\n")
         io.write_stderr("     --context NUM: show NUM rows of context\n")
         io.write_stderr("     --all:         do not prune unchanged rows\n")
@@ -445,6 +458,7 @@ module Coopy
         io.write_stderr("\n")
         io.write_stderr("  daff diff --git path old-file old-hex old-mode new-file new-hex new-mode\n")
         io.write_stderr("     --git:         process arguments provided by git to diff drivers\n")
+        io.write_stderr("     --index:       include row/columns numbers from orginal tables\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")
@@ -550,7 +564,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.1.16"
+    @version = "1.1.19"
     
     def Coopy.compare_tables(local,remote,flags = nil)
       ct = ::Coopy::CompareTable.new
@@ -578,35 +592,35 @@ module Coopy
     def Coopy.random_tests 
       st = ::Coopy::SimpleTable.new(15,6)
       tab = st
-      ::Haxe::Log._trace.call("table size is " + _hx_str(tab.get_width) + "x" + _hx_str(tab.get_height),{ file_name: "Coopy.hx", line_number: 53, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "table size is " + _hx_str(tab.get_width) + "x" + _hx_str(tab.get_height)
       tab.set_cell(3,4,::Coopy::SimpleCell.new(33))
-      ::Haxe::Log._trace.call("element is " + _hx_str(lambda{ s = tab.get_cell(3,4)
-      _r = s.to_s}.call()),{ file_name: "Coopy.hx", line_number: 55, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "element is " + _hx_str(lambda{ s = tab.get_cell(3,4)
+      _r = s.to_s}.call())
       compare = ::Coopy::Compare.new
       d1 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(10))
       d2 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(10))
       d3 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(20))
       report = ::Coopy::Report.new
       compare.compare(d1,d2,d3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 63, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "report is " + _hx_str(report.to_s)
       d2 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(50))
       report.clear
       compare.compare(d1,d2,d3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 67, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "report is " + _hx_str(report.to_s)
       d2 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(20))
       report.clear
       compare.compare(d1,d2,d3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 71, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "report is " + _hx_str(report.to_s)
       d1 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(20))
       report.clear
       compare.compare(d1,d2,d3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 75, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "report is " + _hx_str(report.to_s)
       comp = ::Coopy::TableComparisonState.new
       ct = ::Coopy::CompareTable.new
       comp.a = st
       comp.b = st
       ct.attach(comp)
-      ::Haxe::Log._trace.call("comparing tables",{ file_name: "Coopy.hx", line_number: 83, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "comparing tables"
       t1 = ::Coopy::SimpleTable.new(3,2)
       t2 = ::Coopy::SimpleTable.new(3,2)
       t3 = ::Coopy::SimpleTable.new(3,2)
@@ -614,13 +628,13 @@ module Coopy
       dt2 = ::Coopy::ViewedDatum.new(t2,::Coopy::SimpleView.new)
       dt3 = ::Coopy::ViewedDatum.new(t3,::Coopy::SimpleView.new)
       compare.compare(dt1,dt2,dt3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 91, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "report is " + _hx_str(report.to_s)
       t3.set_cell(1,1,::Coopy::SimpleCell.new("hello"))
       compare.compare(dt1,dt2,dt3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 94, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "report is " + _hx_str(report.to_s)
       t1.set_cell(1,1,::Coopy::SimpleCell.new("hello"))
       compare.compare(dt1,dt2,dt3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 97, class_name: "coopy.Coopy", method_name: "randomTests"})
+      puts "report is " + _hx_str(report.to_s)
       v = ::Coopy::Viterbi.new
       td = ::Coopy::TableDiff.new(nil,nil)
       idx = ::Coopy::Index.new
@@ -633,8 +647,7 @@ module Coopy
     end
     
     def Coopy.cell_for(x)
-      return nil if x == nil
-      return ::Coopy::SimpleCell.new(x)
+      return x
     end
     
     def Coopy.json_to_table(json)
@@ -726,7 +739,7 @@ module Coopy
           txt += "\n"
         end
       end
-      ::Haxe::Log._trace.call(txt,{ file_name: "Coopy.hx", line_number: 705, class_name: "coopy.Coopy", method_name: "show"})
+      puts txt
     end
     
     def Coopy.jsonify(t)
@@ -761,6 +774,7 @@ module Coopy
       return workbook
     end
     
+  haxe_me
   end
 
 end

data/lib/lib/coopy/cross_match.rb

@@ -11,6 +11,7 @@ module Coopy
     attr_accessor :spot_b
     attr_accessor :item_a
     attr_accessor :item_b
+  haxe_me
   end
 
 end

data/lib/lib/coopy/csv.rb

@@ -180,6 +180,7 @@ module Coopy
       return self.parse_cell(txt)
     end
     
+  haxe_me
   end
 
 end

data/lib/lib/coopy/diff_render.rb

@@ -252,6 +252,7 @@ module Coopy
       return cell
     end
     
+  haxe_me
   end
 
 end

data/lib/lib/coopy/flat_cell_builder.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class FlatCellBuilder 
+    
+    def initialize
+    end
+    
+    # protected - in ruby this doesn't play well with static/inline methods
+    
+    attr_accessor :view
+    attr_accessor :separator
+    attr_accessor :conflict_separator
+    
+    public
+    
+    def need_separator 
+      return true
+    end
+    
+    def set_separator(separator)
+      @separator = separator
+    end
+    
+    def set_conflict_separator(separator)
+      @conflict_separator = separator
+    end
+    
+    def set_view(view)
+      @view = view
+    end
+    
+    def update(local,remote)
+      return @view.to_datum(_hx_str(::Coopy::FlatCellBuilder.quote_for_diff(@view,local)) + _hx_str(@separator) + _hx_str(::Coopy::FlatCellBuilder.quote_for_diff(@view,remote)))
+    end
+    
+    def conflict(parent,local,remote)
+      return _hx_str(@view.to_s(parent)) + _hx_str(@conflict_separator) + _hx_str(@view.to_s(local)) + _hx_str(@conflict_separator) + _hx_str(@view.to_s(remote))
+    end
+    
+    def marker(label)
+      return @view.to_datum(label)
+    end
+    
+    def links(unit)
+      return @view.to_datum(unit.to_s)
+    end
+    
+    def FlatCellBuilder.quote_for_diff(v,d)
+      _nil = "NULL"
+      return _nil if v.equals(d,nil)
+      str = v.to_s(d)
+      score = 0
+      begin
+        _g1 = 0
+        _g = str.length
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          break if (str[score].ord rescue nil) != 95
+          score+=1
+        end
+      end
+      str = "_" + _hx_str(str) if str[score..-1] == _nil
+      return str
+    end
+    
+  haxe_me
+  end
+
+end