highline 1.6.8 → 1.6.9

data/.gitignore

@@ -0,0 +1,2 @@
+doc
+pkg

data/AUTHORS

@@ -0,0 +1,3 @@
+James Edward Gray II::  {james@grayproductions.net}[mailto:james@grayproductions.net]
+Gregory Brown::         {gregory.t.brown@gmail.com}[mailto:gregory.t.brown@gmail.com]
+Richard LeBer::         {richard.leber@gmail.com}[mailto:richard.leber@gmail.com]

data/CHANGELOG

@@ -2,6 +2,13 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.6.9
+
+* The new list modes now properly ignore escapes when sizing.
+* Added a project gemspec file.
+* Fixed a bug that prevented the use of termios (by tomdz).
+* Switch to JLine to provide better echo support on JRuby (by tomdz).
+
 == 1.6.8
 
 * Fix missing <tt>ERASE_CHAR</tt> reference (by Aaron Gifford).

data/COPYING

@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    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 should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

data/Rakefile

@@ -34,38 +34,9 @@ task :upload_docs => [:rdoc] do
      "bbazzarrakk@rubyforge.org:/var/www/gforge-projects/highline/"
 end
 
-spec = Gem::Specification.new do |spec|
-  spec.name     = "highline"
-  spec.version  = version
-  spec.platform = Gem::Platform::RUBY
-  spec.summary  = "HighLine is a high-level command-line IO library."
-  spec.files    = Dir.glob("{examples,lib,test}/**/*.rb").
-                      delete_if { |item| item.include?("CVS") } +
-                      ["Rakefile", "setup.rb"]
-
-  spec.test_files       =  "test/ts_all.rb"
-  spec.has_rdoc         =  true
-  spec.extra_rdoc_files =  %w{README INSTALL TODO CHANGELOG LICENSE}
-  spec.rdoc_options     << '--title' << 'HighLine Documentation' <<
-                           '--main'  << 'README'
-
-  spec.require_path      = 'lib'
-
-  spec.author            = "James Edward Gray II"
-  spec.email             = "james@grayproductions.net"
-  spec.rubyforge_project = "highline"
-  spec.homepage          = "http://highline.rubyforge.org"
-  spec.description       = <<END_DESC
-A high-level IO library that provides validation, type conversion, and more for
-command-line interfaces. HighLine also includes a complete menu system that can
-crank out anything from simple list selection to complete shells with just
-minutes of work.
-END_DESC
-end
-
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
+load(File.join(File.dirname(__FILE__), "highline.gemspec"))
+Gem::PackageTask.new(SPEC) do |package|
+  # do nothing:  I just need a gem but this block is required
 end
 
 desc "Show library's code statistics"

data/doc/.cvsignore

@@ -0,0 +1 @@
+html

data/highline.gemspec

@@ -0,0 +1,36 @@
+DIR     = File.dirname(__FILE__)
+LIB     = File.join(DIR, *%w[lib highline.rb])
+VERSION = open(LIB) { |lib|
+  lib.each { |line|
+    if v = line[/^\s*VERSION\s*=\s*(['"])(\d\.\d\.\d)\1/, 2]
+      break v
+    end
+  }
+}
+
+SPEC = Gem::Specification.new do |spec|
+  spec.name     = "highline"
+  spec.version  = VERSION
+  spec.platform = Gem::Platform::RUBY
+  spec.summary  = "HighLine is a high-level command-line IO library."
+  spec.files    = `git ls-files`.split("\n")
+
+  spec.test_files       =  `git ls-files -- test/*.rb`.split("\n")
+  spec.has_rdoc         =  true
+  spec.extra_rdoc_files =  %w{README INSTALL TODO CHANGELOG LICENSE}
+  spec.rdoc_options     << '--title' << 'HighLine Documentation' <<
+                           '--main'  << 'README'
+
+  spec.require_path      = 'lib'
+
+  spec.author            = "James Edward Gray II"
+  spec.email             = "james@graysoftinc.com"
+  spec.rubyforge_project = "highline"
+  spec.homepage          = "http://highline.rubyforge.org"
+  spec.description       = <<END_DESC
+A high-level IO library that provides validation, type conversion, and more for
+command-line interfaces. HighLine also includes a complete menu system that can
+crank out anything from simple list selection to complete shells with just
+minutes of work.
+END_DESC
+end

data/lib/highline/system_extensions.rb

@@ -61,7 +61,6 @@ class HighLine
       end
     rescue LoadError                  # If we're not on Windows try...
       begin
-        raise LoadError
         require "termios"             # Unix, first choice termios.
 
         CHARACTER_MODE = "termios"    # For Debugging purposes only.
@@ -97,7 +96,7 @@ class HighLine
           CHARACTER_MODE = "ncurses"    # For Debugging purposes only.
 
           #
-          # ncurses savvy getc().  (JRuby choice.)
+          # ncurses savvy getc().
           #
           def get_character( input = STDIN )
             FFI::NCurses.initscr
@@ -111,13 +110,6 @@ class HighLine
           end
 
         rescue LoadError => e            # If the ffi-ncurses choice fails, try using stty
-          if JRUBY
-            if e.message =~ /^no such file to load/
-              STDERR.puts "\n*** Using highline effectively in JRuby requires manually installing the ffi-ncurses gem.\n*** jruby -S gem install ffi-ncurses"
-            else
-              raise
-            end
-          end
           CHARACTER_MODE = "stty"    # For Debugging purposes only.
 
           #

data/lib/highline.rb

@@ -30,7 +30,7 @@ require "highline/style"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.8".freeze
+  VERSION = "1.6.9".freeze
   
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError
@@ -179,6 +179,21 @@ class HighLine
                   wrap_at = nil, page_at = nil )
     @input   = input
     @output  = output
+    if JRUBY
+      require 'java'
+      java_import 'java.io.OutputStreamWriter'
+      java_import 'java.nio.channels.Channels'
+      java_import 'jline.ConsoleReader'
+      java_import 'jline.Terminal'
+
+      @java_input = Channels.newInputStream($stdin.to_channel)
+      @java_output = OutputStreamWriter.new(Channels.newOutputStream($stdout.to_channel))
+      @java_terminal = Terminal.getTerminal
+      @java_console = ConsoleReader.new(@java_input, @java_output)
+      @java_console.setUseHistory(false)
+      @java_console.setBellEnabled(true)
+      @java_console.setUsePagination(false)
+    end
     
     self.wrap_at = wrap_at
     self.page_at = page_at
@@ -449,8 +464,8 @@ class HighLine
           option = (limit + 2) / (max_length + 2)
         end
 
-        items     = items.map do |item|
-          pad = max_length + (item.length - actual_length(item))
+        items = items.map do |item|
+          pad = max_length + (item.to_s.length - actual_length(item))
           "%-#{pad}s" % item
         end
         row_count = (items.size / option.to_f).ceil
@@ -488,7 +503,7 @@ class HighLine
             widths = Array.new(column_count, 0)
             rows.each do |row|
               row.each_with_index do |field, column|
-                size           = field.size
+                size           = actual_length(field)
                 widths[column] = size if size > widths[column]
               end
             end
@@ -496,8 +511,9 @@ class HighLine
             if column_count == 1 or
                widths.inject(0) { |sum, n| sum + n + 2 } <= limit + 2
               return rows.map { |row|
-                row.zip(widths).map { |field, i| "%-#{i}s" % field }.
-                                join("  ") + "\n"
+                row.zip(widths).map { |field, i|
+                  "%-#{i + (field.to_s.length - actual_length(field))}s" % field
+                }.join("  ") + "\n"
               }.join
             end
           end
@@ -511,14 +527,15 @@ class HighLine
           widths = Array.new(option, 0)
           rows.each do |row|
             row.each_with_index do |field, column|
-              size           = field.size
+              size           = actual_length(field)
               widths[column] = size if size > widths[column]
             end
           end
 
           return rows.map { |row|
-            row.zip(widths).map { |field, i| "%-#{i}s" % field }.join("  ") +
-            "\n"
+            row.zip(widths).map { |field, i|
+              "%-#{i + (field.to_s.length - actual_length(field))}s" % field
+            }.join("  ") + "\n"
           }.join
         end
       when :uneven_columns_down
@@ -534,7 +551,7 @@ class HighLine
             widths = Array.new(column_count, 0)
             columns.each_with_index do |column, i|
               column.each do |field|
-                size      = field.size
+                size      = actual_length(field)
                 widths[i] = size if size > widths[i]
               end
             end
@@ -543,10 +560,11 @@ class HighLine
                widths.inject(0) { |sum, n| sum + n + 2 } <= limit + 2
               list = ""
               columns.first.size.times do |index|
-                list << columns.zip(widths).
-                                map { |column, width| "%-#{width}s" %
-                                                      column[index] }.
-                                compact.join("  ").strip + "\n"
+                list << columns.zip(widths).map { |column, width|
+                  field = column[index]
+                  "%-#{width + (field.to_s.length - actual_length(field))}s" %
+                  field
+                }.compact.join("  ").strip + "\n"
               end
               return list
             end
@@ -561,17 +579,17 @@ class HighLine
           widths = Array.new(option, 0)
           columns.each_with_index do |column, i|
             column.each do |field|
-              size      = field.size
+              size      = actual_length(field)
               widths[i] = size if size > widths[i]
             end
           end
 
           list = ""
           columns.first.size.times do |index|
-            list << columns.zip(widths).
-                            map { |column, width| "%-#{width}s" %
-                                                  column[index] }.
-                            compact.join("  ").strip + "\n"
+            list << columns.zip(widths).map { |column, width|
+              field = column[index]
+              "%-#{width + (field.to_s.length - actual_length(field))}s" % field
+            }.compact.join("  ").strip + "\n"
           end
           return list
         end
@@ -755,13 +773,34 @@ class HighLine
 
       answer
     else
-      raise EOFError, "The input stream is exhausted." if @@track_eof and
-                                                          @input.eof?
+      if JRUBY
+        enable_echo_afterwards = @java_terminal.isEchoEnabled
+        @java_terminal.disableEcho
+        begin
+          raw_answer = @java_console.readLine(nil, nil)
+        ensure
+          @java_terminal.enableEcho if enable_echo_afterwards
+        end
+      else
+        raise EOFError, "The input stream is exhausted." if @@track_eof and
+                                                            @input.eof?
+        raw_answer = @input.gets
+      end
 
-      @question.change_case(@question.remove_whitespace(@input.gets))
+      @question.change_case(@question.remove_whitespace(raw_answer))
     end
   end
-  
+
+  def get_single_character(is_stty)
+    if JRUBY
+      @java_console.readVirtualKey
+    elsif is_stty
+      @input.getbyte
+    else
+      get_character(@input)
+    end
+  end
+
   #
   # Return a line or character of input, as requested for this question.
   # Character input will be returned as a single character String,
@@ -773,18 +812,25 @@ class HighLine
   #
   def get_response(  )
     return @question.first_answer if @question.first_answer?
-    
+
+    stty = (CHARACTER_MODE == "stty")
+
     if @question.character.nil?
       if @question.echo == true and @question.limit.nil?
         get_line
       else
-        raw_no_echo_mode if stty = CHARACTER_MODE == "stty"
-        
+        if JRUBY
+          enable_echo_afterwards = @java_terminal.isEchoEnabled
+          @java_terminal.disableEcho
+        elsif stty
+          raw_no_echo_mode
+        end
+
         line            = ""
         backspace_limit = 0
         begin
 
-          while character = (stty ? @input.getbyte : get_character(@input))
+          while character = get_single_character(stty)
             # honor backspace and delete
             if character == 127 or character == 8
               line.slice!(-1, 1)
@@ -795,17 +841,16 @@ class HighLine
             end
             # looking for carriage return (decimal 13) or
             # newline (decimal 10) in raw input
-            break if character == 13 or character == 10 or
-                     (@question.limit and line.size == @question.limit)
+            break if character == 13 or character == 10
             if @question.echo != false
-              if character == 127 or character == 8 
-                  # only backspace if we have characters on the line to
-                  # eliminate, otherwise we'll tromp over the prompt
-                  if backspace_limit >= 0 then
-                    @output.print("\b#{HighLine.Style(:erase_char).code}")
-                  else 
-                      # do nothing
-                  end
+              if character == 127 or character == 8
+                # only backspace if we have characters on the line to
+                # eliminate, otherwise we'll tromp over the prompt
+                if backspace_limit >= 0 then
+                  @output.print("\b#{HighLine.Style(:erase_char).code}")
+                else
+                    # do nothing
+                end
               else
                 if @question.echo == true
                   @output.print(character.chr)
@@ -815,9 +860,14 @@ class HighLine
               end
               @output.flush
             end
+            break if @question.limit and line.size == @question.limit
           end
         ensure
-          restore_mode if stty
+          if JRUBY
+            @java_terminal.enableEcho if enable_echo_afterwards
+          elsif stty
+            restore_mode
+          end
         end
         if @question.overwrite
           @output.print("\r#{HighLine.Style(:erase_line).code}")
@@ -825,25 +875,37 @@ class HighLine
         else
           say("\n")
         end
-        
+
         @question.change_case(@question.remove_whitespace(line))
       end
-    elsif @question.character == :getc
-      @question.change_case(@input.getbyte.chr)
     else
-      response = get_character(@input).chr
-      if @question.overwrite
-        @output.print("\r#{HighLine.Style(:erase_line).code}")
-        @output.flush
-      else
-        echo = if @question.echo == true
-          response
-        elsif @question.echo != false
-          @question.echo
+      if JRUBY
+        enable_echo_afterwards = @java_terminal.isEchoEnabled
+        @java_terminal.disableEcho
+      end
+      begin
+        if @question.character == :getc
+          response = get_single_character(true).chr
         else
-          ""
+          response = get_single_character(stty).chr
+          if @question.overwrite
+            @output.print("\r#{HighLine.Style(:erase_line).code}")
+            @output.flush
+          else
+            echo = if @question.echo == true
+              response
+            elsif @question.echo != false
+              @question.echo
+            else
+              ""
+            end
+            say("#{echo}\n")
+          end
+        end
+      ensure
+        if JRUBY
+          @java_terminal.enableEcho if enable_echo_afterwards
         end
-        say("#{echo}\n")
       end
       @question.change_case(response)
     end
@@ -908,7 +970,7 @@ class HighLine
   # sequence escapes.
   # 
   def actual_length( string_with_escapes )
-    string_with_escapes.gsub(/\e\[\d{1,2}m/, "").length
+    string_with_escapes.to_s.gsub(/\e\[\d{1,2}m/, "").length
   end
 end
 

data/site/.cvsignore

@@ -0,0 +1 @@
+.DS_Store

data/site/highline.css

@@ -0,0 +1,65 @@
+body {
+  margin: 0;
+  padding: 0;
+  text-align: center;
+  background: #abc;
+  font: 13px Trebuchet MS, Lucida Sans Unicode, Arial, sans-serif;
+}
+
+#container {
+  margin: 0 auto;
+  margin-top: 10px;
+  position: relative;
+  width: 785px;
+  background: #fff repeat;
+  padding-top: 20px;
+}
+
+#container #header {
+  padding-top: 20px;
+  height: 141px;
+  width:  785px;
+  background: url(images/logo.png) center no-repeat;
+}
+
+#container #content {
+  text-align: left;
+  margin-left: 230px;
+  width: 500px;
+}
+
+#container #sidebar {
+  text-align: left;
+  position: absolute;
+  top: 181px;
+  left: 0;
+  width: 170px;
+  margin-right: 25px;
+}
+
+#container #footer {
+  font: 9px Arial;
+  padding: 4px;
+  border-top: 1px solid;
+  color: #aaa;
+}
+
+ul {
+  list-style: none;
+}
+
+li {
+  border-bottom: 1px solid #e8e8e8;
+  padding-top: 10px;
+}
+
+a {
+  text-decoration: none;
+  color: #15528a;
+}
+
+pre {
+  padding: 5px;
+  padding-left: 20px;
+  font: 11px Courier;
+}

data/site/index.html

@@ -0,0 +1,58 @@
+<html>
+  <head>
+    <title> HighLine </title>
+    <style type="text/css"> @import url(highline.css); </style>
+  </head>
+  <body>
+    <div id="container">
+      <div id="header"></div>
+      <div id="content">
+        <h2>HighLine is about&#8230;</h2>
+
+
+	<h3>Saving time.</h3>
+
+
+	<p>Command line interfaces are meant to be easy.  So why shouldn&#8217;t building
+them be easy, too?  HighLine provides a solid toolset to help you get
+the job done cleanly so you can focus on the real task at hand, 
+<em>your task.</em></p>
+
+
+	<h3>Clean and intuitive design.</h3>
+
+
+	<p>Want to get a taste for how HighLine is used?  Take a look at this simple
+example, which asks a user for a zip code, automatically does validation,
+and returns the result:</p>
+
+
+	<pre><code>zip = ask("Zip?  ") { |q| q.validate = /\A\d{5}(?:-?\d{4})?\Z/ }</code></pre>
+
+
+	<h3>Hassle-free Installation.</h3>
+
+
+	<p>Installation is easy via RubyGems.  Simply enter the command:</p>
+
+
+	<pre><code>sudo gem install highline</code></pre>
+
+
+	<p>and you&#8217;ll be on your way! Of course, manual installation is an option,
+too.</p>
+      </div>
+      <div id="sidebar">
+        <ul>
+	<li><a href="http://rubyforge.org/projects/highline">Project Page</a></li>
+		<li><a href="http://highline.rubyforge.org/doc">Documentation</a></li>
+		<li><a href="https://github.com/JEG2/highline">Source</a></li>
+		<li><a href="mailto:james@grayproductions.net">Contact</a></li>
+	</ul>
+      </div>
+      <div id="footer">
+      Created by James Edward Gray II and Gregory Brown
+      </div>
+    </div>
+  </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000 Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies: []
 description: ! 'A high-level IO library that provides validation, type conversion,
   and more for
@@ -21,7 +21,7 @@ description: ! 'A high-level IO library that provides validation, type conversio
   minutes of work.
 
 '
-email: james@grayproductions.net
+email: james@graysoftinc.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -31,6 +31,16 @@ extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 files:
+- .gitignore
+- AUTHORS
+- CHANGELOG
+- COPYING
+- INSTALL
+- LICENSE
+- README
+- Rakefile
+- TODO
+- doc/.cvsignore
 - examples/ansi_colors.rb
 - examples/asking_for_arrays.rb
 - examples/basic_usage.rb
@@ -42,6 +52,8 @@ files:
 - examples/password.rb
 - examples/trapping_eof.rb
 - examples/using_readline.rb
+- highline.gemspec
+- lib/highline.rb
 - lib/highline/color_scheme.rb
 - lib/highline/compatibility.rb
 - lib/highline/import.rb
@@ -50,7 +62,11 @@ files:
 - lib/highline/string_extensions.rb
 - lib/highline/style.rb
 - lib/highline/system_extensions.rb
-- lib/highline.rb
+- setup.rb
+- site/.cvsignore
+- site/highline.css
+- site/images/logo.png
+- site/index.html
 - test/string_methods.rb
 - test/tc_color_scheme.rb
 - test/tc_highline.rb
@@ -60,13 +76,6 @@ files:
 - test/tc_string_highline.rb
 - test/tc_style.rb
 - test/ts_all.rb
-- Rakefile
-- setup.rb
-- README
-- INSTALL
-- TODO
-- CHANGELOG
-- LICENSE
 homepage: http://highline.rubyforge.org
 licenses: []
 post_install_message: 
@@ -96,4 +105,12 @@ signing_key:
 specification_version: 3
 summary: HighLine is a high-level command-line IO library.
 test_files:
+- test/string_methods.rb
+- test/tc_color_scheme.rb
+- test/tc_highline.rb
+- test/tc_import.rb
+- test/tc_menu.rb
+- test/tc_string_extension.rb
+- test/tc_string_highline.rb
+- test/tc_style.rb
 - test/ts_all.rb