daff 1.1.8 → 1.1.9

data/lib/lib/coopy/coopy.rb

@@ -5,18 +5,58 @@ module Coopy
   class Coopy 
     
     def initialize
+      @extern_preference = false
+      @format_preference = nil
+      @delim_preference = nil
+      @output_format = "copy"
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
     
     attr_accessor :format_preference
+    attr_accessor :delim_preference
+    attr_accessor :extern_preference
+    attr_accessor :output_format
     attr_accessor :io
     attr_accessor :mv
     
+    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
+        case(ext)
+        when "json"
+          @format_preference = "json"
+        when "csv"
+          @format_preference = "csv"
+          @delim_preference = ","
+        when "tsv"
+          @format_preference = "csv"
+          @delim_preference = "\t"
+        when "ssv"
+          @format_preference = "csv"
+          @delim_preference = ";"
+        else
+          ext = ""
+        end
+      end
+      return ext
+    end
+    
+    def set_format(name)
+      @extern_preference = false
+      self.check_format("." + _hx_str(name))
+      @extern_preference = true
+    end
+    
     def save_table(name,t)
+      self.set_format(@output_format) if @output_format != "copy"
       txt = ""
+      self.check_format(name)
       if @format_preference != "json" 
-        csv = ::Coopy::Csv.new
+        csv = ::Coopy::Csv.new(@delim_preference)
         txt = csv.render_table(t)
       else 
         value = ::Coopy::Coopy.jsonify(t)
@@ -36,6 +76,7 @@ module Coopy
     
     def load_table(name)
       txt = @io.get_content(name)
+      ext = self.check_format(name)
       begin
         json = ::Haxe::Format::JsonParser.new(txt).parse_rec
         @format_preference = "json"
@@ -43,32 +84,33 @@ module Coopy
         raise "JSON failed" if t == nil
         return t
       rescue => e
-        csv = ::Coopy::Csv.new
-        @format_preference = "csv"
-        data = csv.parse_table(txt)
-        h = data.length
-        w = 0
-        w = data[0].length if h > 0
-        output = ::Coopy::SimpleTable.new(w,h)
-        begin
-          _g = 0
-          while(_g < h) 
-            i = _g
-            _g+=1
-            begin
-              _g1 = 0
-              while(_g1 < w) 
-                j = _g1
-                _g1+=1
-                val = data[i][j]
-                output.set_cell(j,i,::Coopy::Coopy.cell_for(val))
-              end
+        raise e if ext == "json"
+      end if ext == "json" || ext == ""
+      @format_preference = "csv"
+      csv = ::Coopy::Csv.new(@delim_preference)
+      data = csv.parse_table(txt)
+      h = data.length
+      w = 0
+      w = data[0].length if h > 0
+      output = ::Coopy::SimpleTable.new(w,h)
+      begin
+        _g = 0
+        while(_g < h) 
+          i = _g
+          _g+=1
+          begin
+            _g1 = 0
+            while(_g1 < w) 
+              j = _g1
+              _g1+=1
+              val = data[i][j]
+              output.set_cell(j,i,::Coopy::Coopy.cell_for(val))
             end
           end
         end
-        output.trim_blank if output != nil
-        return output
       end
+      output.trim_blank if output != nil
+      return output
     end
     
     attr_accessor :status
@@ -326,6 +368,16 @@ module Coopy
               color = true
               args.slice!(i,1)
               break
+            elsif tag == "--input-format" 
+              more = true
+              self.set_format(args[i + 1])
+              args.slice!(i,2)
+              break
+            elsif tag == "--output-format" 
+              more = true
+              @output_format = args[i + 1]
+              args.slice!(i,2)
+              break
             end
           end
         end
@@ -369,6 +421,7 @@ module Coopy
         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")
         io.write_stderr("  daff render [--output OUTPUT.html] diff.csv\n")
+        io.write_stderr("  daff copy in.csv out.tsv\n")
         io.write_stderr("  daff git\n")
         io.write_stderr("  daff version\n")
         io.write_stderr("\n")
@@ -380,6 +433,8 @@ module Coopy
         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")
+        io.write_stderr("     --input-format [csv|tsv|ssv|json]: set format to expect for input\n")
+        io.write_stderr("     --output-format [csv|tsv|ssv|json|copy]: set format for output\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")
@@ -392,7 +447,7 @@ module Coopy
       end
       cmd1 = args[0]
       offset = 1
-      if !Lambda.has(["diff","patch","merge","trim","render","git","version"],cmd1) 
+      if !Lambda.has(["diff","patch","merge","trim","render","git","version","copy"],cmd1) 
         if (cmd1.index(".",nil || 0) || -1) != -1 || (cmd1.index("--",nil || 0) || -1) == 0 
           cmd1 = "diff"
           offset = 0
@@ -419,7 +474,7 @@ module Coopy
         args.push(old_file)
         args.push(new_file)
       end
-      tool = ::Coopy::Coopy.new
+      tool = self
       tool.io = io
       parent = nil
       if args.length - offset >= 3 
@@ -429,7 +484,13 @@ module Coopy
       aname = args[offset]
       a = tool.load_table(aname)
       b = nil
-      b = tool.load_table(args[1 + offset]) if args.length - offset >= 2
+      if args.length - offset >= 2 
+        if cmd1 != "copy" 
+          b = tool.load_table(args[1 + offset])
+        else 
+          output = args[1 + offset]
+        end
+      end
       if inplace 
         io.write_stderr("Please do not use --inplace when specifying an output.\n") if output != nil
         output = aname
@@ -468,6 +529,8 @@ module Coopy
         renderer.complete_html if !fragment
         tool.save_text(output,renderer.html)
         tool.save_text(css_output,renderer.sample_css) if css_output != nil
+      elsif cmd1 == "copy" 
+        tool.save_table(output,a)
       end
       if ok 
         return 0
@@ -506,35 +569,35 @@ module Coopy
     def Coopy.random_tests 
       st = ::Coopy::SimpleTable.new(15,6)
       tab = st
-      ::Haxe::Log._trace.call("table size is " + _hx_str(tab.get_width) + "x" + _hx_str(tab.get_height),{ file_name: "Coopy.hx", line_number: 44, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("table size is " + _hx_str(tab.get_width) + "x" + _hx_str(tab.get_height),{ file_name: "Coopy.hx", line_number: 51, class_name: "coopy.Coopy", method_name: "randomTests"})
       tab.set_cell(3,4,::Coopy::SimpleCell.new(33))
       ::Haxe::Log._trace.call("element is " + _hx_str(lambda{ s = tab.get_cell(3,4)
-      _r = s.to_s}.call()),{ file_name: "Coopy.hx", line_number: 46, class_name: "coopy.Coopy", method_name: "randomTests"})
+      _r = s.to_s}.call()),{ file_name: "Coopy.hx", line_number: 53, class_name: "coopy.Coopy", method_name: "randomTests"})
       compare = ::Coopy::Compare.new
       d1 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(10))
       d2 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(10))
       d3 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(20))
       report = ::Coopy::Report.new
       compare.compare(d1,d2,d3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 54, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 61, class_name: "coopy.Coopy", method_name: "randomTests"})
       d2 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(50))
       report.clear
       compare.compare(d1,d2,d3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 58, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 65, class_name: "coopy.Coopy", method_name: "randomTests"})
       d2 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(20))
       report.clear
       compare.compare(d1,d2,d3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 62, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 69, class_name: "coopy.Coopy", method_name: "randomTests"})
       d1 = ::Coopy::ViewedDatum.get_simple_view(::Coopy::SimpleCell.new(20))
       report.clear
       compare.compare(d1,d2,d3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 66, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 73, class_name: "coopy.Coopy", method_name: "randomTests"})
       comp = ::Coopy::TableComparisonState.new
       ct = ::Coopy::CompareTable.new
       comp.a = st
       comp.b = st
       ct.attach(comp)
-      ::Haxe::Log._trace.call("comparing tables",{ file_name: "Coopy.hx", line_number: 74, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("comparing tables",{ file_name: "Coopy.hx", line_number: 81, class_name: "coopy.Coopy", method_name: "randomTests"})
       t1 = ::Coopy::SimpleTable.new(3,2)
       t2 = ::Coopy::SimpleTable.new(3,2)
       t3 = ::Coopy::SimpleTable.new(3,2)
@@ -542,13 +605,13 @@ module Coopy
       dt2 = ::Coopy::ViewedDatum.new(t2,::Coopy::SimpleView.new)
       dt3 = ::Coopy::ViewedDatum.new(t3,::Coopy::SimpleView.new)
       compare.compare(dt1,dt2,dt3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 82, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 89, class_name: "coopy.Coopy", method_name: "randomTests"})
       t3.set_cell(1,1,::Coopy::SimpleCell.new("hello"))
       compare.compare(dt1,dt2,dt3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 85, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 92, class_name: "coopy.Coopy", method_name: "randomTests"})
       t1.set_cell(1,1,::Coopy::SimpleCell.new("hello"))
       compare.compare(dt1,dt2,dt3,report)
-      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 88, class_name: "coopy.Coopy", method_name: "randomTests"})
+      ::Haxe::Log._trace.call("report is " + _hx_str(report.to_s),{ file_name: "Coopy.hx", line_number: 95, class_name: "coopy.Coopy", method_name: "randomTests"})
       v = ::Coopy::Viterbi.new
       td = ::Coopy::TableDiff.new(nil,nil)
       idx = ::Coopy::Index.new
@@ -654,7 +717,7 @@ module Coopy
           txt += "\n"
         end
       end
-      ::Haxe::Log._trace.call(txt,{ file_name: "Coopy.hx", line_number: 627, class_name: "coopy.Coopy", method_name: "show"})
+      ::Haxe::Log._trace.call(txt,{ file_name: "Coopy.hx", line_number: 694, class_name: "coopy.Coopy", method_name: "show"})
     end
     
     def Coopy.jsonify(t)

data/lib/lib/coopy/csv.rb

@@ -4,9 +4,14 @@
 module Coopy
   class Csv 
     
-    def initialize
+    def initialize(delim = ",")
       @cursor = 0
       @row_ended = false
+      if delim == nil 
+        @delim = ","
+      else 
+        @delim = delim
+      end
     end
     
     protected
@@ -14,6 +19,7 @@ module Coopy
     attr_accessor :cursor
     attr_accessor :row_ended
     attr_accessor :has_structure
+    attr_accessor :delim
     
     public
     
@@ -33,7 +39,7 @@ module Coopy
             while(_g1 < w) 
               x = _g1
               _g1+=1
-              txt += "," if x > 0
+              txt += @delim if x > 0
               txt += self.render_cell(v,t.get_cell(x,y))
             end
           end
@@ -46,7 +52,6 @@ module Coopy
     def render_cell(v,d)
       return "NULL" if d == nil
       str = v.to_s(d)
-      delim = ","
       need_quote = false
       begin
         _g1 = 0
@@ -55,7 +60,7 @@ module Coopy
           i = _g1
           _g1+=1
           ch = str[i]
-          if ch == "\"" || ch == "'" || ch == delim || ch == "\r" || ch == "\n" || ch == "\t" || ch == " " 
+          if ch == "\"" || ch == "'" || ch == @delim || ch == "\r" || ch == "\n" || ch == "\t" || ch == " " 
             need_quote = true
             break
           end
@@ -125,7 +130,7 @@ module Coopy
           first_non_underscore = i if ch != 95 && i < first_non_underscore
           if @has_structure 
             if !quoting 
-              break if ch == 44
+              break if ch == (@delim[0].ord rescue nil)
               if ch == 13 || ch == 10 
                 ch2 = (txt[i + 1].ord rescue nil)
                 if ch2 != nil 

metadata

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