console_cmdr 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2eaefdcfd50e5023446a819454eb5369910098
-  data.tar.gz: 4de39d32a83d7a75159aaa06338cf3bf222a7751
+  metadata.gz: c3308726d84f864d270fba33b15616f80844f7e8
+  data.tar.gz: e5cbfe7d970047080992c9e88afaf858735fa65e
 SHA512:
-  metadata.gz: df98a024361bdd1f020b4ac73c067afa4515a299d5996abf5a11ae0d914658f8dbea3f2101743f51e8eac2868d78863b6bf1bb8a5435eb4be23fca0031f7ed15
-  data.tar.gz: 34b6b5203a916613fc009107dbd441d1aad3ab97ab975c54f0b55caa4d7ad03216767141fdcb3955f9b18da2bb9d807217f71d19c0b9ff7e5287cad7ac0301d5
+  metadata.gz: a128d30143c79cf842121983ff7a60fc94e9ee45254565fe38812e2e1fb7ad7f59b060ad66486e27092fb0fd7e44f793e5f6d2dd95b5ea2dd16dd19c9803f5dc
+  data.tar.gz: 6a843eba42806265fedd8c5b71a2e7305ae679302e111ba6e10e6e929f379dd6d178a3ecce41a5418bae3cf620244f14659233c35d98dece4993fcbb9effd434

data/lib/console_cmdr.rb

@@ -4,14 +4,19 @@
 
 require 'cmdr'
 require 'pxindex'
+require 'terminfo'
 require 'io/console'
 
 
+
 class ConsoleCmdr < Cmdr
 
   def initialize(pxindex: nil)
     super()
+    @pxindex_filepath = pxindex
     @pxi = pxindex ? PxIndex.new(pxindex) : nil
+    
+    @keys = []
   end
 
   def cli_banner()
@@ -19,12 +24,18 @@ class ConsoleCmdr < Cmdr
     print "> "
   end
   
+  def reload()
+    @pxi = @pxindex_filepath ? PxIndex.new(@pxindex_filepath) : nil
+  end
+  
   def start(&blk)
     
     cli_banner()
 
     seq = []
-    begin
+    
+    loop do
+      
       c = $stdin.getch
       
       #puts c.ord
@@ -60,6 +71,11 @@ class ConsoleCmdr < Cmdr
         c = :arrow_left
         on_keypress(c)
         input c         
+        
+      elsif c == "\u0003"  # CTRL+C        
+        puts 
+        @linebuffer = ''
+        display_output()
       else
         if block_given? then
           on_keypress(c)
@@ -75,7 +91,7 @@ class ConsoleCmdr < Cmdr
         end
       end
       
-    end until c == "\u0003"  # CTRL+C
+    end #/ end of loop
 
   end
   
@@ -104,22 +120,52 @@ class ConsoleCmdr < Cmdr
     
     return unless @pxi
     
-    #puts 'key:' + key.inspect
+
     if key.is_a? String then
-      #puts '@linebuffer: ' + @linebuffer+key.inspect
+      
+      @keys = []
+
       a = @pxi.q?(@linebuffer+key)
     
       if a then
-        @input_selection = a.map(&:title)
-        print ("\b" * @linebuffer.length) + @input_selection.last + "\n"
-        print @linebuffer + key
+        unless @input_selection == a.map(&:title) then
+          @input_selection = a.map(&:title)
+          print ("\b" * @linebuffer.length) + @input_selection.inspect + "\n"
+        end
+        print ("\b" * @linebuffer.length) + @linebuffer + key
       else
         @input_selection = nil
       end
-    elsif key == :arrow_down
-      @linebuffer = @input_selection.first
+      
+    elsif key == :arrow_down or key == :arrow_right
+      
+      @keys << :arrow_down
+      
+      linebuffer = @input_selection[@keys.count(:arrow_down) - 1]
+      return if linebuffer.nil?
+
+
+      oldlinebuffer = @linebuffer
+      print ("\b" * oldlinebuffer.length)
+      
+      @linebuffer = linebuffer
+
+      height, width = TermInfo.screen_size 
+
+      rblankpadding =  ' ' * (width - @linebuffer.length )
+      print @linebuffer
+      print rblankpadding
+      print ("\b" * rblankpadding.length)
+      
+    elsif key == :arrow_left
+      
+      return if @keys.empty?
+      
+      @keys.pop
+      oldlinebuffer = @linebuffer
+      @linebuffer = @input_selection[@keys.count(:arrow_down) - 1]
 
-      print ("\b" * @linebuffer.length) + @linebuffer
+      print ("\b" * oldlinebuffer.length) + @linebuffer      
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console_cmdr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -73,6 +73,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: terminfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: 
 email: james@r0bertson.co.uk
 executables: []