fancy_gets 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff5d475c55794cbbeb171f984781e0e9e953f786
-  data.tar.gz: c1ee7c43108ebdee5d411f77ce00adee5979d028
+  metadata.gz: a874e5d77d0776b33016f748e58ea654146a3008
+  data.tar.gz: a18267ee4b5ec4e0292b17545ccfebc880561466
 SHA512:
-  metadata.gz: 55d84b9ec732bcaf7346715fc3708be30480071888dbce1b3a7072ec69c8e44022a45fee5923b0dd0707005df13055603bb0f75507c9721036c0c42e87cdbccc
-  data.tar.gz: bfb4ba37970492e8a901cdd09621daa212b0cdae6e9805ab2bb6544c9edbe87a9cc5b3178330f29c08950d57de0f4fabf0c5025c75d8640567b2bd269d7a257f
+  metadata.gz: 4c1a9f82173ba9f6d3470b2ca59912b394a232a56b7c203164a0acbae3674bf2d6325cc477d1120fd64d020cf02654d0a15a03b267330775dbc763025ded5829
+  data.tar.gz: 8d075d38ec64b686532ac8ce1402762bc23b1c0058d58c1494035824bbadccb6309cd44d235d9acde81b40dce5bd7d55d43314a5ed5cb1da8e27dfea10547d29

data/lib/fancy_gets/version.rb

@@ -1,3 +1,3 @@
 module FancyGets
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/fancy_gets.rb

@@ -22,22 +22,29 @@ module FancyGets
       is_multiple = false
     end
     is_multiple = true if chosen.is_a?(Array) && chosen.length > 1
-    FancyGets.gets_internal_core(true, is_multiple, words, chosen, prefix, postfix, info)
+    height = words.length
+    winheight = IO.console.winsize.first - 3
+    height = winheight if height > winheight
+    FancyGets.gets_internal_core(true, is_multiple, words, chosen, prefix, postfix, info, height)
   end
 
   # The internal routine that makes all the magic happen
-  def self.gets_internal_core(is_list, is_password, words = nil, chosen = [], prefix = "> ", postfix = " <", info = nil)
+  def self.gets_internal_core(is_list, is_password, words = nil, chosen = [], prefix = "> ", postfix = " <", info = nil, height = nil)
     # OK -- second parameter, is_password, means is_multiple when is_list is true
     is_multiple = is_list & is_password
     words.sort! unless words.nil? || is_list
     string = chosen if chosen.is_a?(String)
     position = 0
+    height ||= words.length
+    offset = (height < words.length) ? 0 : nil
     sugg = ""
     prev_sugg = ""
 
     # gsub causes any color changes to not offset spacing
     uncolor = lambda { |word| word.gsub(/\033\[[0-9;]+m/, "") }
 
+    max_word_length = words.map{|word| uncolor.call(word).length}.max
+
     write_sugg = lambda do
       # Find first word that case-insensitive matches what they've typed
       if string.empty?
@@ -67,6 +74,8 @@ module FancyGets
       else
         print "#{" " * uncolor.call(prefix).length}#{word}#{" " * uncolor.call(postfix).length}"
       end
+      print " " * (max_word_length - uncolor.call(words[position]).length)
+      print "\b" * (max_word_length - uncolor.call(words[position]).length)
       print "\b" * (uncolor.call(word).length + pre_post_length) if is_end_at_front
     end
 
@@ -85,9 +94,29 @@ module FancyGets
       chosen ||= []
       chosen = [words[0]] if chosen == [] && !is_multiple
       position = words.index(chosen.first) if chosen.length > 0
-      words.each { |word| puts chosen.include?(word) ? "#{prefix}#{word}#{postfix}" : "#{" " * uncolor.call(prefix).length}#{word}" }
+      # If there's more options than we can fit at once
+      unless offset.nil?
+        # ... put the chosen one a third of the way down the screen
+        offset = position - (height / 3)
+        offset = 0 if offset < 0
+      end
+      # Scrolled any amount downwards?
+      #   was: if (offset || 0) > 0
+      puts "#{" " * uncolor.call(prefix).length}#{"↑" * max_word_length}" if height < words.length
+      #   was: ((offset || 0) > 1 ? 2 : 1)
+      top_bottom_reserved = offset.nil? ? 0 : 2
+      last_word = (offset || 0) + height - top_bottom_reserved
+      # Maybe we can fit it all
+      last_word = words.length if last_word > words.length
+      # Write all the visible words
+      words[(offset || 0)...last_word].each { |word| puts chosen.include?(word) ? "#{prefix}#{word}#{postfix}" : "#{" " * uncolor.call(prefix).length}#{word}" }
+      # Can't fit it all?
+      #   was: if last_word < (words.length - top_bottom_reserved)
+      puts "#{" " * uncolor.call(prefix).length}#{"↓" * max_word_length}" if height < words.length
+
       info ||= "Use arrow keys#{is_multiple ? ", spacebar to toggle, and ENTER to save" : " and ENTER to make a choice"}"
-      print info + (27.chr + 91.chr + 65.chr) * (words.length - position)
+      # %%% used to be (words.length - position)
+      print info + (27.chr + 91.chr + 65.chr) * (height - (position - (offset || 0)) - (last_word <= words.length ? 1 : 0))
       # To end of text on starting line
       info_length = uncolor.call(info).length
       word_length = uncolor.call(words[position]).length + pre_post_length
@@ -149,28 +178,54 @@ module FancyGets
             end
           when 66 # - down
             if is_list && position < words.length - 1
-              make_select.call(false, true, true) unless is_multiple
+              is_shift = false
+              # Now moving down past the bottom of the shown window?
+              if !offset.nil? && position >= offset + (height - 3)
+                print "\b" * (uncolor.call(words[position]).length + pre_post_length)
+                print (27.chr + 91.chr + 65.chr) * (height - (offset > 0 ? 3 : 3))
+                offset += 1
+                # Add 1 if offset + height == (words.length - 1)
+                words[offset...(offset + height - 4)].each do |word|
+                  end_fill = max_word_length - uncolor.call(word).length
+                  puts (is_multiple && chosen.include?(word)) ? "#{prefix}#{word}#{postfix}#{" " * end_fill}" : "#{" " * uncolor.call(prefix).length}#{word}#{" " * (end_fill + uncolor.call(postfix).length)}"
+                end
+                is_shift = true
+              end
+              make_select.call(chosen.include?(words[position]) && is_shift && is_multiple, true, true) if is_shift || !is_multiple
               w1 = uncolor.call(words[position]).length
               position += 1
               print 27.chr + 91.chr + 66.chr
-              if is_multiple
+              if is_shift || !is_multiple
+                make_select.call((chosen.include?(words[position]) && is_shift) || !is_multiple)
+              else
                 w2 = uncolor.call(words[position]).length
                 print (w1 > w2 ? "\b" : (27.chr + 91.chr + 67.chr)) * (w1 - w2).abs
-              else
-                make_select.call(true)
               end
             end
           when 65 # - up
             if is_list && position > 0
-              make_select.call(false, true, true) unless is_multiple
+              is_shift = false
+              # Now moving up past the top of the shown window?
+              if position <= (offset || 0)
+                print "\b" * (uncolor.call(words[position]).length + pre_post_length)
+                offset -= 1
+                # print (27.chr + 91.chr + 65.chr) if offset == 0
+                words[offset...(offset + height - 2)].each do |word|
+                  end_fill = max_word_length - uncolor.call(word).length
+                  puts (is_multiple && chosen.include?(word)) ? "#{prefix}#{word}#{postfix}#{" " * end_fill}" : "#{" " * uncolor.call(prefix).length}#{word}#{" " * (end_fill + uncolor.call(postfix).length)}"
+                end
+                print (27.chr + 91.chr + 65.chr) * (height - (offset > 0 ? 3 : 3))
+                is_shift = true
+              end
+              make_select.call(chosen.include?(words[position]) && is_shift && is_multiple, true, true) if is_shift || !is_multiple
               w1 = uncolor.call(words[position]).length
               position -= 1
               print 27.chr + 91.chr + 65.chr
-              if is_multiple
+              if is_shift || !is_multiple
+                make_select.call((chosen.include?(words[position]) && is_shift) || !is_multiple)
+              else
                 w2 = uncolor.call(words[position]).length
                 print (w1 > w2 ? "\b" : (27.chr + 91.chr + 67.chr)) * (w1 - w2).abs
-              else
-                make_select.call(true)
               end
             end
           when 51 # - Delete forwards?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fancy_gets
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler