highline 1.6.16 → 1.6.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e7d1127875f296c95669eb827d9eb89b0546d9b5
+  data.tar.gz: ddfe6f50b33cc5cef736259e11f8ee44421747f2
+SHA512:
+  metadata.gz: 78fd61a881b49fb341078263ad1af1d98cd8d14e34524fd5701932cc929e4572cd96d12eff688a88a9701142e6f268f06f9dcf63fd049b61b1665e92d91a053c
+  data.tar.gz: 6897351c5512a5f39ea98eac8c4bee52a5772dde4e871126d3eb45a68446a12e6097290994a51fbe1a8b71a2ff0ee6c10864b0e728270a368d5aefaa1be7f11f

data/CHANGELOG

@@ -2,6 +2,11 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.6.17
+
+* Added encoding support to menus (by David Lyons).
+* Some minor fixes to SystemExtensions (by whiteleaf and presidentbeef).
+
 == 1.6.16
 
 * Added the new indention feature (by davispuh).

data/lib/highline.rb

@@ -28,7 +28,7 @@ require "highline/style"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.16".freeze
+  VERSION = "1.6.17".freeze
 
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError
@@ -616,6 +616,10 @@ class HighLine
     statement = statement.to_str
     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)
 

data/lib/highline/system_extensions.rb

@@ -39,19 +39,53 @@ class HighLine
       end
     end
 
-    module_function
-
     #
     # This section builds character reading and terminal size functions
     # to suit the proper platform we're running on.  Be warned:  Here be
     # dragons!
     #
-    begin
-      # Cygwin will look like Windows, but we want to treat it like a Posix OS:
-      raise LoadError, "Cygwin is a Posix OS." if RUBY_PLATFORM =~ /\bcygwin\b/i
+    if RUBY_PLATFORM =~ /mswin(?!ce)|mingw|bccwin/i
+      begin
+        require "fiddle"
+
+        module WinAPI
+          include Fiddle
+          Handle = RUBY_VERSION >= "2.0.0" ? Fiddle::Handle : DL::Handle
+          Kernel32 = Handle.new("kernel32")
+          Crt = Handle.new("msvcrt") rescue Handle.new("crtdll")
+
+          def self._getch
+            @@_m_getch ||= Function.new(Crt["_getch"], [], TYPE_INT)
+            @@_m_getch.call
+          end
+
+          def self.GetStdHandle(handle_type)
+            @@get_std_handle ||= Function.new(Kernel32["GetStdHandle"], [-TYPE_INT], -TYPE_INT)
+            @@get_std_handle.call(handle_type)
+          end
 
-      require "Win32API"             # See if we're on Windows.
+          def self.GetConsoleScreenBufferInfo(cons_handle, lp_buffer)
+            @@get_console_screen_buffer_info ||=
+              Function.new(Kernel32["GetConsoleScreenBufferInfo"], [TYPE_LONG, TYPE_VOIDP], TYPE_INT)
+            @@get_console_screen_buffer_info.call(cons_handle, lp_buffer)
+          end
+        end
+      rescue LoadError
+        require "dl/import"
 
+        module WinAPI
+          extend DL::Importer rescue DL::Importable
+          begin
+            dlload "msvcrt", "kernel32"
+          rescue DL::DLError
+            dlload "crtdll", "kernel32"
+          end
+          extern "unsigned long _getch()"
+          extern "unsigned long GetConsoleScreenBufferInfo(unsigned long, void*)"
+          extern "unsigned long GetStdHandle(unsigned long)"
+        end
+      end
+ 
       CHARACTER_MODE = "Win32API"    # For Debugging purposes only.
 
       #
@@ -61,9 +95,7 @@ class HighLine
       # character from +STDIN+!
       #
       def get_character( input = STDIN )
-        Win32API.new("msvcrt", "_getch", [ ], "L").Call
-      rescue Exception
-        Win32API.new("crtdll", "_getch", [ ], "L").Call
+        WinAPI._getch
       end
 
       # We do not define a raw_no_echo_mode for Windows as _getch turns off echo
@@ -75,24 +107,16 @@ class HighLine
 
       # A Windows savvy method to fetch the console columns, and rows.
       def terminal_size
-        m_GetStdHandle               = Win32API.new( 'kernel32',
-                                                     'GetStdHandle',
-                                                     ['L'],
-                                                     'L' )
-        m_GetConsoleScreenBufferInfo = Win32API.new(
-          'kernel32', 'GetConsoleScreenBufferInfo', ['L', 'P'], 'L'
-        )
-
         format        = 'SSSSSssssSS'
         buf           = ([0] * format.size).pack(format)
-        stdout_handle = m_GetStdHandle.call(0xFFFFFFF5)
+        stdout_handle = WinAPI.GetStdHandle(0xFFFFFFF5)
 
-        m_GetConsoleScreenBufferInfo.call(stdout_handle, buf)
+        WinAPI.GetConsoleScreenBufferInfo(stdout_handle, buf)
         _, _, _, _, _,
         left, top, right, bottom, _, _ = buf.unpack(format)
         return right - left + 1, bottom - top + 1
       end
-    rescue LoadError                  # If we're not on Windows try...
+    else                  # If we're not on Windows try...
       begin
         require "termios"             # Unix, first choice termios.
 
@@ -169,7 +193,7 @@ class HighLine
       end
 
       # For termios and stty
-      if not defined?(terminal_size)
+      if not method_defined?(:terminal_size)
         # A Unix savvy method using stty to fetch the console columns, and rows.
         # ... stty does not work in JRuby
         def terminal_size
@@ -183,7 +207,7 @@ class HighLine
       end
     end
 
-    if not defined?(get_character)
+    if not method_defined?(:get_character)
       def get_character( input = STDIN )
         input.getbyte
       end

data/test/tc_menu.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # tc_menu.rb
 #
 #  Created by Gregory Thomas Brown on 2005-05-10.
@@ -65,6 +66,17 @@ class TestMenu < Test::Unit::TestCase
     end
     assert_equal("Sample1, Sample2 or Sample3?  ", @output.string)
   end
+  
+  def test_unicode_flow
+    @input << "1\n"
+    @input.rewind
+
+    @terminal.choose do |menu|
+      # Default:  menu.flow = :rows
+      menu.choice "Unicode right single quotation mark: ’"
+    end
+    assert_equal("1. Unicode right single quotation mark: ’\n?  ", @output.string)
+  end
 
   def test_help
     @input << "help\nhelp load\nhelp rules\nhelp missing\n"

metadata

@@ -1,26 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.6.16
-  prerelease: 
+  version: 1.6.17
 platform: ruby
 authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-04-14 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: []
@@ -82,6 +76,7 @@ files:
 homepage: http://highline.rubyforge.org
 licenses:
 - Ruby
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -91,22 +86,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: highline
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HighLine is a high-level command-line IO library.
 test_files:
 - test/string_methods.rb