daff 1.1.7 → 1.1.8

data/lib/lib/coopy/cell_info.rb

@@ -12,6 +12,7 @@ module Coopy
     attr_accessor :category
     attr_accessor :category_given_tr
     attr_accessor :separator
+    attr_accessor :pretty_separator
     attr_accessor :updated
     attr_accessor :conflicted
     attr_accessor :pvalue

data/lib/lib/coopy/coopy.rb

@@ -480,7 +480,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.1.7"
+    @version = "1.1.8"
     
     def Coopy.compare_tables(local,remote)
       ct = ::Coopy::CompareTable.new

data/lib/lib/coopy/csv.rb

@@ -45,7 +45,6 @@ module Coopy
     
     def render_cell(v,d)
       return "NULL" if d == nil
-      return "NULL" if v.equals(d,nil)
       str = v.to_s(d)
       delim = ","
       need_quote = false

data/lib/lib/coopy/diff_render.rb

@@ -136,6 +136,7 @@ module Coopy
       cell.category = ""
       cell.category_given_tr = ""
       cell.separator = ""
+      cell.pretty_separator = ""
       cell.conflicted = false
       cell.updated = false
       cell.pvalue = cell.lvalue = cell.rvalue = nil
@@ -178,6 +179,7 @@ module Coopy
             end
             cell.updated = true
             cell.separator = div
+            cell.pretty_separator = div
             if cell.pretty_value == div 
               tokens = ["",""]
             else 
@@ -193,7 +195,8 @@ module Coopy
               pretty_tokens[0] = ::Coopy::DiffRender.mark_spaces(ref,tokens[2])
               pretty_tokens[2] = ::Coopy::DiffRender.mark_spaces(tokens[2],ref)
             end
-            cell.pretty_value = pretty_tokens.join([8594].pack("U"))
+            cell.pretty_separator = [8594].pack("U")
+            cell.pretty_value = pretty_tokens.join(cell.pretty_separator)
             cell.category_given_tr = cell.category = cat
             offset = nil
             if cell.conflicted 

data/lib/lib/coopy/terminal_diff_render.rb

@@ -17,10 +17,12 @@ module Coopy
       tt = ::Coopy::TableText.new(t)
       codes = {}
       codes["header"] = "\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"
       begin
         _g = 0
@@ -32,17 +34,22 @@ module Coopy
             while(_g1 < w) 
               x = _g1
               _g1+=1
-              txt += "," if x > 0
+              txt += _hx_str(codes["minor"]) + "," + _hx_str(codes["done"]) if x > 0
               val = tt.get_cell_text(x,y)
               val = "" if val == nil
               cell = ::Coopy::DiffRender.render_cell(tt,x,y)
               code = nil
               code = codes[cell.category] if cell.category != nil
+              if cell.category_given_tr != nil 
+                code_tr = codes[cell.category_given_tr]
+                code = code_tr if code_tr != nil
+              end
               if code != nil 
                 if cell.rvalue != nil 
-                  val = _hx_str(codes["remove"]) + _hx_str(cell.lvalue) + _hx_str(codes["modify"]) + _hx_str(cell.separator) + _hx_str(codes["add"]) + _hx_str(cell.rvalue) + _hx_str(codes["done"])
-                  val = _hx_str(codes["conflict"]) + _hx_str(cell.pvalue) + _hx_str(codes["modify"]) + _hx_str(cell.separator) + _hx_str(val) if cell.pvalue != nil
+                  val = _hx_str(codes["remove"]) + _hx_str(cell.lvalue) + _hx_str(codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(codes["add"]) + _hx_str(cell.rvalue) + _hx_str(codes["done"])
+                  val = _hx_str(codes["conflict"]) + _hx_str(cell.pvalue) + _hx_str(codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(val) if cell.pvalue != nil
                 else 
+                  val = cell.pretty_value
                   val = _hx_str(code) + _hx_str(val) + _hx_str(codes["done"])
                 end
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email: