fancy_gets 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 71e6d543b0daf8b20b20b1989906a112a880d23d
-  data.tar.gz: 94b96b2bc2ffdd3f58c8adadbb0dd85bab7ecbc4
+SHA256:
+  metadata.gz: 51c96b67bf9c4b86e5a928042a1ef0923d720cedc3e75dc659bd58910c284e8c
+  data.tar.gz: 222b64256299e56e23c0829b2fb7a855d6d4f38cd158926040d661deb0121583
 SHA512:
-  metadata.gz: cf666cb9f9b1dc866dcfa2f451c975ae83814b7d156afa912b0f39a20c92adb4bcd772c929329d996470d92261a6fb1b1ff86f6ee81574a86cc5f12b0674bbd3
-  data.tar.gz: 0724abbfc5585e79ba86337726f4c3c7380074376b2e12f7ee7bf109890e6f902fbdf5affe87ff63112ef22d3dc47ecac421663cf892770cc3e1597b9b0cd093
+  metadata.gz: 573430996f606e869215ceb26ed019753192d9344d5c182027e22a9b9b09167eedc8938d994a0cdfbc64f8e3f6f1c9d4c57ff6eb1dc50d216632270c79ad78da
+  data.tar.gz: ece58b484fcf7fbf88c16f94d00a3868743c9218f5b0069cb9eaf12fb29d252aa0259945e3e8cf61641053a033829918d99be835a0c499336e73887dc5fd038e

data/fancy_gets.gemspec

@@ -35,6 +35,6 @@ It's all here.  Enjoy!}
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/fancy_gets.rb

@@ -40,10 +40,10 @@ module FancyGets
   def self.gets_internal_core(is_list, is_password, word_objects = nil, chosen = nil, prefix = "> ", postfix = " <", info = nil, height = nil, on_change = nil, on_select = nil)
     # OK -- second parameter, is_password, means is_multiple when is_list is true
     is_multiple = is_list & is_password
-    unless word_objects.nil? || is_list
+    if word_objects && !is_list
       word_objects.sort! {|wo1, wo2| wo1.to_s <=> wo2.to_s}
     end
-    words = word_objects.nil? ? [] : word_objects.map(&:to_s)
+    words = word_objects&.map(&:to_s) || []
     if is_multiple
       chosen ||= [0] unless is_multiple
     else
@@ -56,8 +56,8 @@ module FancyGets
     end
     position = 0
     # Up and down arrows break with height of 3 or less
-    height = words.length unless !height.nil? && height.is_a?(Numeric) && height >= 4
-    winheight = IO.console.winsize.first - 3
+    height = words.length unless height&.is_a?(Numeric) && height >= 4
+    winheight = (IO.console || STDOUT).winsize.first - 3
     height = words.length if height > words.length
     height = winheight if height > winheight
     offset = 0
@@ -109,7 +109,7 @@ module FancyGets
       # Put the response into the info line, as long as it's short enough!
       new_info.gsub!("\n", " ")
       new_info_length = uncolor.call(new_info).length
-      console_width = IO.console.winsize.last
+      console_width = (IO.console || STDOUT).winsize.last
       # Might have to trim if it's a little too wide
       new_info = new_info[0...console_width] if console_width < new_info_length
       # Arrow down to the info line
@@ -131,9 +131,9 @@ module FancyGets
       print (new_info_length > word_length ? "\b" : (27.chr + 91.chr + 67.chr)) * (new_info_length - word_length).abs
     end
 
-    handle_on_select = lambda do |focused|
+    handle_on_select = lambda do |selected|
       if on_select.is_a? Proc
-        response = on_select.call({chosen: chosen, focused: focused})
+        response = on_select.call({chosen: chosen, selected: selected})
         new_info = nil
         if response.is_a? Hash
           chosen = response[:chosen] || chosen
@@ -141,9 +141,7 @@ module FancyGets
         elsif response.is_a? String
           new_info = response
         end
-        unless new_info.nil?
-          write_info.call(new_info)
-        end
+        write_info.call(new_info) if new_info
       end
     end
 
@@ -256,7 +254,7 @@ module FancyGets
             chosen[i] = word_objects.index(item)
           end
         end
-        chosen.select{|item| !item.nil?}.uniq
+        chosen.compact.uniq
       else
         if word_objects.include?(chosen)
           chosen = [word_objects.index(chosen)]
@@ -356,7 +354,18 @@ module FancyGets
             arrow_down.call if is_list
           when 65 # - up
             arrow_up.call if is_list
-          when 51 # - Delete forwards?
+          when 51 # - Start of a possible delete forwards?
+            if STDIN.getch.ord == 126 # - Delete (forwards)
+              if !is_list && position < string.length
+                string = string[0...position] + string[position + 1..-1]
+                if words.empty?
+                  print "#{is_password ? "*" * (string.length - position) : string[position..-1]} #{"\b" * (string.length - position + 1)}"
+                else
+                  prev_sugg = sugg
+                  print "#{string[position..-1]}#{write_sugg.call}"
+                end
+              end
+            end
           else
             # puts "ESC 91 #{ch}"
           end
@@ -376,16 +385,6 @@ module FancyGets
             print "\b#{string[position..-1]}#{write_sugg.call}"
           end
         end
-      when 126 # Delete (forwards)
-        if !is_list && position < string.length
-          string = string[0...position] + string[position + 1..-1]
-          if words.empty?
-            print "#{is_password ? "*" * (string.length - position) : string[position..-1]} #{"\b" * (string.length - position + 1)}"
-          else
-            prev_sugg = sugg
-            print "#{string[position..-1]}#{write_sugg.call}"
-          end
-        end
       else # Insert character
         if is_list
           case ch
@@ -407,7 +406,7 @@ module FancyGets
                 if response.is_a? Hash
                   is_rejected = response[:is_rejected]
                   # If they told us exactly what the choices should now be, make that happen
-                  if !response.nil? && response[:chosen].is_a?(Enumerable)
+                  if response && response[:chosen].is_a?(Enumerable)
                     chosen = response[:chosen].map {|choice| word_objects.index(choice)}
                     is_rejected = true
                   end
@@ -415,9 +414,7 @@ module FancyGets
                 elsif response.is_a? String
                   new_info = response
                 end
-                unless new_info.nil?
-                  write_info.call(new_info)
-                end
+                write_info.call(new_info) if new_info
               end
               unless is_rejected
                 if does_include

data/lib/fancy_gets/version.rb

@@ -1,3 +1,3 @@
 module FancyGets
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fancy_gets
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Lorin Thwaits
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Enhanced gets with listbox, auto-complete, and password support
 test_files: []