console_cmdr 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3308726d84f864d270fba33b15616f80844f7e8
-  data.tar.gz: e5cbfe7d970047080992c9e88afaf858735fa65e
+  metadata.gz: ed5bbea62199c0d50966eeac59187f5ef1bb0ddc
+  data.tar.gz: c8e123361250caec9d0e45373557195a83aa95f5
 SHA512:
-  metadata.gz: a128d30143c79cf842121983ff7a60fc94e9ee45254565fe38812e2e1fb7ad7f59b060ad66486e27092fb0fd7e44f793e5f6d2dd95b5ea2dd16dd19c9803f5dc
-  data.tar.gz: 6a843eba42806265fedd8c5b71a2e7305ae679302e111ba6e10e6e929f379dd6d178a3ecce41a5418bae3cf620244f14659233c35d98dece4993fcbb9effd434
+  metadata.gz: e57e3ee2f0c27e261e14d1358bcdfd3ef899d6e12889df2f437bd202318cf7cf4b214ffc1418378aaed6959d65dd472e6ea4fcc65bbb9aed75007870cdc52817
+  data.tar.gz: 2d492f6244b21e09951bd99e27f4e653b4170cbfd77abc51e80b366367a28cb7f56176bc7a6fd4c6f5595f9d0868bda922f2e04de10cce64cf7a4a1795e5b297

data/lib/console_cmdr.rb

@@ -4,6 +4,7 @@
 
 require 'cmdr'
 require 'pxindex'
+require 'colored'
 require 'terminfo'
 require 'io/console'
 
@@ -17,7 +18,17 @@ class ConsoleCmdr < Cmdr
     @pxi = pxindex ? PxIndex.new(pxindex) : nil
     
     @keys = []
+    @item_selected = ''
+    @input_selection = []
+    @running = true
   end
+  
+  def clear()
+    @linebuffer = ''
+    print "\e[H\e[2J"
+    ''
+    #cli_banner()
+  end  
 
   def cli_banner()
     puts "welcome, this code is powered by the cmdr gem\n\n"
@@ -26,6 +37,7 @@ class ConsoleCmdr < Cmdr
   
   def reload()
     @pxi = @pxindex_filepath ? PxIndex.new(@pxindex_filepath) : nil
+    'reloaded'
   end
   
   def start(&blk)
@@ -34,17 +46,19 @@ class ConsoleCmdr < Cmdr
 
     seq = []
     
-    loop do
+    while @running do
       
       c = $stdin.getch
-      
+      #puts 'c:'  + c.inspect
       #puts c.ord
       
       # [27, 91, 65] = up_arrow
       # [27, 91, 66] = down_arrow
       # [27, 91, 67] = right_arrow
       # [27, 91, 68] = left_arrow
+      # [27, 91, 49, 53] = ctrl+right_arrow
       # 13 = enter
+      #puts 'seq: ' + seq.inspect
       
       if c.ord == 27 then
         seq << 27
@@ -55,34 +69,62 @@ class ConsoleCmdr < Cmdr
         seq << 65
         c = :arrow_up
         on_keypress(c)
-        input c
+        #input c
       elsif c.ord == 66 and seq[1] == 91
         seq << 66
         c = :arrow_down
+        seq = []
+        on_keypress(c)
+        input c        
+        
+      elsif c.ord == 68 and seq[1] == 91
+        seq << 68
+        c = :arrow_left
+        seq = []
+        on_keypress(c)
+        input c         
+      elsif c.ord == 49 and seq[1] == 91
+        seq << 49
+        #puts 'ctrl + right arrow'
+      elsif c.ord == 59 and seq[2] == 49
+        seq << 59
+      elsif c.ord == 53 and seq[3] == 59
+        seq << 53        
+      elsif c.ord == 67 and seq[4] == 53
+        seq << 67
+        seq = []
+        c = :ctrl_arrow_right
         on_keypress(c)
         input c        
       elsif c.ord == 67 and seq[1] == 91
         seq << 67
         c = :arrow_right
+        #puts 'right arrow'
+        seq = []
         on_keypress(c)
         input c         
-      elsif c.ord == 68 and seq[1] == 91
-        seq << 68
-        c = :arrow_left
+      elsif c.ord == 79 and seq.first == 27
+        seq << 79
+
+      elsif c.ord == 72 and seq[1] == 79
+        c = :home_key
+        seq = []
         on_keypress(c)
-        input c         
-        
       elsif c == "\u0003"  # CTRL+C        
         puts 
         @linebuffer = ''
         display_output()
       else
         if block_given? then
-          on_keypress(c)
-          input(c, &blk)
+          char = on_keypress(c)
+
+          unless (@linebuffer[0] == ':' and char == ':')
+            input(char, &blk) if char
+          end
+          
         else
           input(c) do |command|
-            #puts 'command:  ' + command.inspect
+
             case command
             when 'time'
               Time.now.to_s
@@ -95,6 +137,14 @@ class ConsoleCmdr < Cmdr
 
   end
   
+  def stop()
+    
+    @running = false    
+    'bye'
+  end
+  
+  alias quit stop
+  
   protected
   
   def reveal(c)
@@ -105,6 +155,7 @@ class ConsoleCmdr < Cmdr
     else
       c unless c.is_a? Symbol
     end
+    #puts 'inside reveal'
     print char unless @input_selection and @input_selection.any?
   end
 
@@ -118,55 +169,161 @@ class ConsoleCmdr < Cmdr
   
   def on_keypress(key)
     
-    return unless @pxi
+    return key if @linebuffer[0] == ':'
+    return key unless @pxi
     
-
     if key.is_a? String then
       
       @keys = []
 
+      if key.to_i.to_s == key and @input_selection and @input_selection.any?
+        r = select_item(key.to_i-1)
+        key = '' 
+        return r
+      end
+
+      parent = @pxi.parent.title if @pxi.parent
+
       a = @pxi.q?(@linebuffer+key)
     
       if a then
         unless @input_selection == a.map(&:title) then
           @input_selection = a.map(&:title)
-          print ("\b" * @linebuffer.length) + @input_selection.inspect + "\n"
+          @selection = a.map.with_index do |x,i| 
+            
+            branch = x.records.any? ? :branch : nil
+
+            title = x.title
+            # is the target a web page?
+            title = title.green  if x.target[0] == 'w' 
+            title << '>' if branch
+            
+            ["%d.%s" % [i+1, title], branch, x.desc.yellow]
+            
+          end
+          print ("\b" * @linebuffer.length) + @selection.map \
+              {|x| x.values_at(0,2).join ' '}.join(" | ") + "\n"
+
         end
-        print ("\b" * @linebuffer.length) + @linebuffer + key
+        print ("\b" * @linebuffer.length)
+        
+        if (@linebuffer[/\s/] or a.length == 1) and key == ' ' then
+
+          @linebuffer.sub!(/\w+$/, @item_selected)
+          
+        end
+        print @linebuffer + key
       else
         @input_selection = nil
       end
       
-    elsif key == :arrow_down or key == :arrow_right
-      
-      @keys << :arrow_down
+    elsif key == :arrow_down or key == :arrow_right      
+
+      return if  @input_selection.nil?      
       
-      linebuffer = @input_selection[@keys.count(:arrow_down) - 1]
-      return if linebuffer.nil?
+      @keys << :arrow_down      
 
+      i = @keys.count(:arrow_down) - 1
+      
+      if i == @selection.length then
+        @keys.pop
+        return nil
+      end
+      
+      select_item(i)
+      
+    elsif key == :arrow_left
 
+      return nil if @keys.empty?
+      
+      @keys.pop
       oldlinebuffer = @linebuffer
+      @linebuffer = @input_selection[@keys.count(:arrow_down) - 1]
+      
+      height, width = TermInfo.screen_size 
+
       print ("\b" * oldlinebuffer.length)
+      rblankpadding =  ' ' * (width)
+      print rblankpadding
+      print ("\b" * rblankpadding.length)      
       
-      @linebuffer = linebuffer
+      print @linebuffer
+      
+    elsif key == :home_key
 
       height, width = TermInfo.screen_size 
 
-      rblankpadding =  ' ' * (width - @linebuffer.length )
-      print @linebuffer
+      print ("\b" * @linebuffer.to_s.length)
+      @linebuffer = ''
+      rblankpadding =  ' ' * (width)
       print rblankpadding
-      print ("\b" * rblankpadding.length)
+      print ("\b" * rblankpadding.length)   
       
-    elsif key == :arrow_left
+    elsif key == :ctrl_arrow_right
       
-      return if @keys.empty?
+      return if  @input_selection.nil?      
       
-      @keys.pop
-      oldlinebuffer = @linebuffer
-      @linebuffer = @input_selection[@keys.count(:arrow_down) - 1]
+      @keys << :arrow_down      
 
-      print ("\b" * oldlinebuffer.length) + @linebuffer      
+      i = @keys.count(:arrow_down) - 1
+      
+      if i == @selection.length then
+        @keys.pop
+        return nil
+      end
+      
+      select_item(i, append_command: true)
     end
+    
+    return key
+  end
+  
+  private
+  
+  def select_item(i, append_command: false)
+
+
+    execute_command = false
+    
+    linebuffer = @input_selection[i]
+    @item_selected = @input_selection[i]
+    return if linebuffer.nil?
+
+
+    oldlinebuffer = @linebuffer
+    print ("\b" * oldlinebuffer.length)
+
+
+    if @selection[i][1] == :branch or append_command then
+      
+      if @linebuffer[-1] != ' ' then
+        a = @linebuffer.split(/ /)
+        a.pop
+        @linebuffer = a.join ' '
+      end
+      
+      linebuffer.prepend @linebuffer
+      execute_command = false
+    else
+      execute_command = true
+    end
+
+    if @selection[i][1] == :branch then
+      words = @linebuffer.split(/ /)      
+      @linebuffer = (words[0..-2] + [linebuffer]).join(' ') 
+    else
+      @linebuffer = linebuffer
+    end
+
+    height, width = TermInfo.screen_size 
+
+    rblankpadding =  ' ' * (width - @linebuffer.length )
+    print @linebuffer
+    print rblankpadding
+    print ("\b" * rblankpadding.length)    
+    
+    execute_command ? "\r" : nil
+
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console_cmdr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   JRl6lG+PlMKYzPBmY9bJ9nnHUzlNaUigwV8HWjUzq9NmckAilhs430t3xe8+fsIc
   uSZB48oWIrOfew==
   -----END CERTIFICATE-----
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdr
@@ -73,6 +73,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: terminfo
   requirement: !ruby/object:Gem::Requirement