daff 1.1.6 → 1.1.7

data/README.md

@@ -46,9 +46,14 @@ Call as:
   daff [--output OUTPUT.csv] a.csv b.csv
   daff [--output OUTPUT.csv] parent.csv a.csv b.csv
   daff [--output OUTPUT.jsonbook] a.jsonbook b.jsonbook
-  daff patch [--output OUTPUT.csv] source.csv patch.csv
+  daff patch [--inplace] [--output OUTPUT.csv] a.csv patch.csv
+  daff merge [--inplace] [--output OUTPUT.csv] parent.csv a.csv b.csv
   daff trim [--output OUTPUT.csv] source.csv
   daff render [--output OUTPUT.html] diff.csv
+  daff git
+  daff version
+
+The --inplace option to patch and merge will result in modification of a.csv.
 
 If you need more control, here is the full list of flags:
   daff diff [--output OUTPUT.csv] [--context NUM] [--all] [--act ACT] a.csv b.csv
@@ -56,6 +61,9 @@ If you need more control, here is the full list of flags:
      --all:         do not prune unchanged rows
      --act ACT:     show only a certain kind of change (update, insert, delete)
 
+  daff diff --git path old-file old-hex old-mode new-file new-hex new-mode
+     --git:         process arguments provided by git to diff drivers
+
   daff render [--output OUTPUT.html] [--css CSS.css] [--fragment] [--plain] diff.csv
      --css CSS.css: generate a suitable css file to go with the html
      --fragment:    generate just a html fragment rather than a page
@@ -65,35 +73,9 @@ If you need more control, here is the full list of flags:
 Using with git
 --------------
 
-Run `daff git csv` to see how to use daff to improve `git`'s handling
-of csv files.
-
-````
-$ daff git csv
-You can use daff to improve git's handling of csv files, by using it as a
-diff driver (for showing what has changed) and as a merge driver (for merging
-changes between multiple versions).  Here is how.
-
-Create and add a file called .gitattributes in the root directory of your
-repository, containing:
-
-  *.csv diff=daff-diff
-  *.csv merge=daff-merge
-
-Create a file called .gitconfig in your home directory (or alternatively
-open .git/config for a particular repository) and add:
-
-  [merge "daff-merge"]
-  name = daff tabular merge
-  driver = daff merge --output %A %O %A %B
-
-  [diff "daff-diff"]
-  command = daff diff --git
-
-Make sure you can run daff from the command-line as just "daff" - if not,
-replace "daff" in the driver and command lines above with the correct way
-to call it.
-````
+Run `daff git csv` to install daff as a diff and merge handler
+for `*.csv` files in your repository.  Run `daff git` for instructions
+on doing this manually.
 
 The library
 -----------

data/lib/daff.rb

@@ -51,6 +51,7 @@ require_relative 'lib/coopy/table_diff'
 require_relative 'lib/coopy/table_io'
 require_relative 'lib/coopy/table_modifier'
 require_relative 'lib/coopy/table_text'
+require_relative 'lib/coopy/terminal_diff_render'
 require_relative 'lib/coopy/unit'
 require_relative 'lib/coopy/viewed_datum'
 require_relative 'lib/coopy/viterbi'

data/lib/lib/coopy/coopy.rb

@@ -170,7 +170,7 @@ module Coopy
           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 --git"])
+              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 
@@ -258,6 +258,7 @@ module Coopy
       pretty = true
       inplace = false
       git = false
+      color = false
       flags = ::Coopy::CompareFlags.new
       flags.always_show_header = true
       while(more) 
@@ -320,6 +321,11 @@ module Coopy
               git = true
               args.slice!(i,1)
               break
+            elsif tag == "--color" 
+              more = true
+              color = true
+              args.slice!(i,1)
+              break
             end
           end
         end
@@ -345,18 +351,18 @@ 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 --git\n")
+          io.write_stdout("  command = daff diff --color --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.")
+          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("\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 [--output OUTPUT.csv] a.csv b.csv\n")
+        io.write_stderr("  daff [--color] [--output OUTPUT.csv] 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.jsonbook] a.jsonbook b.jsonbook\n")
         io.write_stderr("  daff patch [--inplace] [--output OUTPUT.csv] a.csv patch.csv\n")
@@ -370,6 +376,7 @@ module Coopy
         io.write_stderr("\n")
         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("     --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")
         io.write_stderr("     --act ACT:     show only a certain kind of change (update, insert, delete)\n")
@@ -436,7 +443,12 @@ module Coopy
         td = ::Coopy::TableDiff.new(align,flags)
         o = ::Coopy::SimpleTable.new(0,0)
         td.hilite(o)
-        tool.save_table(output,o)
+        if color 
+          render = ::Coopy::TerminalDiffRender.new
+          tool.save_text(output,render.render(o))
+        else 
+          tool.save_table(output,o)
+        end
       elsif cmd1 == "patch" 
         patcher = ::Coopy::HighlightPatch.new(a,b)
         patcher.apply
@@ -468,7 +480,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.1.6"
+    @version = "1.1.7"
     
     def Coopy.compare_tables(local,remote)
       ct = ::Coopy::CompareTable.new
@@ -642,7 +654,7 @@ module Coopy
           txt += "\n"
         end
       end
-      ::Haxe::Log._trace.call(txt,{ file_name: "Coopy.hx", line_number: 615, class_name: "coopy.Coopy", method_name: "show"})
+      ::Haxe::Log._trace.call(txt,{ file_name: "Coopy.hx", line_number: 627, class_name: "coopy.Coopy", method_name: "show"})
     end
     
     def Coopy.jsonify(t)

data/lib/lib/coopy/table_io.rb

@@ -34,7 +34,6 @@ module Coopy
       rescue => e
         return 1
       end
-      return 1
     end
     
     def async 
@@ -43,7 +42,6 @@ module Coopy
     
     def exists(path)
       return File.exist?(path)
-      return false
     end
     
   end

data/lib/lib/coopy/terminal_diff_render.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class TerminalDiffRender 
+    
+    def initialize
+    end
+    
+    def render(t)
+      csv = ::Coopy::Csv.new
+      result = ""
+      w = t.get_width
+      h = t.get_height
+      txt = ""
+      v = t.get_cell_view
+      tt = ::Coopy::TableText.new(t)
+      codes = {}
+      codes["header"] = "\x1B[0;1m"
+      codes["add"] = "\x1B[32;1m"
+      codes["conflict"] = "\x1B[33;1m"
+      codes["modify"] = "\x1B[34;1m"
+      codes["remove"] = "\x1B[31;1m"
+      codes["done"] = "\x1B[0m"
+      begin
+        _g = 0
+        while(_g < h) 
+          y = _g
+          _g+=1
+          begin
+            _g1 = 0
+            while(_g1 < w) 
+              x = _g1
+              _g1+=1
+              txt += "," 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 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
+                else 
+                  val = _hx_str(code) + _hx_str(val) + _hx_str(codes["done"])
+                end
+              end
+              txt += csv.render_cell(v,val)
+            end
+          end
+          txt += "\r\n"
+        end
+      end
+      return txt
+    end
+    
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -42,6 +42,7 @@ files:
 - lib/lib/coopy/cross_match.rb
 - lib/lib/coopy/table_diff.rb
 - lib/lib/coopy/alignment.rb
+- lib/lib/coopy/terminal_diff_render.rb
 - lib/lib/coopy/table_modifier.rb
 - lib/lib/coopy/highlight_patch.rb
 - lib/lib/coopy/table_text.rb
@@ -127,42 +128,37 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   can run `daff`/`daff.py`/`daff.rb` as a utility program: ```` $ daff daff can produce
   and apply tabular diffs. Call as: daff [--output OUTPUT.csv] a.csv b.csv daff [--output
   OUTPUT.csv] parent.csv a.csv b.csv daff [--output OUTPUT.jsonbook] a.jsonbook b.jsonbook
-  daff patch [--output OUTPUT.csv] source.csv patch.csv daff trim [--output OUTPUT.csv]
-  source.csv daff render [--output OUTPUT.html] diff.csv  If you need more control,
-  here is the full list of flags: daff diff [--output OUTPUT.csv] [--context NUM]
-  [--all] [--act ACT] a.csv b.csv --context NUM: show NUM rows of context --all:         do
+  daff patch [--inplace] [--output OUTPUT.csv] a.csv patch.csv daff merge [--inplace]
+  [--output OUTPUT.csv] parent.csv a.csv b.csv daff trim [--output OUTPUT.csv] source.csv
+  daff render [--output OUTPUT.html] diff.csv daff git daff version  The --inplace
+  option to patch and merge will result in modification of a.csv.  If you need more
+  control, here is the full list of flags: daff diff [--output OUTPUT.csv] [--context
+  NUM] [--all] [--act ACT] a.csv b.csv --context NUM: show NUM rows of context --all:         do
   not prune unchanged rows --act ACT:     show only a certain kind of change (update,
-  insert, delete)  daff render [--output OUTPUT.html] [--css CSS.css] [--fragment]
-  [--plain] diff.csv --css CSS.css: generate a suitable css file to go with the html
-  --fragment:    generate just a html fragment rather than a page --plain:       do
-  not use fancy utf8 characters to make arrows prettier ````  Using with git --------------  Run
-  `daff git csv` to see how to use daff to improve `git`''s handling of csv files.  ````
-  $ daff git csv You can use daff to improve git''s handling of csv files, by using
-  it as a diff driver (for showing what has changed) and as a merge driver (for merging
-  changes between multiple versions).  Here is how.  Create and add a file called
-  .gitattributes in the root directory of your repository, containing:  *.csv diff=daff-diff
-  *.csv merge=daff-merge  Create a file called .gitconfig in your home directory (or
-  alternatively open .git/config for a particular repository) and add:  [merge "daff-merge"]
-  name = daff tabular merge driver = daff merge --output %A %O %A %B  [diff "daff-diff"]
-  command = daff diff --git  Make sure you can run daff from the command-line as just
-  "daff" - if not, replace "daff" in the driver and command lines above with the correct
-  way to call it. ````  The library -----------  You can use `daff` as a library from
-  any supported language.  We take  here the example of Javascript.  To use `daff`
-  on a webpage, first include `daff.js`: ```html <script src="daff.js"></script> ```
-  Or if using node outside the browser: ```js var daff = require(''daff''); ```  For
-  concreteness, assume we have two versions of a table, `data1` and `data2`: ```js
-  var data1 = [ [''Country'',''Capital''], [''Ireland'',''Dublin''], [''France'',''Paris''],
-  [''Spain'',''Barcelona''] ]; var data2 = [ [''Country'',''Code'',''Capital''], [''Ireland'',''ie'',''Dublin''],
-  [''France'',''fr'',''Paris''], [''Spain'',''es'',''Madrid''], [''Germany'',''de'',''Berlin'']
-  ]; ```  To make those tables accessible to the library, we wrap them in `daff.TableView`:
-  ```js var table1 = new daff.TableView(data1); var table2 = new daff.TableView(data2);
-  ```  We can now compute the alignment between the rows and columns in the two tables:
-  ```js var alignment = daff.compareTables(table1,table2).align(); ```  To produce
-  a diff from the alignment, we first need a table for the output: ```js var data_diff
-  = []; var table_diff = new daff.TableView(data_diff); ```  Using default options
-  for the diff: ```js var flags = new daff.CompareFlags(); var highlighter = new daff.TableDiff(alignment,flags);
-  highlighter.hilite(table_diff); ```  The diff is now in `data_diff` in highlighter
-  format, see specification here: > http://share.find.coop/doc/spec_hilite.html  ```js
+  insert, delete)  daff diff --git path old-file old-hex old-mode new-file new-hex
+  new-mode --git:         process arguments provided by git to diff drivers  daff
+  render [--output OUTPUT.html] [--css CSS.css] [--fragment] [--plain] diff.csv --css
+  CSS.css: generate a suitable css file to go with the html --fragment:    generate
+  just a html fragment rather than a page --plain:       do not use fancy utf8 characters
+  to make arrows prettier ````  Using with git --------------  Run `daff git csv`
+  to install daff as a diff and merge handler for `*.csv` files in your repository.  Run
+  `daff git` for instructions on doing this manually.  The library -----------  You
+  can use `daff` as a library from any supported language.  We take  here the example
+  of Javascript.  To use `daff` on a webpage, first include `daff.js`: ```html <script
+  src="daff.js"></script> ``` Or if using node outside the browser: ```js var daff
+  = require(''daff''); ```  For concreteness, assume we have two versions of a table,
+  `data1` and `data2`: ```js var data1 = [ [''Country'',''Capital''], [''Ireland'',''Dublin''],
+  [''France'',''Paris''], [''Spain'',''Barcelona''] ]; var data2 = [ [''Country'',''Code'',''Capital''],
+  [''Ireland'',''ie'',''Dublin''], [''France'',''fr'',''Paris''], [''Spain'',''es'',''Madrid''],
+  [''Germany'',''de'',''Berlin''] ]; ```  To make those tables accessible to the library,
+  we wrap them in `daff.TableView`: ```js var table1 = new daff.TableView(data1);
+  var table2 = new daff.TableView(data2); ```  We can now compute the alignment between
+  the rows and columns in the two tables: ```js var alignment = daff.compareTables(table1,table2).align();
+  ```  To produce a diff from the alignment, we first need a table for the output:
+  ```js var data_diff = []; var table_diff = new daff.TableView(data_diff); ```  Using
+  default options for the diff: ```js var flags = new daff.CompareFlags(); var highlighter
+  = new daff.TableDiff(alignment,flags); highlighter.hilite(table_diff); ```  The
+  diff is now in `data_diff` in highlighter format, see specification here: > http://share.find.coop/doc/spec_hilite.html  ```js
   [ [ ''!'', '''', ''+++'', '''' ], [ ''@@'', ''Country'', ''Code'', ''Capital'' ],
   [ ''+'', ''Ireland'', ''ie'', ''Dublin'' ], [ ''+'', ''France'', ''fr'', ''Paris''
   ], [ ''->'', ''Spain'', ''es'', ''Barcelona->Madrid'' ], [ ''+++'', ''Germany'',