columnize 0.3.0 → 0.3.1

data/ChangeLog

@@ -1,3 +1,29 @@
+2009-07-26 23:16  rockyb
+
+	* ChangeLog: Get ready for 0.3.1 release
+
+2009-07-26 23:13  rockyb
+
+	* NEWS, lib/columnize.rb, test/test-columnize.rb: Add lineprefix.
+	  Get ready for release.
+
+2009-07-26 21:59  mark-moseley
+
+	* ChangeLog, lib/columnize.rb: Ruby 1.9 updates
+
+2009-03-30 08:54  rockyb
+
+	* Rakefile: Revise for 1.9 version of rake
+
+2009-01-16 18:32  rockyb
+
+	* ChangeLog, Rakefile, VERSION: package readme was wonky. Looks
+	  like no one reads this stuff.
+
+2009-01-10 19:02  rockyb
+
+	* ChangeLog, NEWS: Get ready for release
+
 2009-01-08 09:27  rockyb
 
 	* ChangeLog, NEWS, VERSION, lib/columnize.rb,

data/NEWS

@@ -1,3 +1,9 @@
+0.3.1  (01-07-26) 
+
+- Correct for Ruby 1.9 (Mark Mosely)
+
+- add optional lineprefix parameter
+
 0.3.0  (01-10-09) - Sam Woodward Release
 
 - Fix bad bug in arranging horizontally
@@ -15,4 +21,4 @@
 - Initial release of Columnize, a module to print an Array in
   column-sorted order
 
-$Id: NEWS 160 2009-01-10 19:02:28Z rockyb $
+$Id: NEWS 173 2009-07-26 23:13:54Z rockyb $

data/Rakefile

@@ -25,7 +25,7 @@ FILES = FileList[
 desc "Test everything."
 test_task = task :test => :lib do 
   Rake::TestTask.new(:test) do |t|
-    t.libs << ['./lib']
+    t.libs << './lib'
     t.pattern = 'test/test-*.rb'
     t.verbose = true
   end
@@ -46,8 +46,23 @@ default_spec = Gem::Specification.new do |spec|
   spec.homepage = "http://rubyforge.org/projects/rocky-hacks/columnize"
   spec.summary = "Read file with caching"
   spec.description = <<-EOF
-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.
+Return a list of strings as a set of arranged in columns.
+
+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. Set "colsep"
+to adjust the string separate columns. Set `displaywidth' to set
+the line width.
+
+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.
 EOF
 
   spec.version = PACKAGE_VERSION

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/columnize.rb

@@ -1,4 +1,4 @@
-# $Id: columnize.rb 159 2009-01-08 09:27:51Z rockyb $
+# $Id: columnize.rb 175 2009-07-26 23:24:40Z rockyb $
 # 
 #   Copyright (C) 2007, 2008, 2009 Rocky Bernstein <rockyb@rubyforge.net>
 #
@@ -37,7 +37,7 @@
 
 module Columnize
 
-  # Return a list of strings with embeeded newlines (\n) as a compact
+  # Return a list of strings with embedded newlines (\n) as a compact
   # set of columns arranged horizontally or vertically.
   #
   # For example, for a line width of 4 characters (arranged vertically):
@@ -54,7 +54,7 @@ module Columnize
   # will go across, left to right, top to bottom.
 
   def columnize(list, displaywidth=80, colsep = '  ', 
-                arrange_vertical=true, ljust=true)
+                arrange_vertical=true, ljust=true, lineprefix='')
 
     # Some degenerate cases
     if not list.is_a?(Array)
@@ -70,18 +70,22 @@ module Columnize
 
     nrows = ncols = 0  # Make nrows, ncols have more global scope
     colwidths = []     # Same for colwidths
+    displaywidth = [4, displaywidth - lineprefix.length].max
     if arrange_vertical
       array_index = lambda {|nrows, row, col| nrows*col + row }
       # Try every row count from 1 upwards
-      1.upto(l.size-1) do |nrows|
+      1.upto(l.size-1) do |_nrows|
+        nrows = _nrows
         ncols = (l.size + nrows-1) / nrows
         colwidths = []
         totwidth = -colsep.length
 
-        0.upto(ncols-1) do |col|
+        0.upto(ncols-1) do |_col|
+          col = _col
           # get max column width for this column
           colwidth = 0
-          0.upto(nrows-1) do |row|
+          0.upto(nrows-1) do |_row|
+            row = _row
             i = array_index.call(nrows, row, col)
             if i >= l.size
               break
@@ -104,9 +108,11 @@ module Columnize
       # Now we just have to format each of the
       # rows.
       s = ''
-      0.upto(nrows-1) do |row| 
+      0.upto(nrows-1) do |_row| 
+        row = _row
         texts = []
-        0.upto(ncols-1) do |col|
+        0.upto(ncols-1) do |_col|
+          col = _col
           i = array_index.call(nrows, row, col)
           if i >= l.size
             x = ""
@@ -119,14 +125,15 @@ module Columnize
           texts = texts[0..-2]
         end
         if texts.size > 0
-          0.upto(texts.size-1) do |col|
+          0.upto(texts.size-1) do |_col|
+            col = _col
             if ljust
                 texts[col] = texts[col].ljust(colwidths[col])
             else
                 texts[col] = texts[col].rjust(colwidths[col])
             end
           end
-          s += "%s\n" % texts.join(colsep)
+          s += "%s%s\n" % [lineprefix, texts.join(colsep)]
         end
       end
       return s
@@ -135,17 +142,21 @@ module Columnize
       # Try every column count from size downwards
       # Assign to make enlarge scope of loop variables 
       totwidth = i = rounded_size = 0  
-      l.size.downto(0) do |ncols|
+      l.size.downto(0) do |_ncols|
+        ncols = _ncols
         # Try every row count from 1 upwards
         min_rows = (l.size+ncols-1) / ncols
-        min_rows.upto(l.size) do |nrows|
+        min_rows.upto(l.size) do |_nrows|
+          nrows = _nrows
           rounded_size = nrows * ncols
           colwidths = []
           totwidth = -colsep.length
           colwidth = row = 0
-          0.upto(ncols-1) do |col|
+          0.upto(ncols-1) do |_col|
+            col = _col
             # get max column width for this column
-            1.upto(nrows) do |row|
+            1.upto(nrows) do |_row|
+              row = _row
               i = array_index.call(nrows, row, col)
               if i >= rounded_size 
                 break
@@ -195,7 +206,7 @@ module Columnize
             texts[col] = texts[col].rjust(colwidths[col])
           end
         end
-        s += "%s\n" % texts.join(colsep)
+        s += "%s%s\n" % [lineprefix, texts.join(colsep)]
       end
       return s
     end

data/test/test-columnize.rb

@@ -43,6 +43,17 @@ class TestColumnize < Test::Unit::TestCase
             columnize(data, 39, ', ', false, false))
 
 
+    assert_equal(
+            "   0,  1,  2,  3,  4,  5,  6,  7,  8\n" +
+            "   9, 10, 11, 12, 13, 14, 15, 16, 17\n" +
+            "  18, 19, 20, 21, 22, 23, 24, 25, 26\n" +
+            "  27, 28, 29, 30, 31, 32, 33, 34, 35\n" +
+            "  36, 37, 38, 39, 40, 41, 42, 43, 44\n" +
+            "  45, 46, 47, 48, 49, 50, 51, 52, 53\n" +
+            "  54\n",
+            columnize(data, 39, ', ', false, false, '  '))
+
+
     data = ["one",       "two",         "three",
             "for",       "five",        "six",
             "seven",     "eight",       "nine",

metadata

@@ -1,33 +1,49 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: columnize
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2009-01-10 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: 
+  version: 0.3.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - R. Bernstein
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-07-26 00:00:00 -04:00
+default_executable: 
+dependencies: []
+
+description: |
+  Return a list of strings as a set of arranged in columns.
+  
+  For example, for a line width of 4 characters (arranged vertically):
+      ['1', '2,', '3', '4'] => '1  3
+  2  4
+  '
+  
+  or arranged horizontally:
+      ['1', '2,', '3', '4'] => '1  2
+  3  4
+  '
+  
+  Each column is only as wide as necessary.  By default, columns are
+  separated by two spaces - one was not legible enough. Set "colsep"
+  to adjust the string separate columns. Set `displaywidth' to set
+  the line width.
+  
+  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.
+
+email: rockyb@rubyforge.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- lib/columnize.rb
 files: 
 - AUTHORS
 - COPYING
@@ -38,18 +54,33 @@ files:
 - VERSION
 - lib/columnize.rb
 - test/test-columnize.rb
-test_files: []
+has_rdoc: true
+homepage: http://rubyforge.org/projects/rocky-hacks/columnize
+licenses: []
 
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- lib/columnize.rb
-executables: []
-
-extensions: []
-
+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: 
 requirements: []
 
-dependencies: []
+rubyforge_project: rocky-hacks
+rubygems_version: 1.3.4
+signing_key: 
+specification_version: 3
+summary: Read file with caching
+test_files: []