daff 1.3.17 → 1.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6f65a385fee358bbe09425bdcc8ca32e04d4ea4
-  data.tar.gz: f031cd934043e01a77c3b69a7042a45b98ca159e
+  metadata.gz: 099f0b4a80e2ba78cdf6b7bf2fbe0272186d421a
+  data.tar.gz: bce4be10631472f0b8af958c314519ef4f30daef
 SHA512:
-  metadata.gz: 935bf82b13cbfcb5ee4b0719cc8d98fd6ac01025ef6cd9e10ac8785c753456d69959409a5a53a9df07023d4ac8060cb332503691c9263f786f6f300d3c6a0705
-  data.tar.gz: 78e3e2b296d6d344e365e64ec5c14380f0a98c6186cd6bb2a7523bbd918797b893a7fc0f3ef391c8bd4f1556d21b86123c884b380cb891437ae8cc95adc387af
+  metadata.gz: 589bbd9cf10186e6b29214c4b2e0e15d781f6b87069994211f3041d3466e86e9fee5673ce874cb2a72314990d4a3b12a1384981f5362c76856c0f596105e9948
+  data.tar.gz: 4e260943a9253cb18a8e72ff6b6c79c593f3aeca80391db45ac145f24934146778d29d5e5a39f9c223968ea99f1dca5dbffef58027354876c8119aab73fb255b

data/lib/lib/coopy/compare_flags.rb

@@ -27,6 +27,7 @@ module Coopy
       @ignore_whitespace = false
       @ignore_case = false
       @terminal_format = nil
+      @use_glyphs = true
     end
     
     attr_accessor :ordered
@@ -52,6 +53,7 @@ module Coopy
     attr_accessor :ignore_whitespace
     attr_accessor :ignore_case
     attr_accessor :terminal_format
+    attr_accessor :use_glyphs
     
     def filter(act,allow)
       if @acts == nil 

data/lib/lib/coopy/coopy.rb

@@ -20,7 +20,6 @@ module Coopy
     attr_accessor :order_set
     attr_accessor :order_preference
     attr_accessor :io
-    attr_accessor :pretty
     attr_accessor :strategy
     attr_accessor :css_output
     attr_accessor :fragment
@@ -38,7 +37,6 @@ module Coopy
       @order_set = false
       @order_preference = false
       @strategy = nil
-      @pretty = true
       @css_output = nil
       @fragment = false
       @flags = nil
@@ -95,7 +93,7 @@ module Coopy
     
     def get_renderer 
       renderer = ::Coopy::DiffRender.new
-      renderer.use_pretty_arrows(@pretty)
+      renderer.use_pretty_arrows(@flags.use_glyphs)
       renderer
     end
     
@@ -540,7 +538,7 @@ module Coopy
               break
             elsif tag == "--plain" 
               more = true
-              @pretty = false
+              @flags.use_glyphs = false
               args.slice!(i,1)
               break
             elsif tag == "--all" 
@@ -837,7 +835,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.3.17"
+    @version = "1.3.18"
     
     def Coopy.diff_as_html(local,remote,flags = nil)
       comp = ::Coopy::TableComparisonState.new

data/lib/lib/coopy/terminal_diff_render.rb

@@ -7,10 +7,12 @@ module Coopy
     def initialize(flags = nil)
       @align_columns = true
       @wide_columns = false
+      @use_glyphs = true
       @flags = flags
       if flags != nil 
         @align_columns = false if flags.padding_strategy == "dense"
         @wide_columns = true if flags.padding_strategy == "sparse"
+        @use_glyphs = flags.use_glyphs
       end
     end
     
@@ -22,6 +24,7 @@ module Coopy
     attr_accessor :v
     attr_accessor :align_columns
     attr_accessor :wide_columns
+    attr_accessor :use_glyphs
     attr_accessor :flags
     
     public
@@ -106,16 +109,28 @@ module Coopy
           code = code_tr if code_tr != nil
         end
         if code != nil 
+          separator = nil
+          if @use_glyphs 
+            separator = cell.pretty_separator
+          else 
+            separator = cell.separator
+          end
           if cell.rvalue != 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.to_s) if cell.pvalue != nil
+            val = _hx_str(@codes["remove"]) + _hx_str(cell.lvalue) + _hx_str(@codes["modify"]) + _hx_str(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(separator) + _hx_str(val.to_s) if cell.pvalue != nil
           else 
-            val = cell.pretty_value
+            if @use_glyphs 
+              val = cell.pretty_value
+            else 
+              val = cell.value
+            end
             val = _hx_str(code) + _hx_str(val.to_s) + _hx_str(@codes["done"])
           end
         end
-      else 
+      elsif @use_glyphs 
         val = cell.pretty_value
+      else 
+        val = cell.value
       end
       @csv.render_cell(@v,val)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.3.17
+  version: 1.3.18
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email: