daff 1.3.26 → 1.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6de82d34735508353ff7f517ec2f1a89ccab5149
-  data.tar.gz: d3db7b910dc71a114d4dd19c6b75bfb2f60f3197
+  metadata.gz: bcecf9714f4f125b4335e3113fb57bbf96b1db9b
+  data.tar.gz: 101dab4d573f812ec2faf2dee8d3cca85cb9b5e9
 SHA512:
-  metadata.gz: 8915ca51ed765481e2f645e1c2a5f5a5ffc4ba2eefe9786b39da6286b33fa43c3864735e51f02b2dc51cda3111c01e76450dfa77cf3017e71946b5b5999483ed
-  data.tar.gz: 5d8b5d7028ab402842bd925811c176d3e3b4a0f41418d3d6ccb02ed3cee5618bc6a7ffa7620b8b22446f7d42017d07daf6b1188eb306b5ddc5ca3b5f9abb5a24
+  metadata.gz: eab198c780357ddd7c3e7a27393b07cd36ed2815c3d39eadec1919f6365052b9f44b44fe3db8fd9f73dce1959109578f056e329dbbdaade832c60b7aa50df499
+  data.tar.gz: afae043f38fab30472f802d16f6eedae1a8920654baf039de88bdb4fa16f0e9c222691938da13ff6def39fe05543eab5528928091f7125c3bd2461ac74c6114e

data/lib/daff.rb

@@ -16,14 +16,14 @@ def haxe_me(source_name)
   end
   old_get = instance_method(:[]) rescue nil
   define_method(:[]) do |x|
-    return old_get.bind(self).(x) if x.is_a?(Integer)
+    return old_get.bind(self).(x) if x.is_a?(0.class)
     tag = _haxe_vars_[x]
     return instance_variable_get(tag) if tag
     method x
   end
   old_set = instance_method(:[]=) rescue nil
   define_method(:[]=) do |x,y|
-    return old_set.bind(self).(x,y) if x.is_a?(Integer)
+    return old_set.bind(self).(x,y) if x.is_a?(0.class)
     instance_variable_set(_haxe_vars_[x],y)
   end
   define_method(:haxe_name) do

data/lib/lib/coopy/coopy.rb

@@ -26,6 +26,8 @@ module Coopy
     attr_accessor :fragment
     attr_accessor :flags
     attr_accessor :cache_txt
+    attr_accessor :fail_if_diff
+    attr_accessor :diffs_found
     attr_accessor :mv
     
     def init 
@@ -43,6 +45,8 @@ module Coopy
       @fragment = false
       @flags = nil
       @cache_txt = nil
+      @fail_if_diff = false
+      @diffs_found = false
     end
     
     def check_format(name)
@@ -297,6 +301,10 @@ module Coopy
       td.hilite_with_nesting(os)
       use_color = self.use_color(flags,output)
       self.save_tables(output,os,use_color,true)
+      if @fail_if_diff 
+        summary = td.get_summary
+        @diffs_found = true if summary.different
+      end
     end
     
     public
@@ -688,182 +696,206 @@ module Coopy
               @csv_eol_preference = ending
               args.slice!(i,2)
               break
+            elsif tag == "--fail-if-diff" 
+              more = true
+              @fail_if_diff = true
+              args.slice!(i,1)
+              break
             end
           end
         end
       end
       cmd = args[0]
-      if args.length < 2 
-        if cmd == "version" 
-          io.write_stdout(_hx_str(::Coopy::Coopy.version) + "\n")
-          return 0
+      ok = true
+      begin
+        if args.length < 2 
+          if cmd == "version" 
+            io.write_stdout(_hx_str(::Coopy::Coopy.version) + "\n")
+            return 0
+          end
+          if cmd == "git" 
+            io.write_stdout("You can use daff to improve git's handling of csv files, by using it as a\ndiff driver (for showing what has changed) and as a merge driver (for merging\nchanges between multiple versions).\n")
+            io.write_stdout("\n")
+            io.write_stdout("Automatic setup\n")
+            io.write_stdout("---------------\n\n")
+            io.write_stdout("Run:\n")
+            io.write_stdout("  daff git csv\n")
+            io.write_stdout("\n")
+            io.write_stdout("Manual setup\n")
+            io.write_stdout("------------\n\n")
+            io.write_stdout("Create and add a file called .gitattributes in the root directory of your\nrepository, containing:\n\n")
+            io.write_stdout("  *.csv diff=daff-csv\n")
+            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_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. Add --no-color if your terminal does not support ANSI colors.")
+            io.write_stderr("\n")
+            return 0
+          end
+          if args.length < 1 
+            io.write_stderr("daff can produce and apply tabular diffs.\n")
+            io.write_stderr("Call as:\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")
+            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 in.csv\n")
+            io.write_stderr("  daff git\n")
+            io.write_stderr("  daff version\n")
+            io.write_stderr("\n")
+            io.write_stderr("The --inplace option to patch and merge will result in modification of a.csv.\n")
+            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("     --act ACT:     show only a certain kind of change (update, insert, delete)\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("     --fail-if-diff: return status is 0 if equal, 1 if different, 2 if problem\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|psv|json]: set format to expect for input\n")
+            io.write_stderr("     --eol [crlf|lf|cr|auto]: separator between rows of csv output.\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|psv|json|copy|html]: set format for output\n")
+            io.write_stderr("     --padding [dense|sparse|smart]: set padding method for aligning columns\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("     -w / --ignore-whitespace: ignore changes in leading/trailing whitespace\n")
+            io.write_stderr("     -i / --ignore-case: ignore differences in case\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
         end
-        if cmd == "git" 
-          io.write_stdout("You can use daff to improve git's handling of csv files, by using it as a\ndiff driver (for showing what has changed) and as a merge driver (for merging\nchanges between multiple versions).\n")
-          io.write_stdout("\n")
-          io.write_stdout("Automatic setup\n")
-          io.write_stdout("---------------\n\n")
-          io.write_stdout("Run:\n")
-          io.write_stdout("  daff git csv\n")
-          io.write_stdout("\n")
-          io.write_stdout("Manual setup\n")
-          io.write_stdout("------------\n\n")
-          io.write_stdout("Create and add a file called .gitattributes in the root directory of your\nrepository, containing:\n\n")
-          io.write_stdout("  *.csv diff=daff-csv\n")
-          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_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. Add --no-color if your terminal does not support ANSI colors.")
-          io.write_stderr("\n")
-          return 0
+        cmd1 = args[0]
+        offset = 1
+        if !Lambda.has(["diff","patch","merge","trim","render","git","version","copy"],cmd1) 
+          if (cmd1.index("--",nil || 0) || -1) == 0 
+            cmd1 = "diff"
+            offset = 0
+          elsif (cmd1.index(".",nil || 0) || -1) != -1 
+            if args.length == 2 
+              cmd1 = "diff"
+              offset = 0
+            elsif args.length == 1 
+              cmd1 = "copy"
+              offset = 0
+            end
+          end
         end
-        if args.length < 1 
-          io.write_stderr("daff can produce and apply tabular diffs.\n")
-          io.write_stderr("Call as:\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")
-          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 in.csv\n")
-          io.write_stderr("  daff git\n")
-          io.write_stderr("  daff version\n")
-          io.write_stderr("\n")
-          io.write_stderr("The --inplace option to patch and merge will result in modification of a.csv.\n")
-          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("     --act ACT:     show only a certain kind of change (update, insert, delete)\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|psv|json]: set format to expect for input\n")
-          io.write_stderr("     --eol [crlf|lf|cr|auto]: separator between rows of csv output.\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|psv|json|copy|html]: set format for output\n")
-          io.write_stderr("     --padding [dense|sparse|smart]: set padding method for aligning columns\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("     -w / --ignore-whitespace: ignore changes in leading/trailing whitespace\n")
-          io.write_stderr("     -i / --ignore-case: ignore differences in case\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
+        if cmd1 == "git" 
+          types = args.slice!(offset,args.length - offset)
+          return self.install_git_driver(io,types)
         end
-      end
-      cmd1 = args[0]
-      offset = 1
-      if !Lambda.has(["diff","patch","merge","trim","render","git","version","copy"],cmd1) 
-        if (cmd1.index("--",nil || 0) || -1) == 0 
-          cmd1 = "diff"
+        if git 
+          ct = args.length - offset
+          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
-        elsif (cmd1.index(".",nil || 0) || -1) != -1 
-          if args.length == 2 
-            cmd1 = "diff"
-            offset = 0
-          elsif args.length == 1 
-            cmd1 = "copy"
-            offset = 0
+          old_display_path = git_args[0]
+          new_display_path = git_args[0]
+          old_file = git_args[1]
+          new_file = git_args[4]
+          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
-      end
-      if cmd1 == "git" 
-        types = args.slice!(offset,args.length - offset)
-        return self.install_git_driver(io,types)
-      end
-      if git 
-        ct = args.length - offset
-        if ct != 7 && ct != 9 
-          io.write_stderr("Expected 7 or 9 parameters from git, but got " + _hx_str(ct) + "\n")
-          return 1
+        parent = nil
+        if args.length - offset >= 3 
+          parent = self.load_table(args[offset])
+          offset+=1
         end
-        git_args = args.slice!(offset,ct)
-        args.slice!(0,args.length)
-        offset = 0
-        old_display_path = git_args[0]
-        new_display_path = git_args[0]
-        old_file = git_args[1]
-        new_file = git_args[4]
-        if ct == 9 
-          io.write_stdout(git_args[8])
-          new_display_path = git_args[7]
+        aname = args[offset]
+        a = self.load_table(aname)
+        b = nil
+        if args.length - offset >= 2 
+          if cmd1 != "copy" 
+            b = self.load_table(args[1 + offset])
+          else 
+            output = args[1 + offset]
+          end
         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
-      parent = nil
-      if args.length - offset >= 3 
-        parent = self.load_table(args[offset])
-        offset+=1
-      end
-      aname = args[offset]
-      a = self.load_table(aname)
-      b = nil
-      if args.length - offset >= 2 
-        if cmd1 != "copy" 
-          b = self.load_table(args[1 + offset])
-        else 
-          output = args[1 + offset]
+        @flags.diff_strategy = @strategy
+        if inplace 
+          io.write_stderr("Please do not use --inplace when specifying an output.\n") if output != nil
+          output = aname
+          return 1
         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
-        return 1
-      end
-      output = "-" if output == nil
-      ok = true
-      if cmd1 == "diff" 
-        if !@order_set 
-          @flags.ordered = @order_preference
-          @flags.unchanged_context = 0 if !@flags.ordered
+        output = "-" if output == nil
+        if cmd1 == "diff" 
+          if !@order_set 
+            @flags.ordered = @order_preference
+            @flags.unchanged_context = 0 if !@flags.ordered
+          end
+          @flags.allow_nested_cells = @nested_output
+          if @fail_if_diff 
+            begin
+              self.run_diff(parent,a,b,@flags,output)
+            rescue => e
+              e = hx_rescued(e)
+              return 2
+            end
+            return 1 if @diffs_found
+          else 
+            self.run_diff(parent,a,b,@flags,output)
+          end
+        elsif cmd1 == "patch" 
+          patcher = ::Coopy::HighlightPatch.new(a,b)
+          patcher.apply
+          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
+          self.save_table(output,a)
+        elsif cmd1 == "trim" 
+          self.save_table(output,a)
+        elsif cmd1 == "render" 
+          self.render_table(output,a)
+        elsif cmd1 == "copy" 
+          os = ::Coopy::Tables.new(a)
+          os.add("untitled")
+          self.save_tables(output,os,self.use_color(@flags,output),false)
         end
-        @flags.allow_nested_cells = @nested_output
-        self.run_diff(parent,a,b,@flags,output)
-      elsif cmd1 == "patch" 
-        patcher = ::Coopy::HighlightPatch.new(a,b)
-        patcher.apply
-        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
-        self.save_table(output,a)
-      elsif cmd1 == "trim" 
-        self.save_table(output,a)
-      elsif cmd1 == "render" 
-        self.render_table(output,a)
-      elsif cmd1 == "copy" 
-        os = ::Coopy::Tables.new(a)
-        os.add("untitled")
-        self.save_tables(output,os,self.use_color(@flags,output),false)
+      rescue => e1
+        e1 = hx_rescued(e1)
+        raise hx_raise(e1) if !@fail_if_diff
+        return 2
       end
       if ok 
         return 0
+      elsif @fail_if_diff 
+        return 2
       else 
         return 1
       end
@@ -879,7 +911,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.3.26"
+    @version = "1.3.27"
     
     def Coopy.diff_as_html(local,remote,flags = nil)
       comp = ::Coopy::TableComparisonState.new

data/lib/lib/coopy/csv.rb

@@ -31,23 +31,23 @@ module Coopy
       eol = @preferred_eol
       eol = "\r\n" if eol == nil
       result = ""
-      txt = ""
       v = t.get_cell_view
       stream = ::Coopy::TableStream.new(t)
       w = stream.width
+      txts = Array.new
       while(stream.fetch) 
         begin
           _g = 0
           while(_g < w) 
             x = _g
             _g+=1
-            txt += @delim if x > 0
-            txt += self.render_cell(v,stream.get_cell(x))
+            txts.push(@delim) if x > 0
+            txts.push(self.render_cell(v,stream.get_cell(x)))
           end
         end
-        txt += eol
+        txts.push(eol)
       end
-      txt
+      txts.join("")
     end
     
     def render_cell(v,d)

data/lib/lib/coopy/diff_summary.rb

@@ -22,6 +22,7 @@ module Coopy
     attr_accessor :row_count_final
     attr_accessor :col_count_initial
     attr_accessor :col_count_final
+    attr_accessor :different
   haxe_me ["coopy", "DiffSummary"]
   end
 

data/lib/lib/coopy/table_diff.rb

@@ -687,30 +687,33 @@ module Coopy
     end
     
     def check_meta(t,meta)
+      return false if meta == nil
+      return meta.get_width == 1 && meta.get_height == 1 if t == nil
       return false if meta.get_width != t.get_width + 1
       return false if meta.get_width == 0 || meta.get_height == 0
       true
     end
     
     def get_meta_table(t)
-      return nil if t == nil
+      if t == nil 
+        result = ::Coopy::SimpleTable.new(1,1)
+        result.set_cell(0,0,"@")
+        return result
+      end
       meta = t.get_meta
       return nil if meta == nil
       meta.as_table
     end
     
     def add_meta(output)
-      a_meta = nil
-      b_meta = nil
-      p_meta = nil
+      return false if @a == nil && @b == nil && @p == nil
+      return false if !@flags.show_meta
       a_meta = self.get_meta_table(@a)
       b_meta = self.get_meta_table(@b)
       p_meta = self.get_meta_table(@p)
-      return false if a_meta == nil || b_meta == nil || p_meta == nil
       return false if !self.check_meta(@a,a_meta)
       return false if !self.check_meta(@b,b_meta)
       return false if !self.check_meta(@p,p_meta)
-      return false if !@flags.show_meta
       meta_diff = ::Coopy::SimpleTable.new(0,0)
       meta_flags = ::Coopy::CompareFlags.new
       meta_flags.add_primary_key("@@")
@@ -721,7 +724,7 @@ module Coopy
       td = ::Coopy::TableDiff.new(meta_align,meta_flags)
       td.preserve_columns = true
       td.hilite(meta_diff)
-      if td.has_difference 
+      if td.has_difference || td.has_schema_difference 
         h = output.get_height
         dh = meta_diff.get_height
         offset = nil
@@ -1176,6 +1179,7 @@ module Coopy
       ds.row_count_final = @align.get_target.get_height - @align.get_target_header - 1
       ds.col_count_initial = @align.get_source.get_width
       ds.col_count_final = @align.get_target.get_width
+      ds.different = @row_deletes + @row_inserts + @row_updates + @row_reorders + @col_deletes + @col_inserts + @col_updates + @col_renames + @col_reorders > 0
       ds
     end
     

data/lib/lib/coopy/terminal_diff_render.rb

@@ -46,7 +46,6 @@ module Coopy
       result = ""
       w = t.get_width
       h = t.get_height
-      txt = ""
       @t = t
       @v = t.get_cell_view
       @codes = {}
@@ -61,6 +60,7 @@ module Coopy
       @codes["remove"] = "\x1B[31;1m"
       sizes = nil
       sizes = self.pick_sizes(t) if @align_columns
+      txts = Array.new
       begin
         _g = 0
         while(_g < h) 
@@ -80,13 +80,17 @@ module Coopy
                   while(_g2 < spaces) 
                     i = _g2
                     _g2+=1
-                    txt += " "
+                    txts.push(" ")
                     at+=1
                   end
                 end
               end
-              txt += _hx_str(@codes["minor"]) + _hx_str(@delim) + _hx_str(@codes["done"]) if x > 0
-              txt += self.get_text(x,y,true)
+              if x > 0 
+                txts.push(@codes["minor"])
+                txts.push(@delim)
+                txts.push(@codes["done"])
+              end
+              txts.push(self.get_text(x,y,true))
               if sizes != nil 
                 bit = self.get_text(x,y,false)
                 at += bit.length
@@ -94,14 +98,14 @@ module Coopy
               end
             end
           end
-          txt += "\r\n"
+          txts.push("\r\n")
         end
       end
       @t = nil
       @v = nil
       @csv = nil
       @codes = nil
-      txt
+      txts.join("")
     end
     
     protected

data/lib/lib/rb/boot.rb

@@ -19,9 +19,9 @@ module Rb
     def Boot.__instanceof(o,cl)
       return false if cl == nil
       if cl == Integer 
-        return o.is_a? Integer
+        return o.is_a? 0.class
       elsif cl == Float 
-        return o.is_a?(Float) || o.is_a?(Integer)
+        return o.is_a?(Float) || o.is_a?(0.class)
       elsif cl == TrueClass 
         return ((o.is_a? TrueClass)||(o.is_a? FalseClass))
       elsif cl == String 

data/lib/lib/type.rb

@@ -16,6 +16,8 @@
           return ValueType.tclass(String)
         when "Integer"
           return ValueType.tint
+        when "Fixnum"
+          return ValueType.tint
         when "Float"
           return ValueType.tfloat
         when "Proc"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.3.26
+  version: 1.3.27
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -115,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master)](https://travis-ci.org/paulfitz/daff)