ansi 1.2.4 → 1.2.5

data/.ruby

@@ -31,7 +31,7 @@ requires:
   name: ko
   version: 0+
 manifest: MANIFEST
-version: 1.2.4
+version: 1.2.5
 licenses: 
 - Apache 2.0
 copyright: Copyright (c) 2009 Thomas Sawyer

data/HISTORY.rdoc

@@ -1,13 +1,25 @@
 = RELEASE HISTORY
 
-== 1.2.4 // 2011-04-09
+== 1.2.5 // 2011-05-03
+
+This release introduces a preliminary rendition of a Diff class
+for getting colorized comparisons of strings and other objects.
+It's not officially supported yet, so this is only a point release.
+
+Changes:
+
+* Added Diff class for colorized comparisons.
+* Fixed minor issue with Columns format block; col comes before row.
+
+
+== 1.2.4 // 2011-04-29
 
 This release improves to the ANSI::Columns class. In particular the
-layout is more consitent with intended functionality.
+layout is more consistent with intended functionality.
 
 Changes:
 
-* Improved ANSI::Columns to give more consitant output.
+* Improved ANSI::Columns to give more consistent output.
 * ANSI::Columns#to_s can override number of columns.
 * ANSI::Columns can take a String or Array list.
 
@@ -37,12 +49,12 @@ Changes:
 
 * Remove string argument warnings.
 * Add String#unansi and String#unansi!
-* Add ANIS::Mixin#display.
+* Add ANSI::Mixin#display.
 
 
 == 1.2.1 // 2010-05-10
 
-This release was simply a quick fix to remove the incorecct embedded
+This release was simply a quick fix to remove the incorrect embedded
 version number, until it gets fixed.
 
 
@@ -51,7 +63,7 @@ version number, until it gets fixed.
 This release entails numerous improvements. First and foremost
 the Code module is transitioning to a block interface only
 and phasing out the string argument interface. Admittedly this
-is mildly unconvential, but it allows the arguments to be used
+is mildly unconventional, but it allows the arguments to be used
 as options with common defaults more elegantly.
 
 Another important change is that ANSI::Code no longer provides
@@ -59,10 +71,10 @@ String extension methods when included. For this use the new
 ANSI::Mixin.
 
 Other improvements include a String extension, #ansi, added to
-code.rb, which makes it even easir to apply ANSI codes to strings.
+code.rb, which makes it even easier to apply ANSI codes to strings.
 Also, the ANSI::String class has been fixed (a few bugs crept
 it with the last release) and continues to improve. On top of all
-this testing has substatially improved thanks to QED.
+this testing has substantially improved thanks to QED.
 
 Changes:
 
@@ -75,7 +87,7 @@ Changes:
 == 1.1.0 // 2009-10-04
 
 This release is the first toward making the ANSI library
-more widely useable.
+more widely usable.
 
 Changes:
 

data/README.rdoc

@@ -35,12 +35,12 @@ Please see HISTORY file.
 == SYNOPSIS
 
 There are a number of modules and classes provided by the ANSI
-package. To get a good unserstanding of them it is best to puruse 
+package. To get a good understanding of them it is best to pursue 
 the QED documents[http://github.com/rubyworks/ansi/tree/master/qed/]
 or the API documentation[http://rubyworks.github.com/ansi/rdoc/].
 
 At the heart of all the provided libraries lies the ANSI::Code module
-which defines ANSI codes as constants and methods. For exmaple:
+which defines ANSI codes as constants and methods. For example:
 
   require 'ansi/code'
 
@@ -54,7 +54,7 @@ Or in block form.
   red{ "Hello" } + blue{ "World" }
   => "\e[31mHello\e[0m\e[34mWorld\e[0m"
 
-Rather than include +ANSI::Code+, these mehods can also be called as module
+Rather than include +ANSI::Code+, these methods can also be called as module
 methods. Either as <code>ANSI::Code.red</code> or just <code>ANSI.red</code>.
 
 The methods defined by this module are used throughout the rest of
@@ -81,7 +81,7 @@ Windows users use 'ruby setup.rb all'.
 
 Copyright (c) 2004 Thomas Sawyer
 
-This program is ditributed unser the terms of the Apache 2 license.
+This program is distributed under the terms of the Apache 2 license.
 
 See LICENSE file for details.
 

data/lib/ansi.rb

@@ -1,20 +1,27 @@
 # ANSI module contains all the ANSI related classes.
 module ANSI
-  #
+  # Returns Hash table of project metadata.
   def self.meta
     @spec ||= (
       require 'yaml'
       YAML.load(File.new(File.dirname(__FILE__) + '/ansi.yml'))
     )
   end
-  #
+
+  # Check metadata for missing constants.
   def self.const_missing(name)
     meta[name.to_s.downcase] || super(name)
   end
 end
 
 require 'ansi/code'
+require 'ansi/bbcode'
+require 'ansi/columns'
+require 'ansi/diff'
 require 'ansi/logger'
+require 'ansi/mixin'
 require 'ansi/progressbar'
 require 'ansi/string'
-require 'ansi/columns'
+require 'ansi/table'
+require 'ansi/terminal'
+

data/lib/ansi.yml

@@ -31,7 +31,7 @@ requires:
   name: ko
   version: 0+
 manifest: MANIFEST
-version: 1.2.4
+version: 1.2.5
 licenses: 
 - Apache 2.0
 copyright: Copyright (c) 2009 Thomas Sawyer

data/lib/ansi/columns.rb

@@ -74,20 +74,21 @@ module ANSI
         width = Terminal.terminal_width
         columns = (width / (max + padding)).to_i
       end
-      cols = []
+
+      rows = []
       mod = (count / columns.to_f).to_i
       mod += 1 if count % columns != 0
 
       lines.each_with_index do |line, index|
-        (cols[index % mod] ||=[]) << line.strip
+        (rows[index % mod] ||=[]) << line.strip
       end
 
       pad = " " * padding
       tmp = template(max, pad)
       str = ""
-      cols.each_with_index do |row, c|
-        row.each_with_index do |cell, r|
-          ansi_codes = ansi_formating(cell, c, r)
+      rows.each_with_index do |row, ri|
+        row.each_with_index do |cell, ci|
+          ansi_codes = ansi_formating(cell, ci, ri)
           if ansi_codes.empty?
             str << (tmp % cell)
           else
@@ -121,9 +122,9 @@ module ANSI
         when 1
           f = @format[cell]
         when 2 
-          f = @format[row, col]
+          f = @format[col, row]
         else
-          f = @format[cell, row, col]
+          f = @format[cell, col, row]
         end
       else
         f = nil

data/lib/ansi/diff.rb

@@ -0,0 +1,113 @@
+require 'ansi/code'
+
+module ANSI
+
+  # Diff can produced a colorized difference of two string or objects.
+  #
+  # IMPORTANT! This class is still a very much a work in progress.
+  class Diff
+
+    #
+    def initialize(object1, object2, options={})
+      @object1 = convert(object1)
+      @object2 = convert(object2)
+
+      @diff1, @diff2 = diff_string(@object1, @object2)
+    end
+
+    #
+    def diff1
+      @diff1
+    end
+
+    #
+    def diff2
+      @diff2
+    end
+
+    #
+    def to_s
+      "#{@diff1}\n#{@diff2}"
+    end
+
+    private
+
+    # Take two plain strings and produce colorized
+    # versions of each highlighting their differences.
+    #
+    # TODO: I am sure there are better ways to do this,
+    # but for now this suffices.
+    def diff_string(str1, str2)
+      i1, i2 = 0, 0
+      m1, m2 = nil, nil
+      s1, s2 = "", ""
+      t1, t2 = "", ""
+      c = 0
+
+      loop do
+        if str1[i1,1] == str2[i2,1]
+          s1 << red(t1); t1 = "" unless t1 == ""
+          s2 << red(t2); t2 = "" unless t2 == ""
+          s1 << str1[i1,1].to_s
+          s2 << str2[i2,1].to_s
+          i1 += 1; i2 += 1
+          #m1 += 1; m2 += 1
+        else
+          if m1 && str1[m1,1] == str2[i2,1]
+            s2 << color1(t2)
+            t1, t2 = "", ""
+            i1 = m1
+            m1, m2 = nil, nil
+          elsif m2 && str1[i1,1] == str2[m2,1]
+            s1 << color2(t1)
+            t1, t2 = "", ""
+            i2 = m2
+            m1, m2 = nil, nil
+          else
+            t1 << str1[i1,1].to_s
+            t2 << str2[i2,1].to_s
+            m1, m2 = i1, i2 if m1 == nil
+            i1 += 1; i2 += 1
+          end
+        end
+        break if i1 >= str1.size && i2 >= str2.size
+      end
+      s1 << red(t1); t1 = "" unless t1 == ""
+      s2 << red(t2); t2 = "" unless t2 == ""
+      #s1 << ANSI::Code::CLEAR
+      #s2 << ANSI::Code::CLEAR
+
+      return s1, s2
+    end
+
+    #
+    def red(str)
+      ANSI.color(:red){ str }
+    end
+
+    #
+    def color1(str)
+      ANSI.color(:blue){ str }
+    end
+
+    #
+    def color2(str)
+      ANSI.color(:green){ str }
+    end
+
+    # Ensure the object of comparison is a string. If +object+ is not
+    # an instance of String then it wll be converted to one by calling
+    # either #to_str, if the object responds to it, or #inspect.
+    def convert(object)
+      if String === object
+        object
+      elsif object.respond_to?(:to_str)
+        object.to_str
+      else
+        object.inspect
+      end
+    end
+
+  end
+
+end

data/qed/07_columns.rdoc

@@ -18,7 +18,7 @@ The output will be:
   b e h k
   c f i l
 
-Besides and array of elements, Columns.new can take a string in which
+Besides an array of elements, Columns.new can take a string in which
 the elements are divided by newlines characters. The default column
 size can also be given to the initializer.
 
@@ -38,7 +38,7 @@ as a best fit for the current terminal window.
 
 == Padding
 
-Columns can adjsut the padding between cells.
+Columns can adjust the padding between cells.
 
   list = %w{a b c d e f g h i j k l}
 
@@ -70,14 +70,14 @@ The output will be:
 
 == Format
 
-Lastly, columns can be aguamented with ANSI codes. This is done through
-a formating block. The block can take upto three parameters, the cell
-content, the row and column numbers, or the cell and the row and column
+Lastly, columns can be augmented with ANSI codes. This is done through
+a formatting block. The block can take up to three parameters, the cell
+content, the column and row numbers, or the cell and the column and row
 numbers.
 
   list = %w{a b c d e f g h i j k l}
 
-  columns = ANSI::Columns.new(list){ |r,c| c % 2 == 0 ? :red : :blue }
+  columns = ANSI::Columns.new(list){ |c,r| r % 2 == 0 ? :red : :blue }
 
   out = columns.to_s(4)
 

data/qed/09_diff.rb

@@ -0,0 +1,47 @@
+= ANSI::Diff
+
+  require 'ansi/diff'
+
+  a = 'abcYefg'
+  b = 'abcXefg'
+
+  diff = ANSI::Diff.new(a,b)
+
+  puts diff.to_s
+
+Try another.
+
+  a = 'abc'
+  b = 'abcdef'
+
+  diff = ANSI::Diff.new(a,b)
+
+  puts diff.to_s
+
+And another.
+
+  a = 'abcXXXghi'
+  b = 'abcdefghi'
+
+  diff = ANSI::Diff.new(a,b)
+
+  puts diff.to_s
+
+And another.
+
+  a = 'abcXXXdefghi'
+  b = 'abcdefghi'
+
+  diff = ANSI::Diff.new(a,b)
+
+  puts diff.to_s
+
+Comparison that is mostly different.
+
+  a = 'abcpppz123'
+  b = 'abcxyzzz43'
+
+  diff = ANSI::Diff.new(a,b)
+
+  puts diff.to_s
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ansi
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Thomas Sawyer
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 -04:00
+date: 2011-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: syckle
+  name: redline
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -60,6 +60,7 @@ files:
 - lib/ansi/bbcode.rb
 - lib/ansi/code.rb
 - lib/ansi/columns.rb
+- lib/ansi/diff.rb
 - lib/ansi/logger.rb
 - lib/ansi/mixin.rb
 - lib/ansi/progressbar.rb
@@ -80,6 +81,7 @@ files:
 - qed/06_string.rdoc
 - qed/07_columns.rdoc
 - qed/08_table.rdoc
+- qed/09_diff.rb
 - qed/applique/output.rb
 - test/case_ansicode.rb
 - test/case_bbcode.rb