columnize 0.3.6 → 0.8.9

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - ruby-head
+  - rbx-18mode
+  - rbx-19mode

data/AUTHORS

@@ -1 +1,2 @@
 R. Bernstein (rockyb@rubyforge.net)
+M. Davis (waslogic@gmail.com)

data/COPYING

@@ -1,7 +1,7 @@
 Columnize is copyrighted free software by Rocky Bernstein <rocky@rubyforge.org>.
 
 You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
+version 2, or the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the
@@ -45,9 +45,9 @@ version 2 (see the file GPL), or the conditions below:
      For the list of those files and their copying conditions, see the
      file LEGAL.
 
-  5. The scripts and library files supplied as input to or produced as 
+  5. The scripts and library files supplied as input to or produced as
      output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
+     copyright of the software, but belong to whomever generated them,
      and may be sold commercially, and may be aggregated with this
      software.
 

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    columnize (0.8.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (1.8.0)
+    rake (10.0.4)
+    rdoc (4.0.1)
+      json (~> 1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  columnize!
+  rake
+  rdoc

data/Makefile

@@ -1,5 +1,9 @@
 # I'll admit it -- I'm an absent-minded old-timer who has trouble
 # learning new tricks.
+
+RUBY ?= ruby
+RAKE ?= rake
+
 test: check
 
 #: Default target; same as "make check"
@@ -8,4 +12,4 @@ all: check
 
 #: Same as corresponding rake task
 %: 
-	rake $@
+	$(RAKE) $@

data/NEWS

@@ -1,12 +1,19 @@
-0.3.6 Dec 17, 2011 
-- rename version.rb columnize/version.rb so as not to conflict with 
+0.8.9 Apr 19, 2014
+- Add columnize method to Array class and a place to set its default options
+- Add option :colfmt to allow a format specifier to use (e.g. '%02d') in stringifying
+  list items
+- Add option linesuffix (default is "\n")
+- When using arrange_array each line now has trailing ","
+
+0.3.6 Dec 17, 2011
+- rename version.rb columnize/version.rb so as not to conflict with
   another package called version
 - Administrivia - shorten gemcutter description
 
-0.3.5 Nov 24, 2011 
+0.3.5 Nov 24, 2011
 - Handle situation where an array element is larger than the display width.
 
-0.3.4 July 4, 2011 
+0.3.4 July 4, 2011
 
 - Change to Ruby License
 - Add option 'term_adjust' to ignore terminal sequences in text
@@ -19,15 +26,15 @@
 - More general but simpler inteface using an options
   hash. Compatibility is maintaind though.
 
-0.3.2  
+0.3.2
 
-- Mostly Administrivia. 
-  * Add .gemspec, correct description field and add a summary. 
-  * Add Columnize::VERSION 
+- Mostly Administrivia.
+  * Add .gemspec, correct description field and add a summary.
+  * Add Columnize::VERSION
   * Simplify Rakefile
   * Add stub Makefiles
 
-0.3.1  (01-07-26) 
+0.3.1  (01-07-26)
 
 - Correct for Ruby 1.9 (Mark Moseley)
 

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/rocky/columnize.png)](https://travis-ci.org/rocky/columnize)
+
 Columnize - Format an Array as a Column-aligned String
 ============================================================================
 
@@ -10,58 +12,82 @@ Setup
 -----
 
     $ irb
-    >> a = (1..10).to_a
-    => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     >> require 'columnize'
     => true
-    >> include Columnize
-    => Object
-    >> g = %w(bibrons golden madascar leopard mourning suras tokay)
-    => ["bibrons", "golden", "madascar", "leopard", "mourning", "suras", "tokay"]
 
 With numeric data
 -----------------
 
-    columnize(a) 
-    => "1  2  3  4  5  6  7  8  9  10\n"
-    >> puts Columnize::columnize(a, :arrange_array => true, :displaywidth => 10)
-    [1,  2
-     3,  4
-     5,  6
-     7,  8
-     9, 10
-    ]
+    >> a = (1..10).to_a
+    => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+
+    >> a.columnize
+    => "1  2  3  4  5  6  7  8  9  10"
+
+    >> puts a.columnize :arrange_array => true, :displaywidth => 10
+    [1, 2, 3,
+     4, 5, 6,
+     7, 8, 9,
+     10]
+    => nil
+
+    >> puts a.columnize :arrange_array => true, :displaywidth => 20
+    [1, 2, 3,  4, 5,  6,
+     7, 8, 9, 10]
     => nil
-    >> puts Columnize::columnize(a, :arrange_array => true, :displaywidth => 20)
-    [1, 2, 3,  4,  5,  6
-     7, 8, 9, 10
-    ]
 
 With String data
 ----------------
 
-    >> puts columnize g, :displaywidth => 15
+    >> g = %w(bibrons golden madascar leopard mourning suras tokay)
+    => ["bibrons", "golden", "madascar", "leopard", "mourning", "suras", "tokay"]
+
+    >> puts g.columnize :displaywidth => 15
     bibrons   suras
     golden    tokay
     madascar
-    leopard 
+    leopard
     mourning
     => nil
 
-    >> puts columnize g, {:displaywidth => 19, :colsep => ' | '}
+    >> puts g.columnize :displaywidth => 19, :colsep => ' | '
     bibrons  | suras
     golden   | tokay
     madascar
-    leopard 
+    leopard
     mourning
     => nil
 
-    >> puts columnize g, {:displaywidth => 18, :colsep => ' | ', :ljust=>false}
+    >> puts g.columnize :displaywidth => 18, :colsep => ' | ', :ljust => false
+    bibrons  | mourning
+    golden   | suras
+    madascar | tokay
+    leopard
+    => nil
+
+Using Columnize.columnize
+-------------------------
+
+    >> Columnize.columnize(a)
+    => "1  2  3  4  5  6  7  8  9  10"
 
+    >> puts Columnize.columnize(a, :displaywidth => 10)
+    1  5   9
+    2  6  10
+    3  7
+    4  8
+    => nil
+
+    >> Columnize.columnize(g)
+    => "bibrons  golden  madascar  leopard  mourning  suras  tokay"
+
+    >> puts Columnize.columnize(g, :displaywidth => 19, :colsep => ' | ')
     bibrons  | mourning
-    golden   | suras   
-    madascar | tokay   
-    leopard 
+    golden   | suras
+    madascar | tokay
+    leopard
+    => nil
+
 
 Credits
 -------
@@ -71,14 +97,12 @@ This is adapted from a method of the same name from Python's cmd module.
 Other stuff
 -----------
 
-Author:   Rocky Bernstein <rockyb@rubyforge.org>
+Authors:   Rocky Bernstein <rockyb@rubyforge.org> [![endorse](https://api.coderwall.com/rocky/endorsecount.png)](https://coderwall.com/rocky) and [Martin Davis](https://github.com/waslogic)
 
-License:  Copyright (c) 2011 Rocky Bernstein
+License:   Copyright (c) 2011,2013 Rocky Bernstein
 
 Warranty
 --------
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 or the conditions listed in COPYING

data/Rakefile

@@ -1,47 +1,49 @@
 #!/usr/bin/env rake
 # -*- Ruby -*-
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
 require 'fileutils'
 
 ROOT_DIR = File.dirname(__FILE__)
-require File.join(ROOT_DIR, '/lib/columnize/version')
+Gemspec_filename = 'columnize.gemspec'
+require File.join %W(#{ROOT_DIR} lib columnize version)
 
 def gemspec
-  @gemspec ||= eval(File.read('columnize.gemspec'), 
-                    binding, 'columnize.gemspec')
+  @gemspec ||= eval(File.read(Gemspec_filename), binding, Gemspec_filename)
 end
 
+require 'rubygems/package_task'
 desc "Build the gem"
 task :package=>:gem
 task :gem=>:gemspec do
   Dir.chdir(ROOT_DIR) do
     sh "gem build columnize.gemspec"
     FileUtils.mkdir_p 'pkg'
-    FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
+    FileUtils.mv gemspec.file_name, 'pkg'
   end
 end
 
 desc "Install the gem locally"
 task :install => :gem do
   Dir.chdir(ROOT_DIR) do
-    sh %{gem install --local pkg/#{gemspec.name}-#{gemspec.version}}
+    sh %{gem install --local pkg/#{gemspec.file_name}}
   end
 end
 
+require 'rake/testtask'
 desc "Test everything."
 Rake::TestTask.new(:test) do |t|
   t.libs << './lib'
-  t.pattern = 'test/test-*.rb'
+  t.test_files = FileList['test/test-*.rb']
   t.verbose = true
 end
-task :test => :lib 
+task :test => :lib
 
 desc "same as test"
 task :check => :test
 
+desc "same as test"
+task :columnize => :test
+
 desc 'Create a GNU-style ChangeLog via git2cl'
 task :ChangeLog do
   system('git log --pretty --numstat --summary | git2cl > ChangeLog')
@@ -49,17 +51,11 @@ end
 
 task :default => [:test]
 
-task :clobber_rdoc do
-  FileUtils.rm_rf File.join(ROOT_DIR, 'doc')
-end
-
-task :rm_patch_residue do
-  FileUtils.rm_rf FileList['**/*.{rej,orig}'].to_a
+desc 'Create a GNU-style ChangeLog via git2cl'
+task :ChangeLog do
+  system('git log --pretty --numstat --summary | git2cl > ChangeLog')
 end
 
-desc "Remove built files"
-task :clean => [:clobber_package, :clobber_rdoc, :rm_patch_residue]
-
 desc "Generate the gemspec"
 task :generate do
   puts gemspec.to_ruby
@@ -71,6 +67,7 @@ task :gemspec do
 end
 
 # ---------  RDoc Documentation ------
+require 'rdoc/task'
 desc "Generate rdoc documentation"
 Rake::RDocTask.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'doc'
@@ -81,6 +78,7 @@ Rake::RDocTask.new("rdoc") do |rdoc|
 
   rdoc.rdoc_files.include('lib/*.rb', 'README.md', 'COPYING')
 end
+
 desc "Same as rdoc"
 task :doc => :rdoc
 
@@ -91,3 +89,17 @@ end
 task :clobber_rdoc do
   FileUtils.rm_rf File.join(ROOT_DIR, 'doc')
 end
+
+desc 'Remove residue from running patch'
+task :rm_patch_residue do
+  FileUtils.rm_rf Dir.glob('**/*.{rej,orig}'), :verbose => true
+end
+
+desc 'Remove ~ backup files'
+task :rm_tilde_backups do
+  FileUtils.rm_rf Dir.glob('**/*~'), :verbose => true
+end
+
+desc 'Remove built files'
+task :clean => [:clobber_package, :clobber_rdoc, :rm_patch_residue,
+                :rm_tilde_backups]

data/THANKS

@@ -0,0 +1,8 @@
+I am indebted to:
+
+Mark Moseley:
+     the initial port from 1.8 to 1.9
+Martin Davis:
+       how to extend into Array classes and set options from there
+David Rodríguez de Dios:
+      Miscellaneous portability fixes and doggedness to get out a new release

data/columnize.gemspec

@@ -1,18 +1,18 @@
 # -*- Ruby -*-
 # -*- encoding: utf-8 -*-
 require 'rake'
-require 'rubygems' unless 
+require 'rubygems' unless
   Object.const_defined?(:Gem)
-require File.dirname(__FILE__) + "/lib/columnize/version" unless 
+require File.dirname(__FILE__) + "/lib/columnize/version" unless
   Object.const_defined?(:'Columnize')
 
 Gem::Specification.new do |spec|
-  spec.authors      = ['R. Bernstein']
+  spec.authors      = ['Rocky Bernstein']
   spec.date         = Time.now
   spec.description  = '
 In showing a long lists, sometimes one would prefer to see the value
 arranged aligned in columns. Some examples include listing methods
-of an object or debugger commands. 
+of an object or debugger commands.
 See Examples in the rdoc documentation for examples.
 '
   spec.email        = 'rockyb@rubyforge.net'
@@ -27,10 +27,12 @@ See Examples in the rdoc documentation for examples.
   spec.summary      = 'Module to format an Array as an Array of String aligned in columns'
   spec.version      = Columnize::VERSION
   spec.has_rdoc     = true
-  spec.extra_rdoc_files = %w(README.md lib/columnize.rb COPYING)
+  spec.extra_rdoc_files = %w(README.md lib/columnize.rb COPYING THANKS)
 
   # Make the readme file the start page for the generated html
   spec.rdoc_options += %w(--main README)
   spec.rdoc_options += ['--title', "Columnize #{Columnize::VERSION} Documentation"]
 
+  spec.add_development_dependency 'rdoc'
+  spec.add_development_dependency 'rake'
 end

data/lib/columnize.rb

@@ -1,292 +1,127 @@
-# Module to format an Array as an Array of String aligned in columns.
+# Module to format an Array into a single string with embedded
+# newlines, On printing the string, the columns are aligned.
 #
 # == Summary
-# Display a list of strings as a compact set of 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. Options are avalable for setting
-# * the display width
-# * the column separator
-# * the line prefix
-# * whether to ignore terminal codes in text size calculation
-# * whether to left justify text instead of right justify
+#  Return a string from an array with embedded newlines formatted so
+#  that when printed the columns are aligned.
+#  See below for examples and options to the main method +columnize+.
 #
-# == License 
 #
-# Columnize is copyright (C) 2007, 2008, 2009, 2010, 2011 Rocky Bernstein
+# == License
+#
+# Columnize is copyright (C) 2007-2011, 2013 Rocky Bernstein
 # <rockyb@rubyforge.net>
 #
 # All rights reserved.  You can redistribute and/or modify it under
 # the same terms as Ruby.
 #
-# Adapted from the routine of the same name in Python +cmd.py+.
+# Also available in Python (columnize), and Perl (Array::Columnize)
 
 module Columnize
+  # Pull in the rest of my pieces
+  ROOT_DIR = File.dirname(__FILE__)
+  %w(opts columnize version).each do |submod|
+    require File.join %W(#{ROOT_DIR} columnize #{submod})
+  end
 
-  # When an option is not specified for the below keys, these
-  # are the defaults.
-  DEFAULT_OPTS = {
-    :arrange_array     => false,
-    :arrange_vertical  => true,
-    :array_prefix      => '',
-    :array_suffix      => '',
-    :colsep            => '  ',
-    :displaywidth      => 80,
-    :lineprefix        => '',
-    :ljust             => :auto,
-    :term_adjust       => false
-  }
-
-  module_function
+  # Add +columnize_opts+ instance variable to classes that mix in this module. The type should be a kind of hash in file +columnize/opts+.
+  attr_accessor :columnize_opts
 
-  # Options parsing routine for Columnize::columnize. In the preferred
-  # newer style, +args+ is either a hash where each key is one of the option
-  # names: 
+  #  Columnize.columize([args]) => String
+  #
+  #  Return a string from an array with embedded newlines formatted so
+  #  that when printed the columns are aligned.
+  #
+  #  For example, for a line width of 4 characters (arranged vertically):
+  #      a = (1..4).to_a
+  #      Columnize.columnize(a) => '1  3\n2  4\n'
+  #
+  #  Alternatively:
+  #      a.columnize => '1  3\n2  4\n'
+  #
+  #  Arranged horizontally:
+  #      a.columnize(:arrange_vertical => false) =>
+  #        ['1', '2,', '3', '4'] => '1  2\n3  4\n'
+  #
+  #  Formatted as an array using format specifier '%02d':
+  #      puts (1..10).to_a.columnize(:arrange_array => true, :colfmt => '%02d',
+  #                                  :displaywidth => 10) =>
+  #      [01, 02,
+  #       03, 04,
+  #       05, 06,
+  #       07, 08,
+  #       09, 10,
+  #      ]
   #
-  # [arrange_vertical] Arrange list vertically rather than horizontally. This is the default
-  # [colsep] String used to separate columns
-  # [displaywidth] Maximum width of each line
-  # [ljust] Boolean or +:auto+: Left-justify fields in a column? The default is +true+. If
-  # the :auto, then right-justify if every element of the data is a kind of Numeric.
-  # [lineprefix] String: string to prepend to each line. The default is ''.
-  # 
-  # In the older style positional arguments are used and the positions
-  # are in the order: +displaywidth+, +colsep+, +arrange_vertical+,
-  # +ljust+, and +lineprefix+.
-  def parse_columnize_options(args)
+  # Each column is only as wide as necessary.  By default, columns are
+  # separated by two spaces. Options are available for setting
+  # * the line display width
+  # * a column separator
+  # * a line prefix
+  # * a line suffix
+  # * A format specify for formatting each item each array item to a string
+  # * whether to ignore terminal codes in text size calculation
+  # * whether to left justify text instead of right justify
+  # * whether to format as an array - with surrounding [] and
+  #   separating ', '
+  def self.columnize(*args)
     list = args.shift
-    if 1 == args.size && args[0].kind_of?(Hash)
-      opts = DEFAULT_OPTS.merge(args[0])
-      if opts[:arrange_array]
-        opts[:array_prefix] = '['
-        opts[:lineprefix]   = ' '
-        opts[:array_suffix] = "]\n"
-        opts[:colsep]       = ', '
-        opts[:arrange_vertical] = false
-      end
-      opts[:ljust] = !(list.all?{|datum| datum.kind_of?(Numeric)}) if 
-        opts[:ljust] == :auto
-      return list, opts
-    else      
-      opts = DEFAULT_OPTS.dup
-      %w(displaywidth colsep arrange_vertical ljust lineprefix
-        ).each do |field|
-        break if args.empty?
-        opts[field.to_sym] = args.shift
-      end
-      return list, opts
-    end
+    opts = parse_columnize_options(args)
+    Columnizer.new(list, opts).columnize
   end
 
-  # Return the length of String +cell+. If Boolean +term_adjust+ is true,
-  # ignore terminal sequences in +cell+.
-  def cell_size(cell, term_adjust)
-    if term_adjust
-      cell.gsub(/\e\[.*?m/, '')
-    else
-      cell
-    end.size
+  # Adds columnize_opts to the singleton level of included class
+  def self.included(base)
+    # screw class variables, we'll use an instance variable on the class singleton
+    class << base
+      attr_accessor :columnize_opts
+    end
+    base.columnize_opts = DEFAULT_OPTS.dup
   end
 
-  # 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):
-  #     ['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 possible, no larger than
-  # +displaywidth'.  If +list+ is not an array, the empty string, '',
-  # is returned. By default, columns are separated by two spaces - one
-  # was not legible enough. Set +colsep+ to adjust the string separate
-  # columns. If +arrange_vertical+ is set false, consecutive items
-  # will go across, left to right, top to bottom.
-
   def columnize(*args)
+    return Columnize.columnize(*args) if args.length > 1
+    opts = args.empty? ? {} : args.pop
+    @columnize_opts ||= self.class.columnize_opts.dup
+    @columnizer ||= Columnizer.new(self, @columnize_opts)
+    # make sure that any changes to list or opts get passed to columnizer
+    @columnizer.list = self unless @columnizer.list == self
+    @columnizer.opts = @columnize_opts.merge(opts) unless @columnizer.opts == @columnize_opts and opts.empty?
+    @columnizer.columnize
+  end
+end
 
-    list, opts = parse_columnize_options(args)
+# Mix Columnize into Array
+Array.send :include, Columnize
 
-    # Some degenerate cases
-    return '' if not list.is_a?(Array)
-    return  "<empty>\n" if list.empty?
-    l = list.map{|li| li.to_s}
-    return "%s%s%s\n" % [opts[:array_prefix], l[0], 
-                         opts[:array_suffix]] if 1 == l.size
+# Demo this sucker
+if __FILE__ == $0
+  # include Columnize
 
-    nrows = ncols = 0  # Make nrows, ncols have more global scope
-    colwidths = []     # Same for colwidths
-    if opts[:displaywidth] - opts[:lineprefix].length < 4
-      opts[:displaywidth] = opts[:lineprefix].length + 4
-    else
-      opts[:displaywidth] -= opts[:lineprefix].length
-    end
-    if opts[:arrange_vertical]
-      array_index = lambda {|num_rows, row, col| num_rows*col + row }
-      # Try every row count from 1 upwards
-      1.upto(l.size-1) do |_nrows|
-        nrows = _nrows
-        ncols = (l.size + nrows-1) / nrows
-        colwidths = []
-        totwidth = -opts[:colsep].length
+  a = (1..80).to_a
+  puts a.columnize :arrange_array => true
+  puts '=' * 50
 
-        0.upto(ncols-1) do |col|
-          # get max column width for this column
-          colwidth = 0
-          0.upto(nrows-1) do |_row|
-            row = _row
-            i = array_index.call(nrows, row, col)
-            break if i >= l.size
-            colwidth = [colwidth, cell_size(l[i], opts[:term_adjust])].max
-          end
-          colwidths.push(colwidth)
-          totwidth += colwidth + opts[:colsep].length
-          if totwidth > opts[:displaywidth]
-            ncols = col
-            break
-          end
-        end
-        break if totwidth <= opts[:displaywidth]
-      end
-      ncols = 1 if ncols < 1
-      nrows = l.size if ncols == 1
-      # The smallest number of rows computed and the max widths for
-      # each column has been obtained.  Now we just have to format
-      # each of the rows.
-      s = ''
-      0.upto(nrows-1) do |_row| 
-        row = _row
-        texts = []
-        0.upto(ncols-1) do |col|
-          i = array_index.call(nrows, row, col)
-          if i >= l.size
-            x = ''
-          else
-            x = l[i]
-          end
-          texts.push(x)
-        end
-        texts.pop while !texts.empty? and texts[-1] == ''
-        if texts.size > 0
-          0.upto(texts.size-1) do |col|
-            unless ncols == 1 && opts[:ljust]
-              if opts[:ljust]
-                texts[col] = texts[col].ljust(colwidths[col])
-              else
-                texts[col] = texts[col].rjust(colwidths[col])
-              end
-            end
-          end
-          s += "%s%s\n" % [opts[:lineprefix], texts.join(opts[:colsep])]
-        end
-      end
-      return s
-    else
-      array_index = lambda {|num_rows, row, col| ncols*(row-1) + col }
-      # Assign to make enlarge scope of loop variables.
-      totwidth = i = rounded_size = 0  
-      # Try every column count from size downwards.
-      l.size.downto(1) 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|
-          nrows = _nrows
-          rounded_size = nrows * ncols
-          colwidths = []
-          totwidth = -opts[:colsep].length
-          colwidth = row = 0
-          0.upto(ncols-1) do |col|
-            # get max column width for this column
-            1.upto(nrows) do |_row|
-              row = _row
-              i = array_index.call(nrows, row, col)
-              break if i >= l.size
-              colwidth = [colwidth, cell_size(l[i], opts[:term_adjust])].max
-            end
-            colwidths.push(colwidth)
-            totwidth += colwidth + opts[:colsep].length
-            break if totwidth > opts[:displaywidth];
-          end
-          if totwidth <= opts[:displaywidth]
-            # Found the right nrows and ncols
-            nrows  = row
-            break
-          elsif totwidth >= opts[:displaywidth]
-            # Need to reduce ncols
-            break
-          end
-        end
-        break if totwidth <= opts[:displaywidth] and i >= rounded_size-1
-      end
-      ncols = 1 if ncols < 1
-      nrows = l.size if ncols == 1
-      # The smallest number of rows computed and the max widths for
-      # each column has been obtained.  Now we just have to format
-      # each of the rows.
-      s = ''
-      prefix = if opts[:array_prefix].empty?
-                 opts[:lineprefix] 
-               else 
-                 opts[:array_prefix]
-               end
-      1.upto(nrows) do |row| 
-        texts = []
-        0.upto(ncols-1) do |col|
-          i = array_index.call(nrows, row, col)
-          if i >= l.size
-            break
-          else
-            x = l[i]
-          end
-          texts.push(x)
-        end
-        0.upto(texts.size-1) do |col|
-          unless ncols == 1 && opts[:ljust]
-            if opts[:ljust]
-              texts[col] = texts[col].ljust(colwidths[col]) if ncols != 1
-            else
-              texts[col] = texts[col].rjust(colwidths[col])
-            end
-          end
-        end
-        s += "%s%s\n" % [prefix, texts.join(opts[:colsep])]
-        prefix = opts[:lineprefix]
-      end
-      s += opts[:array_suffix]
-      return s
-    end
-  end
-end
-if __FILE__ == $0
-  #
-  include Columnize
-  
-  line = 'require "irb"';
-  puts cell_size(line, true);
-  puts cell_size(line, false);
+  b = (1..10).to_a
+  puts b.columnize(:displaywidth => 10)
+
+  puts '-' * 50
+  puts b.columnize(:arrange_array => true, :colfmt => '%02d', :displaywidth => 10)
 
   [[4, 4], [4, 7], [100, 80]].each do |width, num|
-    data = (1..num).map{|i| i}
+    data = (1..num).map{|i| i }
     [[false, 'horizontal'], [true, 'vertical']].each do |bool, dir|
       puts "Width: #{width}, direction: #{dir}"
-      print columnize(data, :displaywidth => width, :colsep => '  ', 
-                      :arrange_vertical => bool, :ljust => :auto)
+      print Columnize.columnize(data, :displaywidth => width, :colsep => '  ', :arrange_vertical => bool, :ljust => :auto)
       end
   end
 
-  puts Columnize::columnize(5)
-  puts columnize([])
-  puts columnize(["a", 2, "c"], :displaywidth =>10, :colsep => ', ')
-  puts columnize(["oneitem"])
-  puts columnize(["one", "two", "three"])
+  puts Columnize.columnize(5)
+  puts Columnize.columnize([])
+  puts Columnize.columnize(["a", 2, "c"], :displaywidth =>10, :colsep => ', ')
+  puts Columnize.columnize(["oneitem"])
+  puts Columnize.columnize(["one", "two", "three"])
   data = ["one",       "two",         "three",
           "for",       "five",        "six",
           "seven",     "eight",       "nine",
@@ -296,7 +131,7 @@ if __FILE__ == $0
           "nineteen",  "twenty",      "twentyone",
           "twentytwo", "twentythree", "twentyfour",
           "twentyfive","twentysix",   "twentyseven"]
-  
-  puts columnize(data)
-  puts columnize(data, 80, '  ', false)
+
+  puts Columnize.columnize(data)
+  puts Columnize.columnize(data, 80, '  ', false)
 end