highline 1.6.14 → 1.6.15

data/CHANGELOG

@@ -2,6 +2,11 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.6.15
+
+* Added support for nil arguments in lists (by Eric Saxby).
+* Fixed HighLine's termios integration (by Jens Wille).
+
 == 1.6.14
 
 * Added JRuby 1.7 support (by Mina Nagy).

data/lib/highline.rb

@@ -28,7 +28,7 @@ require "highline/style"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.14".freeze
+  VERSION = "1.6.15".freeze
   
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError
@@ -425,7 +425,11 @@ class HighLine
   # 
   def list( items, mode = :rows, option = nil )
     items = items.to_ary.map do |item|
-      ERB.new(item, nil, "%").result(binding)
+      if item.nil?
+        ""
+      else
+        ERB.new(item, nil, "%").result(binding)
+      end
     end
     
     if items.empty?

data/lib/highline/system_extensions.rb

@@ -103,15 +103,15 @@ class HighLine
         CHARACTER_MODE = "termios"    # For Debugging purposes only.
 
         def raw_no_echo_mode
-          @state = Termios.getattr(input)
+          @state = Termios.getattr(@input)
           new_settings                     =  @state.dup
           new_settings.c_lflag             &= ~(Termios::ECHO | Termios::ICANON)
           new_settings.c_cc[Termios::VMIN] =  1
-          Termios.setattr(input, Termios::TCSANOW, new_settings)
+          Termios.setattr(@input, Termios::TCSANOW, new_settings)
         end
 
         def restore_mode
-            Termios.setattr(input, Termios::TCSANOW, @state)
+          Termios.setattr(@input, Termios::TCSANOW, @state)
         end
       rescue LoadError                # If our first choice fails, try using JLine
         if JRUBY                      # if we are on JRuby. JLine is bundled with JRuby.

data/test/tc_highline.rb

@@ -572,6 +572,14 @@ class TestHighLine < Test::Unit::TestCase
       assert_equal("", result)
     end
   end
+
+  def test_lists_with_nil_items
+    modes = [nil]
+    modes.each do |mode|
+      result = @terminal.list([nil], mode)
+      assert_equal("\n", result)
+    end
+  end
   
   def test_lists_with_one_item
     items = ['Zero']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.6.14
+  version: 1.6.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies: []
 description: ! 'A high-level IO library that provides validation, type conversion,
   and more for