daff 1.3.10 → 1.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 425637893a696548920c2edd95fe0e621a7929cc
-  data.tar.gz: ca6c9dc71c6691a78569a9c51c3702a90a473870
+  metadata.gz: 739a1d0666d271b0dcda5352e570e60782fdcd46
+  data.tar.gz: 5b7b271027b61d93d375333ee64c8cb97cdb0e6c
 SHA512:
-  metadata.gz: cd0e3829f082c790fae47e78c2e6ac5f4ed6e4fa7edaf8eaff4ae35201ad596b19a1aa8e114ccf06c02995a46f44999ef72f42b20ed8be4c73c397d3aba432e4
-  data.tar.gz: b908cc698839b8cc67ab1b8067cf714e0afed37500f6f4bf493d9f895313c849bf8f041e57ee8c73681ce2ed5964fb3272b627c9e87933e99f709dfaab5fed5a
+  metadata.gz: 57b95822bde10babe60ca996b60f8e15fdce5eb730172dfe3f63a1a67e688667aa1169df8dfc0517442bafe4aab83c650bf7e5e6692c02720e9fd4194304c852
+  data.tar.gz: 0e07ba411d6973e678603e95842fb4a63b6cccfdfd181722f81e51a2c47303a777cac01a55ffddc43323bdb6c4c67804dea235c12396adc51c2271621810a6ca

data/lib/lib/coopy/compare_flags.rb

@@ -26,6 +26,7 @@ module Coopy
       @count_like_a_spreadsheet = true
       @ignore_whitespace = false
       @ignore_case = false
+      @terminal_format = nil
     end
     
     attr_accessor :ordered
@@ -50,6 +51,7 @@ module Coopy
     attr_accessor :count_like_a_spreadsheet
     attr_accessor :ignore_whitespace
     attr_accessor :ignore_case
+    attr_accessor :terminal_format
     
     def filter(act,allow)
       if @acts == nil 

data/lib/lib/coopy/coopy.rb

@@ -25,6 +25,7 @@ module Coopy
     attr_accessor :css_output
     attr_accessor :fragment
     attr_accessor :flags
+    attr_accessor :cache_txt
     attr_accessor :mv
     
     def init 
@@ -36,45 +37,49 @@ module Coopy
       @nested_output = false
       @order_set = false
       @order_preference = false
+      @strategy = nil
       @pretty = true
       @css_output = nil
       @fragment = false
       @flags = nil
+      @cache_txt = nil
     end
     
     def check_format(name)
       return @format_preference if @extern_preference
       ext = ""
-      pt = name.rindex(".",nil || 0) || -1
-      if pt >= 0 
-        begin
-          _this = name[pt + 1..-1]
-          ext = _this.downcase
-        end
-        case(ext)
-        when "json"
-          @format_preference = "json"
-        when "ndjson"
-          @format_preference = "ndjson"
-        when "csv"
-          @format_preference = "csv"
-          @delim_preference = ","
-        when "tsv"
-          @format_preference = "csv"
-          @delim_preference = "\t"
-        when "ssv"
-          @format_preference = "csv"
-          @delim_preference = ";"
-        when "sqlite3"
-          @format_preference = "sqlite"
-        when "sqlite"
-          @format_preference = "sqlite"
-        when "html","htm"
-          @format_preference = "html"
-        when "www"
-          @format_preference = "www"
-        else
-          ext = ""
+      if name != nil 
+        pt = name.rindex(".",nil || 0) || -1
+        if pt >= 0 
+          begin
+            _this = name[pt + 1..-1]
+            ext = _this.downcase
+          end
+          case(ext)
+          when "json"
+            @format_preference = "json"
+          when "ndjson"
+            @format_preference = "ndjson"
+          when "csv"
+            @format_preference = "csv"
+            @delim_preference = ","
+          when "tsv"
+            @format_preference = "csv"
+            @delim_preference = "\t"
+          when "ssv"
+            @format_preference = "csv"
+            @delim_preference = ";"
+          when "sqlite3"
+            @format_preference = "sqlite"
+          when "sqlite"
+            @format_preference = "sqlite"
+          when "html","htm"
+            @format_preference = "html"
+          when "www"
+            @format_preference = "www"
+          else
+            ext = ""
+          end
         end
       end
       @nested_output = @format_preference == "json" || @format_preference == "ndjson"
@@ -192,7 +197,9 @@ module Coopy
     end
     
     def save_text(name,txt)
-      if name != "-" 
+      if name == nil 
+        @cache_txt += txt
+      elsif name != "-" 
         @io.save_content(name,txt)
       else 
         @io.write_stdout(txt)
@@ -263,6 +270,24 @@ 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)
+      use_color = flags.terminal_format == "ansi"
+      if flags.terminal_format == nil 
+        if (output == nil || output == "-") && (@output_format == "copy" || @output_format == "csv") 
+          if @io != nil 
+            use_color = @io.is_tty if @io.is_tty_known
+          end
+        end
+      end
+      self.save_tables(output,os,use_color)
+    end
+    
     public
     
     def load_table(name)
@@ -472,16 +497,18 @@ module Coopy
     
     public
     
-    def coopyhx(io)
+    def run(args,io = nil)
+      io = ::Coopy::TableIO.new if io == nil
+      if io == nil 
+        puts "No system interface available"
+        return 1
+      end
       self.init
-      args = io.args
-      return ::Coopy::Coopy.keep_around if args[0] == "--keep"
+      @io = io
       more = true
       output = nil
       inplace = false
       git = false
-      color = false
-      no_color = false
       @flags = ::Coopy::CompareFlags.new
       @flags.always_show_header = true
       while(more) 
@@ -570,12 +597,12 @@ module Coopy
               break
             elsif tag == "--color" 
               more = true
-              color = true
+              @flags.terminal_format = "ansi"
               args.slice!(i,1)
               break
             elsif tag == "--no-color" 
               more = true
-              no_color = true
+              @flags.terminal_format = "plain"
               args.slice!(i,1)
               break
             elsif tag == "--input-format" 
@@ -744,19 +771,17 @@ module Coopy
         args.push(old_file)
         args.push(new_file)
       end
-      tool = self
-      tool.io = io
       parent = nil
       if args.length - offset >= 3 
-        parent = tool.load_table(args[offset])
+        parent = self.load_table(args[offset])
         offset+=1
       end
       aname = args[offset]
-      a = tool.load_table(aname)
+      a = self.load_table(aname)
       b = nil
       if args.length - offset >= 2 
         if cmd1 != "copy" 
-          b = tool.load_table(args[1 + offset])
+          b = self.load_table(args[1 + offset])
         else 
           output = args[1 + offset]
         end
@@ -775,35 +800,23 @@ module Coopy
           @flags.unchanged_context = 0 if !@flags.ordered
         end
         @flags.allow_nested_cells = @nested_output
-        ct1 = ::Coopy::Coopy.compare_tables3(parent,a,b,@flags)
-        align = ct1.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 = color
-        if !(color || no_color) 
-          if output == "-" && @output_format == "copy" 
-            use_color = io.is_tty if io.is_tty_known
-          end
-        end
-        tool.save_tables(output,os,use_color)
+        self.run_diff(parent,a,b,@flags,output)
       elsif cmd1 == "patch" 
         patcher = ::Coopy::HighlightPatch.new(a,b)
         patcher.apply
-        tool.save_table(output,a)
+        self.save_table(output,a)
       elsif cmd1 == "merge" 
         merger = ::Coopy::Merger.new(parent,a,b,@flags)
         conflicts = merger.apply
         ok = conflicts == 0
         io.write_stderr(_hx_str(conflicts) + " conflict" + _hx_str((((conflicts > 1) ? "s" : ""))) + "\n") if conflicts > 0
-        tool.save_table(output,a)
+        self.save_table(output,a)
       elsif cmd1 == "trim" 
-        tool.save_table(output,a)
+        self.save_table(output,a)
       elsif cmd1 == "render" 
         self.render_table(output,a)
       elsif cmd1 == "copy" 
-        tool.save_table(output,a)
+        self.save_table(output,a)
       end
       if ok 
         return 0
@@ -812,11 +825,17 @@ module Coopy
       end
     end
     
+    def coopyhx(io)
+      args = io.args
+      return ::Coopy::Coopy.keep_around if args[0] == "--keep"
+      self.run(args,io)
+    end
+    
     
     class << self
     attr_accessor :version
     end
-    @version = "1.3.10"
+    @version = "1.3.16"
     
     def Coopy.diff_as_html(local,remote,flags = nil)
       comp = ::Coopy::TableComparisonState.new
@@ -832,9 +851,12 @@ module Coopy
     end
     
     def Coopy.diff_as_ansi(local,remote,flags = nil)
-      o = ::Coopy::Coopy.diff(local,remote,flags)
-      render = ::Coopy::TerminalDiffRender.new(flags)
-      render.render(o)
+      tool = ::Coopy::Coopy.new(::Coopy::TableIO.new)
+      tool.cache_txt = ""
+      flags = ::Coopy::CompareFlags.new if flags == nil
+      tool.output_format = "csv"
+      tool.run_diff(flags.parent,local,remote,flags,nil)
+      tool.cache_txt
     end
     
     def Coopy.diff(local,remote,flags = nil)

data/lib/lib/coopy/highlight_patch.rb

@@ -294,6 +294,12 @@ module Coopy
       @view.to_s(self.get_datum(c))
     end
     
+    def get_string_null(c)
+      d = self.get_datum(c)
+      return nil if d == nil
+      @view.to_s(d)
+    end
+    
     def apply_meta 
       _g1 = @payload_col
       _g = @payload_top
@@ -413,7 +419,7 @@ module Coopy
           cact = @modifier[i]
           next if cact == "..."
           next if name == nil || name == ""
-          txt = self.get_string(i)
+          txt = @csv.parse_cell(self.get_string_null(i))
           updated = false
           if @row_info.updated 
             self.get_pre_string(txt)
@@ -427,8 +433,20 @@ module Coopy
             end
           end
           if updated 
-            rc.cond[name] = @cell_info.lvalue
-            rc.val[name] = @cell_info.rvalue
+            begin
+              value = @csv.parse_cell(@cell_info.lvalue)
+              begin
+                value1 = value
+                rc.cond[name] = value1
+              end
+            end
+            begin
+              value2 = @csv.parse_cell(@cell_info.rvalue)
+              begin
+                value3 = value2
+                rc.val[name] = value3
+              end
+            end
           elsif code == "+++" 
             rc.val[name] = txt if cact != "---"
           elsif cact != "+++" && cact != "---" 

data/lib/lib/coopy/sqlite_helper.rb

@@ -59,7 +59,7 @@ module Coopy
         k1 = _it2._next
         q += " and " if lst.length > val_len
         q += db.get_quoted_column_name(k1)
-        q += " = ?"
+        q += " IS ?"
         lst.push(conds[k1])
       end
       if !db._begin(q,lst,[]) 

data/lib/lib/coopy/table_io.rb

@@ -7,6 +7,10 @@ module Coopy
     def initialize
     end
     
+    def valid 
+      true
+    end
+    
     def get_content(name)
       ::Sys::Io::HxFile.get_content(name)
     end

metadata

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