daff 1.2.6 → 1.3.1

data/lib/lib/coopy/coopy.rb

@@ -5,13 +5,7 @@ module Coopy
   class Coopy 
     
     def initialize
-      @extern_preference = false
-      @format_preference = nil
-      @delim_preference = nil
-      @output_format = "copy"
-      @nested_output = false
-      @order_set = false
-      @order_preference = false
+      self.init
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
@@ -20,18 +14,42 @@ module Coopy
     attr_accessor :delim_preference
     attr_accessor :extern_preference
     attr_accessor :output_format
+    attr_accessor :output_format_set
     attr_accessor :nested_output
     attr_accessor :order_set
     attr_accessor :order_preference
     attr_accessor :io
+    attr_accessor :pretty
+    attr_accessor :strategy
+    attr_accessor :css_output
+    attr_accessor :fragment
+    attr_accessor :flags
     attr_accessor :mv
     
+    def init 
+      @extern_preference = false
+      @format_preference = nil
+      @delim_preference = nil
+      @output_format = "copy"
+      @output_format_set = false
+      @nested_output = false
+      @order_set = false
+      @order_preference = false
+      @pretty = true
+      @css_output = nil
+      @fragment = false
+      @flags = nil
+    end
+    
     def check_format(name)
       return @format_preference if @extern_preference
       ext = ""
       pt = name.rindex(".",nil || 0) || -1
       if pt >= 0 
-        ext = name[pt + 1..-1].to_lower_case
+        begin
+          _this = name[pt + 1..-1]
+          ext = _this.downcase
+        end
         case(ext)
         when "json"
           @format_preference = "json"
@@ -50,13 +68,17 @@ module Coopy
           @format_preference = "sqlite"
         when "sqlite"
           @format_preference = "sqlite"
+        when "html","htm"
+          @format_preference = "html"
+        when "www"
+          @format_preference = "www"
         else
           ext = ""
         end
       end
       @nested_output = @format_preference == "json" || @format_preference == "ndjson"
       @order_preference = !@nested_output
-      return ext
+      ext
     end
     
     def set_format(name)
@@ -65,15 +87,32 @@ module Coopy
       @extern_preference = true
     end
     
+    def render_table(name,t)
+      renderer = ::Coopy::DiffRender.new
+      renderer.use_pretty_arrows(@pretty)
+      renderer.render(t)
+      renderer.complete_html if !@fragment
+      if @format_preference == "www" 
+        @io.send_to_browser(renderer.html)
+      else 
+        self.save_text(name,renderer.html)
+      end
+      self.save_text(@css_output,renderer.sample_css) if @css_output != nil
+      true
+    end
+    
     def save_table(name,t)
       self.set_format(@output_format) if @output_format != "copy"
       txt = ""
       self.check_format(name)
+      @format_preference = "csv" if @format_preference == "sqlite" && !@extern_preference
       if @format_preference == "csv" 
         csv = ::Coopy::Csv.new(@delim_preference)
         txt = csv.render_table(t)
       elsif @format_preference == "ndjson" 
         txt = ::Coopy::Ndjson.new(t).render
+      elsif @format_preference == "html" || @format_preference == "www" 
+        return self.render_table(name,t)
       elsif @format_preference == "sqlite" 
         @io.write_stderr("! Cannot yet output to sqlite, aborting\n")
         return false
@@ -81,7 +120,7 @@ module Coopy
         value = ::Coopy::Coopy.jsonify(t)
         txt = ::Haxe::Format::JsonPrinter._print(value,nil,"  ")
       end
-      return self.save_text(name,txt)
+      self.save_text(name,txt)
     end
     
     def save_text(name,txt)
@@ -90,11 +129,10 @@ module Coopy
       else 
         @io.write_stdout(txt)
       end
-      return true
+      true
     end
     
     def load_table(name)
-      txt = @io.get_content(name)
       ext = self.check_format(name)
       if ext == "sqlite" 
         sql = @io.open_sqlite_database(name)
@@ -103,18 +141,27 @@ module Coopy
           return nil
         end
         helper = ::Coopy::SqliteHelper.new
-        names = helper.get_table_names(sql)
-        if names == nil 
-          @io.write_stderr("! Cannot find database tables, aborting\n")
-          return nil
-        end
-        if names.length == 0 
-          @io.write_stderr("! No tables in database, aborting\n")
-          return nil
+        name1 = ""
+        if @flags == nil || @flags.tables == nil || @flags.tables.length == 0 
+          names = helper.get_table_names(sql)
+          if names == nil 
+            @io.write_stderr("! Cannot find database tables, aborting\n")
+            return nil
+          end
+          if names.length == 0 
+            @io.write_stderr("! No tables in database, aborting\n")
+            return nil
+          end
+          name1 = names[0]
+        else 
+          name1 = @flags.tables[0]
+          @io.write_stderr("! Cannot compare more than one table yet\n") if @flags.tables.length > 1
         end
-        tab = ::Coopy::SqlTable.new(sql,::Coopy::SqlTableName.new(names[0]),helper)
+        tab = ::Coopy::SqlTable.new(sql,::Coopy::SqlTableName.new(name1),helper)
+        @strategy = "sql"
         return tab
       end
+      txt = @io.get_content(name)
       if ext == "ndjson" 
         t = ::Coopy::SimpleTable.new(0,0)
         ndjson = ::Coopy::Ndjson.new(t)
@@ -136,7 +183,7 @@ module Coopy
       output = ::Coopy::SimpleTable.new(0,0)
       csv.parse_table(txt,output)
       output.trim_blank if output != nil
-      return output
+      output
     end
     
     attr_accessor :status
@@ -162,7 +209,7 @@ module Coopy
         io.write_stdout("\n")
       end
       r = io.command(cmd,args) if !io.async
-      return r
+      r
     end
     
     def install_git_driver(io,formats)
@@ -235,14 +282,10 @@ module Coopy
           have_diff_driver = @status[key] == 0
           key = "add_diff_driver_" + _hx_str(format1)
           if !@status.include?(key) 
-            if !have_diff_driver 
-              r = self.command(io,"git",["config","--global","diff.daff-" + _hx_str(format1) + ".command",_hx_str(@daff_cmd) + " diff --color --git"])
-              return r if r == 999
-              io.write_stdout("- Added diff driver for " + _hx_str(format1) + "\n")
-            else 
-              r = 0
-              io.write_stdout("- Already have diff driver for " + _hx_str(format1) + ", not touching it\n")
-            end
+            r = self.command(io,"git",["config","--global","diff.daff-" + _hx_str(format1) + ".command",_hx_str(@daff_cmd) + " diff --git"])
+            return r if r == 999
+            io.write_stdout("- Cleared existing daff diff driver for " + _hx_str(format1) + "\n") if have_diff_driver
+            io.write_stdout("- Added diff driver for " + _hx_str(format1) + "\n")
             @status[key] = r
           end
           key = "have_merge_driver_" + _hx_str(format1)
@@ -264,14 +307,10 @@ module Coopy
           end
           key = "add_merge_driver_" + _hx_str(format1)
           if !@status.include?(key) 
-            if !have_merge_driver 
-              r = self.command(io,"git",["config","--global","merge.daff-" + _hx_str(format1) + ".driver",_hx_str(@daff_cmd) + " merge --output %A %O %A %B"])
-              return r if r == 999
-              io.write_stdout("- Added merge driver for " + _hx_str(format1) + "\n")
-            else 
-              r = 0
-              io.write_stdout("- Already have merge driver for " + _hx_str(format1) + ", not touching it\n")
-            end
+            r = self.command(io,"git",["config","--global","merge.daff-" + _hx_str(format1) + ".driver",_hx_str(@daff_cmd) + " merge --output %A %O %A %B"])
+            return r if r == 999
+            io.write_stdout("- Cleared existing daff merge driver for " + _hx_str(format1) + "\n") if have_merge_driver
+            io.write_stdout("- Added merge driver for " + _hx_str(format1) + "\n")
             @status[key] = r
           end
         end
@@ -311,24 +350,23 @@ module Coopy
       end
       io.save_content(attr,txt) if need_update
       io.write_stdout("- Done!\n")
-      return 0
+      0
     end
     
     public
     
     def coopyhx(io)
+      self.init
       args = io.args
       return ::Coopy::Coopy.keep_around if args[0] == "--keep"
       more = true
       output = nil
-      css_output = nil
-      fragment = false
-      pretty = true
       inplace = false
       git = false
       color = false
-      flags = ::Coopy::CompareFlags.new
-      flags.always_show_header = true
+      no_color = false
+      @flags = ::Coopy::CompareFlags.new
+      @flags.always_show_header = true
       while(more) 
         more = false
         begin
@@ -345,30 +383,41 @@ module Coopy
               break
             elsif tag == "--css" 
               more = true
-              fragment = true
-              css_output = args[i + 1]
+              @fragment = true
+              @css_output = args[i + 1]
               args.slice!(i,2)
               break
             elsif tag == "--fragment" 
               more = true
-              fragment = true
+              @fragment = true
               args.slice!(i,1)
               break
             elsif tag == "--plain" 
               more = true
-              pretty = false
+              @pretty = false
               args.slice!(i,1)
               break
             elsif tag == "--all" 
               more = true
-              flags.show_unchanged = true
+              @flags.show_unchanged = true
+              @flags.show_unchanged_columns = true
+              args.slice!(i,1)
+              break
+            elsif tag == "--all-rows" 
+              more = true
+              @flags.show_unchanged = true
+              args.slice!(i,1)
+              break
+            elsif tag == "--all-columns" 
+              more = true
+              @flags.show_unchanged_columns = true
               args.slice!(i,1)
               break
             elsif tag == "--act" 
               more = true
-              flags.acts = {} if flags.acts == nil
+              @flags.acts = {} if @flags.acts == nil
               begin
-                flags.acts[args[i + 1]] = true
+                @flags.acts[args[i + 1]] = true
                 true
               end
               args.slice!(i,2)
@@ -376,7 +425,7 @@ module Coopy
             elsif tag == "--context" 
               more = true
               context = args[i + 1].to_i
-              flags.unchanged_context = context if context >= 0
+              @flags.unchanged_context = context if context >= 0
               args.slice!(i,2)
               break
             elsif tag == "--inplace" 
@@ -391,14 +440,14 @@ module Coopy
               break
             elsif tag == "--unordered" 
               more = true
-              flags.ordered = false
-              flags.unchanged_context = 0
+              @flags.ordered = false
+              @flags.unchanged_context = 0
               @order_set = true
               args.slice!(i,1)
               break
             elsif tag == "--ordered" 
               more = true
-              flags.ordered = true
+              @flags.ordered = true
               @order_set = true
               args.slice!(i,1)
               break
@@ -407,6 +456,11 @@ module Coopy
               color = true
               args.slice!(i,1)
               break
+            elsif tag == "--no-color" 
+              more = true
+              no_color = true
+              args.slice!(i,1)
+              break
             elsif tag == "--input-format" 
               more = true
               self.set_format(args[i + 1])
@@ -415,26 +469,36 @@ module Coopy
             elsif tag == "--output-format" 
               more = true
               @output_format = args[i + 1]
+              @output_format_set = true
               args.slice!(i,2)
               break
             elsif tag == "--id" 
               more = true
-              flags.ids = Array.new if flags.ids == nil
-              flags.ids.push(args[i + 1])
+              @flags.ids = Array.new if @flags.ids == nil
+              @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])
+              @flags.ignore_column(args[i + 1])
               args.slice!(i,2)
               break
             elsif tag == "--index" 
               more = true
-              flags.always_show_order = true
-              flags.never_show_order = false
+              @flags.always_show_order = true
+              @flags.never_show_order = false
               args.slice!(i,1)
               break
+            elsif tag == "--www" 
+              more = true
+              @output_format = "www"
+              @output_format_set = true
+              args.slice!(i,1)
+            elsif tag == "--table" 
+              more = true
+              @flags.add_table(args[i + 1])
+              args.slice!(i,2)
+              break
             end
           end
         end
@@ -460,20 +524,22 @@ module Coopy
           io.write_stdout("  *.csv merge=daff-csv\n")
           io.write_stdout("\nCreate a file called .gitconfig in your home directory (or alternatively\nopen .git/config for a particular repository) and add:\n\n")
           io.write_stdout("  [diff \"daff-csv\"]\n")
-          io.write_stdout("  command = daff diff --color --git\n")
+          io.write_stdout("  command = daff diff --git\n")
           io.write_stderr("\n")
           io.write_stdout("  [merge \"daff-csv\"]\n")
           io.write_stdout("  name = daff tabular merge\n")
           io.write_stdout("  driver = daff merge --output %A %O %A %B\n\n")
-          io.write_stderr("Make sure you can run daff from the command-line as just \"daff\" - if not,\nreplace \"daff\" in the driver and command lines above with the correct way\nto call it. Omit --color if your terminal does not support ANSI colors.")
+          io.write_stderr("Make sure you can run daff from the command-line as just \"daff\" - if not,\nreplace \"daff\" in the driver and command lines above with the correct way\nto call it. Add --no-color if your terminal does not support ANSI colors.")
           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] [--output OUTPUT.csv] a.csv b.csv\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")
@@ -487,24 +553,26 @@ 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("     --act ACT:     show only a certain kind of change (update, insert, delete)\n")
-        io.write_stderr("     --all:         do not prune unchanged rows\n")
-        io.write_stderr("     --color:       highlight changes with terminal colors\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]: set format for output\n")
+        io.write_stderr("     --output-format [csv|tsv|ssv|json|copy|html]: set format for output\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("\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")
         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
       cmd1 = args[0]
@@ -521,18 +589,23 @@ module Coopy
       end
       if git 
         ct = args.length - offset
-        if ct != 7 
-          io.write_stderr("Expected 7 parameters from git, but got " + _hx_str(ct) + "\n")
+        if ct != 7 && ct != 9 
+          io.write_stderr("Expected 7 or 9 parameters from git, but got " + _hx_str(ct) + "\n")
           return 1
         end
         git_args = args.slice!(offset,ct)
         args.slice!(0,args.length)
         offset = 0
-        path = git_args[0]
+        old_display_path = git_args[0]
+        new_display_path = git_args[0]
         old_file = git_args[1]
         new_file = git_args[4]
-        io.write_stdout("--- a/" + _hx_str(path) + "\n")
-        io.write_stdout("+++ b/" + _hx_str(path) + "\n")
+        if ct == 9 
+          io.write_stdout(git_args[8])
+          new_display_path = git_args[7]
+        end
+        io.write_stdout("--- a/" + _hx_str(old_display_path) + "\n")
+        io.write_stdout("+++ b/" + _hx_str(new_display_path) + "\n")
         args.push(old_file)
         args.push(new_file)
       end
@@ -553,6 +626,7 @@ module Coopy
           output = args[1 + offset]
         end
       end
+      @flags.diff_strategy = @strategy
       if inplace 
         io.write_stderr("Please do not use --inplace when specifying an output.\n") if output != nil
         output = aname
@@ -562,16 +636,22 @@ module Coopy
       ok = true
       if cmd1 == "diff" 
         if !@order_set 
-          flags.ordered = @order_preference
-          flags.unchanged_context = 0 if !flags.ordered
+          @flags.ordered = @order_preference
+          @flags.unchanged_context = 0 if !@flags.ordered
         end
-        flags.allow_nested_cells = @nested_output
-        ct1 = ::Coopy::Coopy.compare_tables3(parent,a,b,flags)
+        @flags.allow_nested_cells = @nested_output
+        ct1 = ::Coopy::Coopy.compare_tables3(parent,a,b,@flags)
         align = ct1.align
-        td = ::Coopy::TableDiff.new(align,flags)
+        td = ::Coopy::TableDiff.new(align,@flags)
         o = ::Coopy::SimpleTable.new(0,0)
         td.hilite(o)
-        if color 
+        use_color = color
+        if !(color || no_color) 
+          if output == "-" && @output_format == "copy" 
+            use_color = io.is_tty if io.is_tty_known
+          end
+        end
+        if use_color 
           render = ::Coopy::TerminalDiffRender.new
           tool.save_text(output,render.render(o))
         else 
@@ -582,7 +662,7 @@ module Coopy
         patcher.apply
         tool.save_table(output,a)
       elsif cmd1 == "merge" 
-        merger = ::Coopy::Merger.new(parent,a,b,flags)
+        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
@@ -590,12 +670,7 @@ module Coopy
       elsif cmd1 == "trim" 
         tool.save_table(output,a)
       elsif cmd1 == "render" 
-        renderer = ::Coopy::DiffRender.new
-        renderer.use_pretty_arrows(pretty)
-        renderer.render(a)
-        renderer.complete_html if !fragment
-        tool.save_text(output,renderer.html)
-        tool.save_text(css_output,renderer.sample_css) if css_output != nil
+        self.render_table(output,a)
       elsif cmd1 == "copy" 
         tool.save_table(output,a)
       end
@@ -610,7 +685,38 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.2.6"
+    @version = "1.3.1"
+    
+    def Coopy.diff_as_html(local,remote,flags = nil)
+      o = ::Coopy::Coopy.diff(local,remote,flags)
+      render = ::Coopy::DiffRender.new
+      render.render(o).html
+    end
+    
+    def Coopy.diff_as_ansi(local,remote,flags = nil)
+      o = ::Coopy::Coopy.diff(local,remote,flags)
+      render = ::Coopy::TerminalDiffRender.new
+      render.render(o)
+    end
+    
+    def Coopy.diff(local,remote,flags = nil)
+      comp = ::Coopy::TableComparisonState.new
+      comp.a = local
+      comp.b = remote
+      flags = ::Coopy::CompareFlags.new if flags == nil
+      comp.compare_flags = flags
+      ct = ::Coopy::CompareTable.new(comp)
+      align = ct.align
+      td = ::Coopy::TableDiff.new(align,flags)
+      o = ::Coopy::SimpleTable.new(0,0)
+      td.hilite(o)
+      o
+    end
+    
+    def Coopy.patch(local,patch,flags = nil)
+      patcher = ::Coopy::HighlightPatch.new(local,patch)
+      patcher.apply
+    end
     
     def Coopy.compare_tables(local,remote,flags = nil)
       comp = ::Coopy::TableComparisonState.new
@@ -618,7 +724,7 @@ module Coopy
       comp.b = remote
       comp.compare_flags = flags
       ct = ::Coopy::CompareTable.new(comp)
-      return ct
+      ct
     end
     
     def Coopy.compare_tables3(parent,local,remote,flags = nil)
@@ -628,7 +734,7 @@ module Coopy
       comp.b = remote
       comp.compare_flags = flags
       ct = ::Coopy::CompareTable.new(comp)
-      return ct
+      ct
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
@@ -643,12 +749,12 @@ module Coopy
       hp = ::Coopy::HighlightPatch.new(nil,nil)
       csv = ::Coopy::Csv.new
       tm = ::Coopy::TableModifier.new(nil)
-      sc = ::Coopy::SqlCompare.new(nil,nil,nil)
-      return 0
+      sc = ::Coopy::SqlCompare.new(nil,nil,nil,nil)
+      0
     end
     
     def Coopy.cell_for(x)
-      return x
+      x
     end
     
     def Coopy.json_to_table(json)
@@ -705,7 +811,7 @@ module Coopy
         end
       end
       output.trim_blank if output != nil
-      return output
+      output
     end
     
     public
@@ -713,7 +819,7 @@ module Coopy
     def Coopy.main 
       io = ::Coopy::TableIO.new
       coopy1 = ::Coopy::Coopy.new
-      return coopy1.coopyhx(io)
+      coopy1.coopyhx(io)
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
@@ -770,7 +876,7 @@ module Coopy
         end
       end
       workbook["sheet"] = sheet
-      return workbook
+      workbook
     end
     
   haxe_me ["coopy", "Coopy"]