RubyGems - columnize - Versions diffs - 0.2 → 0.2.1 - Mend

columnize 0.2 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/ChangeLog CHANGED Viewed

@@ -1,22 +1,38 @@
-2008-09-22 19:48  rockyb
+2009-01-01 03:55  rockyb
-	* VERSION, lib/columnize.rb: Get rid of hacky $0 test.
+	* ChangeLog: Get ready for release 0.2
-2007-12-10 16:25  rockyb
+2009-01-01 03:52  rockyb
-	* : release 0.1
+	* ChangeLog, NEWS, VERSION, lib/columnize.rb,
+	  test/test-columnize.rb: Get ready for release 0.2
+2008-03-16 21:14  rockyb
+	* lib/columnize.rb: *** empty log message ***
+2008-03-16 21:13  rockyb
+	* lib/columnize.rb: Simplify __FILE__ == $0. (rdebug now changes $0
+	  and rcov has an option)
+2008-02-11 19:25  rockyb
+	* lib/columnize.rb: Remove 1.9's shadow warning
 2007-12-09 17:33  rockyb
-	* : Fix up doc a little. Make the default rake task "test".
+	* README, Rakefile: Fix up doc a little. Make the default rake task
+	  "test".
 2007-12-09 16:49  rockyb
-	* : Doc fix.
+	* lib/columnize.rb: Doc fix.
 2007-12-09 16:47  rockyb
-	* : columnize.rb: Allow one to specify a separator string. Remove
+	* ChangeLog, lib/columnize.rb, test/test-columnize.rb:
+	  columnize.rb: Allow one to specify a separator string. Remove
 	  restriction that
 	  all entries in the array have to be a string.
 	  test-columnize.rb: more tests - invalid list, empty list, with
@@ -25,15 +41,18 @@
 2007-12-09 14:51  rockyb
-	* : Typo.
+	* test/test-columnize.rb: Typo.
 2007-12-09 14:48  rockyb
-	* : Property changes for Id lines and to make test-columnize.rb
+	* ., NEWS, README, lib/columnize.rb, test/test-columnize.rb:
+	  Property changes for Id lines and to make test-columnize.rb
 	  executable.
 2007-12-09 14:40  rockyb
-	* : Initial release of Columnize, a module to print an Array in
-	  column-sorted order.
+	* ., AUTHORS, COPYING, ChangeLog, NEWS, README, Rakefile, VERSION,
+	  lib, lib/columnize.rb, test, test/test-columnize.rb: Initial
+	  release of Columnize, a module to print an Array in column-sorted
+	  order.

data/NEWS CHANGED Viewed

@@ -1,6 +1,12 @@
-0.1
+0.2.1
+12-31-08
+Add ability to run columns horizontally
+0.2
+- Minor - get rid of hacky $0 test
+0.1
 - Initial release of Columnize, a module to print an Array in
   column-sorted order
-$Id: NEWS 9 2007-12-09 14:48:00Z rockyb $
+$Id: NEWS 155 2009-01-01 04:15:10Z rockyb $

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.2
1	+ 0.2.1

data/lib/columnize.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-# $Id: columnize.rb 145 2008-09-22 19:48:39Z rockyb $
+# $Id: columnize.rb 150 2009-01-01 03:52:54Z rockyb $
 #
 #   Copyright (C) 2007, 2008 Rocky Bernstein <rockyb@rubyforge.net>
 #
@@ -22,43 +22,62 @@
 #
 # Display a list of strings as a compact set of columns.
 #
-# Each column is only as wide as necessary.
-# By default, columns are separated by two spaces (one was not legible enough).
-# Adapted from the routine of the same name in cmd.py
+#   For example, for a line width of 4 characters (arranged vertically):
+#        ['1', '2,', '3', '4'] => '1  3\n2  4\n'
+#
+#    or arranged horizontally:
+#        ['1', '2,', '3', '4'] => '1  2\n3  4\n'
+#
+# Each column is only as wide as necessary.  By default, columns are
+# separated by two spaces (one was not legible enough).
+# Adapted from
+# the routine of the same name in cmd.py
 module Columnize
-  # Return a string with embedded newlines (\n) arranging +list+ in
+  # Return a string with embedded newlines (\n) arranging +list+ in
   # column-order so that each line is no larger than +displaywidth+.
   # If +list+ is not an array, the empty string, '', is returned.
-  # +colsep+ contains the string to use to separate entries.
-  def columnize(list, displaywidth=80, colsep = '  ')
+  # +colsep+ contains the string to use to separate entries. Normally,
+  # consecutive items go down from the top to bottom from the
+  # left-most column to the right-most. If +arrange_vertical+ is set
+  # false, consecutive items will go across, left to right, top to
+  # bottom.
+  def columnize(list, displaywidth=80, colsep = '  ', arrange_vertical=true)
     if not list.is_a?(Array)
       return ''
     end
     if list.size == 0
       return  "<empty>\n"
     end
-    l = list.map{|l| l.to_s}
+    l = list.map{|li| li.to_s}
     if 1 == l.size
       return "#{l[0]}\n"
     end
     # Consider arranging list in 1 rows total, then 2 rows...
     # Stop when at the smallest number of rows which
     # can be arranged less than the display width.
-    nrows = ncols = 0
+    nrows = 0; ncols = l.size
+    if arrange_vertical
+      array_index = lambda {|nrows, row, col| nrows*col + row }
+    else
+      array_index = lambda {|nrows, row, col| nrows*row + col }
+    end
     colwidths = []
     1.upto(l.size) do
       colwidths = []
       nrows += 1
-      ncols = (l.size + nrows-1) / nrows
       totwidth = -colsep.length
+      col = 0
       0.upto(ncols-1) do |col|
         # get max column width for this column
         colwidth = 0
         0.upto(nrows-1) do |row|
-          i = row + nrows*col  # [rows, cols]
+          i = array_index.call(nrows, row, col)
           if i >= l.size
             break
           end
@@ -67,6 +86,7 @@ module Columnize
         colwidths << colwidth
         totwidth += colwidth + colsep.length
         if totwidth > displaywidth
+          ncols = col
           break
         end
       end
@@ -82,27 +102,34 @@ module Columnize
     0.upto(nrows-1) do |row|
       texts = []
       0.upto(ncols-1) do |col|
-        i = row + nrows*col
+        i = array_index.call(nrows, row, col)
         if i >= l.size
-          x = ""
+          if arrange_vertical:
+              x = ""
+          else
+            break
+          end
         else
           x = l[i]
-      end
-      texts << x
+        end
+        texts << x
       end
       while texts and texts[-1] == ''
-      texts = texts[0..-2]
+        texts = texts[0..-2]
       end
-      0.upto(texts.size-1) do |col|
-        texts[col] = texts[col].ljust(colwidths[col])
+      if texts.size > 0
+        0.upto(texts.size-1) do |col|
+          texts[col] = texts[col].ljust(colwidths[col]) if
+            colwidths[col]
+        end
+        s += "%s\n" % texts.join(colsep)
       end
-      s += "%s\n" % texts.join(colsep)
     end
     return s
   end
   module_function :columnize
 end
-if __FILE__ == $0
+if __FILE__ == $0
   #
   puts Columnize::columnize(5)
   include Columnize
@@ -110,22 +137,16 @@ if __FILE__ == $0
   puts columnize(["a", 2, "c"], 10, ', ')
   puts columnize(["oneitem"])
   puts columnize(["one", "two", "three"])
-  puts columnize([
-                  "one", "two", "three",
-                  "4ne", "5wo", "6hree",
-                  "7ne", "8wo", "9hree",
-                  "10e", "11o", "12ree",
-                  "13e", "14o", "15ree",
-                  "16e", "17o", "18ree",
-                  "19e", "20o", "21ree",
-                  "22e", "23o", "24ree",
-                  "25e", "26o", "27ree",
-                  "28e", "29o", "30ree",
-                  "31e", "32o", "33ree",
-                  "34e", "35o", "36ree",
-                  "37e", "38o", "39ree",
-                  "40e", "41o", "42ree",
-                  "43e", "44o", "45ree",
-                  "46e", "47o", "48ree",
-                  "one", "two", "three"])
+  data = ["one",       "two",         "three",
+          "for",       "five",        "six",
+          "seven",     "eight",       "nine",
+          "ten",       "eleven",      "twelve",
+          "thirteen",  "fourteen",    "fifteen",
+          "sixteen",   "seventeen",   "eightteen",
+          "nineteen",  "twenty",      "twentyone",
+          "twentytwo", "twentythree", "twentyfour",
+          "twentyfive","twentysix",   "twentyseven"]
+  puts columnize(data)
+  puts columnize(data, 80, '  ', false)
 end

data/test/test-columnize.rb CHANGED Viewed

@@ -14,32 +14,34 @@ class TestColumnize < Test::Unit::TestCase
     assert_equal("1, 2, 3\n",
                  Columnize::columnize([1, 2, 3], 10, ', '))
     assert_equal("", columnize(5))
+    assert_equal("1  3\n2  4\n",
+                 columnize(['1', '2', '3', '4'], 4))
+    assert_equal("1  2\n3  4\n",
+                 columnize(['1', '2', '3', '4'], 4, '  ', false))
     assert_equal("<empty>\n", columnize([]))
     assert_equal("oneitem\n", columnize(["oneitem"]))
+    data = ["one",       "two",         "three",
+            "for",       "five",        "six",
+            "seven",     "eight",       "nine",
+            "ten",       "eleven",      "twelve",
+            "thirteen",  "fourteen",    "fifteen",
+            "sixteen",   "seventeen",   "eightteen",
+            "nineteen",  "twenty",      "twentyone",
+            "twentytwo", "twentythree", "twentyfour",
+            "twentyfive","twentysix",   "twentyseven"]
+     assert_equal(
+ "one         two        three        for        five         six       \n" +
+ "seven       eight      nine         ten        eleven       twelve    \n" +
+ "thirteen    fourteen   fifteen      sixteen    seventeen    eightteen \n" +
+ "nineteen    twenty     twentyone    twentytwo  twentythree  twentyfour\n" +
+ "twentyfive  twentysix  twentyseven\n", columnize(data, 80, '  ', false))
     assert_equal(
-"one    6hree  11o    16e    21ree  26o    31e    36ree  41o    46e    three\n" +
-"two    7ne    12ree  17o    22e    27ree  32o    37e    42ree  47o  \n" +
-"three  8wo    13e    18ree  23o    28e    33ree  38o    43e    48ree\n" +
-"4ne    9hree  14o    19e    24ree  29o    34e    39ree  44o    one  \n" +
-"5wo    10e    15ree  20o    25e    30ree  35o    40e    45ree  two  \n",
-                 columnize([
-                            "one", "two", "three",
-                            "4ne", "5wo", "6hree",
-                            "7ne", "8wo", "9hree",
-                            "10e", "11o", "12ree",
-                            "13e", "14o", "15ree",
-                            "16e", "17o", "18ree",
-                            "19e", "20o", "21ree",
-                            "22e", "23o", "24ree",
-                            "25e", "26o", "27ree",
-                            "28e", "29o", "30ree",
-                            "31e", "32o", "33ree",
-                            "34e", "35o", "36ree",
-                            "37e", "38o", "39ree",
-                            "40e", "41o", "42ree",
-                            "43e", "44o", "45ree",
-                            "46e", "47o", "48ree",
-                            "one", "two", "three"]))
+"one    five   nine    thirteen  seventeen  twentyone    twentyfive \n" +
+"two    six    ten     fourteen  eightteen  twentytwo    twentysix  \n" +
+"three  seven  eleven  fifteen   nineteen   twentythree  twentyseven\n" +
+"for    eight  twelve  sixteen   twenty     twentyfour \n", columnize(data))
   end
 end

metadata CHANGED Viewed

@@ -1,27 +1,33 @@
 --- !ruby/object:Gem::Specification
+rubygems_version: 0.9.4
+specification_version: 1
 name: columnize
 version: !ruby/object:Gem::Version
-  version: "0.2"
+  version: 0.2.1
+date: 2008-12-31 00:00:00 -05:00
+summary: Read file with caching
+require_paths:
+- lib
+email: rockyb@rubyforge.net
+homepage: http://rubyforge.org/projects/rocky-hacks/columnize
+rubyforge_project: rocky-hacks
+description: Columnize is a module for reading and caching lines. This may be useful for example in a debugger where the same lines are shown many times.
+autorequire:
+default_executable:
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 1.8.2
+  version:
 platform: ruby
+signing_key:
+cert_chain:
+post_install_message:
 authors:
 - R. Bernstein
-autorequire:
-bindir: bin
-cert_chain: []
-date: 2008-09-22 00:00:00 -04:00
-default_executable:
-dependencies: []
-description: Columnize is a module for reading and caching lines. This may be useful for example in a debugger where the same lines are shown many times.
-email: rockyb@rubyforge.net
-executables: []
-extensions: []
-extra_rdoc_files:
-- README
-- lib/columnize.rb
 files:
 - AUTHORS
 - COPYING
@@ -32,31 +38,18 @@ files:
 - VERSION
 - lib/columnize.rb
 - test/test-columnize.rb
-has_rdoc: true
-homepage: http://rubyforge.org/projects/rocky-hacks/columnize
-post_install_message:
+test_files: []
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: 1.8.2
-  version:
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: "0"
-  version:
+extra_rdoc_files:
+- README
+- lib/columnize.rb
+executables: []
+extensions: []
 requirements: []
-rubyforge_project: rocky-hacks
-rubygems_version: 1.0.1
-signing_key:
-specification_version: 2
-summary: Read file with caching
-test_files: []
+dependencies: []