highline 1.6.19 → 1.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c93d5d6310a71c9a3fba8e6c625ca28736e8fd20
-  data.tar.gz: 407f7bfd150c5bb79e82ed5bc1d1f9b61669de06
-SHA512:
-  metadata.gz: 970bcd09397745bc4c6f31bee83044f157277401b4be57e7465e9568dff609e795e631bfae69c157f3f06cd4b032d45807547eb04ddcfbaa2598397d9a36f34c
-  data.tar.gz: cb48512d7dcad2ecd6185c1c56cdb06bc25c377bc3a9b879d352a70fc6e1056160e9ceb1a9bfa18a1ba00f38ffac4d2c3dc76a0e543554fa04a5e9992761498b
+!binary "U0hBMQ==":
+  metadata.gz: a61adde22a7c1f3dee0c4bd0a140551c7c2d0d5c
+  data.tar.gz: f0ff2a065f96473524fcd21b76dd63e6d7317e1a
+!binary "U0hBNTEy":
+  metadata.gz: f7f546676de00891dece575d25b550459665f679161e2571d3218f355a16df9de929da9643b092948f17abd9764297846e2ac973d61b5d81d34933b9aef04ae4
+  data.tar.gz: b8a676035168b49bdff06d2f272b37818289461a2d27b371ad32b2516f1c1c616cfe916ac09b833470c17652cb9e6d1701e60b6eb37dfdce97eaacfbb67a7808

data/CHANGELOG

@@ -2,6 +2,12 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.6.20
+
+* Fixed a bug with FFI::NCurses integration (by agentdave).
+* Improved StringExtensions performance (by John Leach).
+* Various JRuby fixes (by presidentbeef).
+
 == 1.6.19
 
 * Fixed `terminal_size()` with jline2 (by presidentbeef).

data/README.rdoc

@@ -15,7 +15,11 @@ after, and let it do all the work.
 
 == Documentation
 
-See HighLine and HighLine::Question for documentation.
+See HighLine and HighLine::Question for documentation.  
+
+Start hacking in your code with HighLine with:
+
+  require 'highline/import'
 
 == Examples
 

data/examples/repeat_entry.rb

@@ -11,7 +11,7 @@ end
 
 puts "Ok, you did it."
 
-pass = ask("Enter your password:  ") do |q|
+pass = ask("<%= @key %>:  ") do |q|
   q.echo = '*'
   q.verify_match = true
   q.gather = {"Enter a password" => '',

data/lib/highline.rb

@@ -28,7 +28,7 @@ require "highline/style"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.19".freeze
+  VERSION = "1.6.20".freeze
 
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError
@@ -255,6 +255,7 @@ class HighLine
     # Also, JRuby-1.7's ConsoleReader.readLine() needs to be passed the prompt
     # to handle line editing properly.
     say(@question) unless ((JRUBY or @question.readline) and @question.echo == true)
+
     begin
       @answer = @question.answer_or_default(get_response)
       unless @question.valid_answer?(@answer)
@@ -613,22 +614,10 @@ class HighLine
   # and the HighLine.color() method.
   #
   def say( statement )
-    statement = statement.to_str
+    statement = format_statement(statement)
     return unless statement.length > 0
 
-    # Allow non-ascii menu prompts in ruby > 1.9.2. ERB eval the menu statement
-    # with the environment's default encoding(usually utf8)
-    statement.force_encoding(Encoding.default_external) if defined?(Encoding) && Encoding.default_external
-
-    template  = ERB.new(statement, nil, "%")
-    statement = template.result(binding)
-
-    statement = wrap(statement) unless @wrap_at.nil?
-    statement = page_print(statement) unless @page_at.nil?
-
-    statement = statement.gsub(/\n(?!$)/,"\n#{indentation}") if @multi_indent
-
-    # Don't add a newline if statement ends with whitespace, OR
+      # Don't add a newline if statement ends with whitespace, OR
     # if statement ends with whitespace before a color escape code.
     if /[ \t](\e\[\d+(;\d+)*m)?\Z/ =~ statement
       @output.print(indentation+statement)
@@ -672,10 +661,16 @@ class HighLine
     @indent_level += increase
     multi = @multi_indent
     @multi_indent = multiline unless multiline.nil?
-    if block_given?
-        yield self
-    else
-        say(statement)
+    begin
+        if block_given?
+            yield self
+        else
+            say(statement)
+        end
+    rescue
+        @multi_indent = multi
+        @indent_level -= increase
+        raise
     end
     @multi_indent = multi
     @indent_level -= increase
@@ -712,6 +707,25 @@ class HighLine
 
   private
 
+  def format_statement statement
+    statement = statement.dup.to_str
+    return statement unless statement.length > 0
+
+  # Allow non-ascii menu prompts in ruby > 1.9.2. ERB eval the menu statement
+    # with the environment's default encoding(usually utf8)
+    statement.force_encoding(Encoding.default_external) if defined?(Encoding) && Encoding.default_external
+
+    template  = ERB.new(statement, nil, "%")
+    statement = template.result(binding)
+
+    statement = wrap(statement) unless @wrap_at.nil?
+    statement = page_print(statement) unless @page_at.nil?
+
+    statement = statement.gsub(/\n(?!$)/,"\n#{indentation}") if @multi_indent
+
+    statement
+  end
+
   #
   # A helper method for sending the output stream and error and repeat
   # of the question.
@@ -839,7 +853,11 @@ class HighLine
       answer
     else
       if JRUBY
-        raw_answer = @java_console.readLine(@question.question, nil)
+        statement = format_statement(@question)
+        raw_answer = @java_console.readLine(statement, nil)
+
+        raise EOFError, "The input stream is exhausted." if raw_answer.nil? and
+                                                            @@track_eof
       else
         raise EOFError, "The input stream is exhausted." if @@track_eof and
                                                             @input.eof?
@@ -917,6 +935,10 @@ class HighLine
         @question.change_case(@question.remove_whitespace(line))
       end
     else
+      if JRUBY #prompt has not been shown
+        say @question
+      end
+
       raw_no_echo_mode
       begin
         if @question.character == :getc

data/lib/highline/string_extensions.rb

@@ -31,85 +31,65 @@ class HighLine
   module StringExtensions
     def self.included(base)
       HighLine::COLORS.each do |color|
+        color = color.downcase
         base.class_eval <<-END
-          if public_instance_methods.map { |m| m.to_s }.
-                                     include? "#{color.downcase}"
-            undef :#{color.downcase}
-          end
-          def #{color.downcase}
-            color(:#{color.downcase})
+          undef :#{color} if method_defined? :#{color}
+          def #{color}
+            color(:#{color})
           end
         END
+
         base.class_eval <<-END
-          if public_instance_methods.map { |m| m.to_s }.
-                                     include? "on_#{color.downcase}"
-            undef :on_#{color.downcase}
-          end
-          def on_#{color.downcase}
-            on(:#{color.downcase})
+          undef :on_#{color} if method_defined? :on_#{color}
+          def on_#{color}
+            on(:#{color})
           end
         END
         HighLine::STYLES.each do |style|
+          style = style.downcase
           base.class_eval <<-END
-            if public_instance_methods.map { |m| m.to_s }.
-                                       include? "#{style.downcase}"
-              undef :#{style.downcase}
-            end
-            def #{style.downcase}
-              color(:#{style.downcase})
+            undef :#{style} if method_defined? :#{style}
+            def #{style}
+              color(:#{style})
             end
           END
         end
       end
 
       base.class_eval do
-        if public_instance_methods.map { |m| m.to_s }.include? "color"
-          undef :color
-        end
-        if public_instance_methods.map { |m| m.to_s }.include? "foreground"
-          undef :foreground
-        end
+        undef :color if method_defined? :color
+        undef :foreground if method_defined? :foreground
         def color(*args)
           self.class.new(HighLine.color(self, *args))
         end
         alias_method :foreground, :color
 
-        if public_instance_methods.map { |m| m.to_s }.include? "on"
-          undef :on
-        end
+        undef :on if method_defined? :on
         def on(arg)
           color(('on_' + arg.to_s).to_sym)
         end
 
-        if public_instance_methods.map { |m| m.to_s }.include? "uncolor"
-          undef :uncolor
-        end
+        undef :uncolor if method_defined? :uncolor
         def uncolor
           self.class.new(HighLine.uncolor(self))
         end
 
-        if public_instance_methods.map { |m| m.to_s }.include? "rgb"
-          undef :rgb
-        end
+        undef :rgb if method_defined? :rgb
         def rgb(*colors)
           color_code = colors.map{|color| color.is_a?(Numeric) ? '%02x'%color : color.to_s}.join
           raise "Bad RGB color #{colors.inspect}" unless color_code =~ /^[a-fA-F0-9]{6}/
           color("rgb_#{color_code}".to_sym)
         end
 
-        if public_instance_methods.map { |m| m.to_s }.include? "on_rgb"
-          undef :on_rgb
-        end
+        undef :on_rgb if method_defined? :on_rgb
         def on_rgb(*colors)
           color_code = colors.map{|color| color.is_a?(Numeric) ? '%02x'%color : color.to_s}.join
           raise "Bad RGB color #{colors.inspect}" unless color_code =~ /^[a-fA-F0-9]{6}/
           color("on_rgb_#{color_code}".to_sym)
         end
 
-        if public_instance_methods.map { |m| m.to_s }.include? "method_missing"
-          undef :method_missing
-        end
         # TODO Chain existing method_missing
+        undef :method_missing if method_defined? :method_missing
         def method_missing(method, *args, &blk)
           if method.to_s =~ /^(on_)?rgb_([0-9a-fA-F]{6})$/
             color(method)

data/lib/highline/system_extensions.rb

@@ -14,10 +14,14 @@ class HighLine
     if JRUBY
       def initialize_system_extensions
         require 'java'
+        require 'readline'
         if JRUBY_VERSION =~ /^1.7/
           java_import 'jline.console.ConsoleReader'
 
-          @java_console = ConsoleReader.new(@input.to_inputstream, @output.to_outputstream)
+          input = @input && @input.to_inputstream
+          output = @output && @output.to_outputstream
+
+          @java_console = ConsoleReader.new(input, output)
           @java_console.set_history_enabled(false)
           @java_console.set_bell_enabled(true)
           @java_console.set_pagination_enabled(false)
@@ -176,7 +180,7 @@ class HighLine
               size = [80, 40]
               FFI::NCurses.initscr
               begin
-                size = FFI::NCurses.getmaxyx(stdscr).reverse
+                size = FFI::NCurses.getmaxyx(FFI::NCurses.stdscr).reverse
               ensure
                 FFI::NCurses.endwin
               end

data/test/tc_highline.rb

@@ -247,6 +247,11 @@ class TestHighLine < Test::Unit::TestCase
     assert_equal(1, answer)
   end
 
+  def test_frozen_statement
+    @terminal.say('This is a frozen statement'.freeze)
+    assert_equal("This is a frozen statement\n", @output.string)
+  end
+
   def test_color
     @terminal.say("This should be <%= BLUE %>blue<%= CLEAR %>!")
     assert_equal("This should be \e[34mblue\e[0m!\n", @output.string)
@@ -690,7 +695,8 @@ class TestHighLine < Test::Unit::TestCase
   end
   
   def test_mode
-    assert(%w[Win32API termios ncurses stty].include?(HighLine::CHARACTER_MODE))
+    assert(%w[Win32API termios ncurses stty jline].include?(HighLine::CHARACTER_MODE),
+           "#{HighLine::CHARACTER_MODE} not in list")
   end
   
   class NameClass

data/test/tc_menu.rb

@@ -422,7 +422,7 @@ class TestMenu < Test::Unit::TestCase
     # Tests that paging can be cancelled halfway through
     @terminal.page_at = 5
     # Will page twice, so stop after first page and make choice 3
-    @input << "q\n3\n"
+    @input << "q3\n"
     @input.rewind
 
     selected = @terminal.choose(* 1..10)

metadata

@@ -1,20 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.6.19
+  version: 1.6.20
 platform: ruby
 authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies: []
-description: |
-  A high-level IO library that provides validation, type conversion, and more for
+description: ! '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.
+
+'
 email: james@graysoftinc.com
 executables: []
 extensions: []
@@ -87,12 +92,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []