highline 1.6.20 → 1.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: a61adde22a7c1f3dee0c4bd0a140551c7c2d0d5c
-  data.tar.gz: f0ff2a065f96473524fcd21b76dd63e6d7317e1a
-!binary "U0hBNTEy":
-  metadata.gz: f7f546676de00891dece575d25b550459665f679161e2571d3218f355a16df9de929da9643b092948f17abd9764297846e2ac973d61b5d81d34933b9aef04ae4
-  data.tar.gz: b8a676035168b49bdff06d2f272b37818289461a2d27b371ad32b2516f1c1c616cfe916ac09b833470c17652cb9e6d1701e60b6eb37dfdce97eaacfbb67a7808
+SHA1:
+  metadata.gz: 654d8d8fa13e9d967eb78065d7d9c6be9f82fe44
+  data.tar.gz: d253b0c7ae6a1d36db8f0a07ce21c116e05e5c50
+SHA512:
+  metadata.gz: ef2e620391d4ba1df254868824bda3f88705ba2724450b6155ff785e803da17e55a4e8dcb0026d150be49260cd2857c9fb1be3362590fb9e5d6ee2066af39393
+  data.tar.gz: e1c49b575b7d30f0c1b594c32770ff9895fc5a4fa85c0861e34c8d50ee812ac66a6dd11f5b8da7677298134fb88ce4d50356700744d6bf3fd3db2c7f437c7c56

data/CHANGELOG

@@ -2,6 +2,11 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.6.21
+
+* Improved Windows integration (by Ronie Henrich).
+* Clarified menu choice error messages (by Keith Bennett).
+
 == 1.6.20
 
 * Fixed a bug with FFI::NCurses integration (by agentdave).

data/lib/highline.rb

@@ -28,7 +28,7 @@ require "highline/style"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.20".freeze
+  VERSION = "1.6.21".freeze
 
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError

data/lib/highline/menu.rb

@@ -368,31 +368,14 @@ class HighLine
 
     #
     # This method will update the intelligent responses to account for
-    # Menu specific differences.  This overrides the work done by
-    # Question.build_responses().
+    # Menu specific differences.  Calls the superclass' (Question's)
+    # build_responses method, overriding its default arguments to specify
+    # 'options' will be used to populate choice lists, and that
+    # the newly built hash will predominate over the preexisting hash
+    # for any keys that are the same.
     #
     def update_responses(  )
-      append_default unless default.nil?
-      @responses = @responses.merge(
-                     :ambiguous_completion =>
-                       "Ambiguous choice.  " +
-                       "Please choose one of #{options.inspect}.",
-                     :ask_on_error         =>
-                       "?  ",
-                     :invalid_type         =>
-                       "You must enter a valid #{options}.",
-                     :no_completion        =>
-                       "You must choose one of " +
-                       "#{options.inspect}.",
-                     :not_in_range         =>
-                       "Your answer isn't within the expected range " +
-                       "(#{expected_range}).",
-                     :mismatch             =>
-                       "Your entries didn't match.",
-                     :not_valid            =>
-                       "Your answer isn't valid (must match " +
-                       "#{@validate.inspect})."
-                   )
+      build_responses(options, true)
     end
   end
 end

data/lib/highline/question.rb

@@ -225,22 +225,29 @@ class HighLine
     #
     # Called late in the initialization process to build intelligent
     # responses based on the details of this Question object.
+    # Also used by Menu#update_responses.
     #
-    def build_responses(  )
-      ### WARNING:  This code is quasi-duplicated in     ###
-      ### Menu.update_responses().  Check there too when ###
-      ### making changes!                                ###
+    def build_responses(message_source = answer_type, new_hash_wins = false)
+
       append_default unless default.nil?
-      @responses = { :ambiguous_completion =>
-                       "Ambiguous choice.  " +
-                       "Please choose one of #{@answer_type.inspect}.",
+
+      choice_error_str_func = lambda do
+        message_source.is_a?(Array) \
+            ? '[' +  message_source.map { |s| "#{s}" }.join(', ') + ']' \
+            : message_source.inspect
+      end
+
+      old_hash = @responses
+
+      new_hash = { :ambiguous_completion =>
+                       "Ambiguous choice.  Please choose one of " +
+                       choice_error_str_func.call + '.',
                      :ask_on_error         =>
                        "?  ",
                      :invalid_type         =>
-                       "You must enter a valid #{@answer_type}.",
+                       "You must enter a valid #{message_source}.",
                      :no_completion        =>
-                       "You must choose one of " +
-                       "#{@answer_type.inspect}.",
+                       "You must choose one of " + choice_error_str_func.call + '.',
                      :not_in_range         =>
                        "Your answer isn't within the expected range " +
                        "(#{expected_range}).",
@@ -248,10 +255,9 @@ class HighLine
                        "Your entries didn't match.",
                      :not_valid            =>
                        "Your answer isn't valid (must match " +
-                       "#{@validate.inspect})." }.merge(@responses)
-      ### WARNING:  This code is quasi-duplicated in     ###
-      ### Menu.update_responses().  Check there too when ###
-      ### making changes!                                ###
+                       "#{@validate.inspect})." }
+
+      @responses = new_hash_wins ? old_hash.merge(new_hash) : new_hash.merge(old_hash)
     end
 
     #

data/lib/highline/system_extensions.rb

@@ -80,7 +80,13 @@ class HighLine
         require "dl/import"
 
         module WinAPI
-          extend DL::Importer rescue DL::Importable
+          if defined?(DL::Importer)
+            # Ruby 1.9
+            extend DL::Importer
+          else
+            # Ruby 1.8
+            extend DL::Importable
+          end
           begin
             dlload "msvcrt", "kernel32"
           rescue DL::DLError
@@ -89,6 +95,16 @@ class HighLine
           extern "unsigned long _getch()"
           extern "unsigned long GetConsoleScreenBufferInfo(unsigned long, void*)"
           extern "unsigned long GetStdHandle(unsigned long)"
+
+          # Ruby 1.8 DL::Importable.import does mname[0,1].downcase so FooBar becomes fooBar
+          if defined?(getConsoleScreenBufferInfo)
+            alias_method :GetConsoleScreenBufferInfo, :getConsoleScreenBufferInfo
+            module_function :GetConsoleScreenBufferInfo
+          end
+          if defined?(getStdHandle)
+            alias_method :GetStdHandle, :getStdHandle
+            module_function :GetStdHandle
+          end
         end
       end
 

data/test/tc_highline.rb

@@ -168,7 +168,7 @@ class TestHighLine < Test::Unit::TestCase
     end
     assert_equal(languages.last, answer)
     assert_equal( "What is your favorite programming language?  " +
-                  "You must choose one of [:Perl, :Python, :Ruby].\n" +
+                  "You must choose one of [Perl, Python, Ruby].\n" +
                   "?  ", @output.string )
   end
   
@@ -877,7 +877,7 @@ class TestHighLine < Test::Unit::TestCase
     assert_equal(:generate, answer)
     assert_equal( "Select a mode:  " +
                   "Ambiguous choice.  " +
-                  "Please choose one of [:generate, :gentle].\n" +
+                  "Please choose one of [generate, gentle].\n" +
                   "?  ", @output.string )
   end
   

metadata

@@ -1,25 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.6.20
+  version: 1.6.21
 platform: ruby
 authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-02-28 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: []
@@ -30,7 +25,7 @@ extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 files:
-- .gitignore
+- ".gitignore"
 - AUTHORS
 - CHANGELOG
 - COPYING
@@ -84,25 +79,25 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - HighLine Documentation
-- --main
+- "--main"
 - README
 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: []
 rubyforge_project: highline
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: HighLine is a high-level command-line IO library.