console_cmdr 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed5bbea62199c0d50966eeac59187f5ef1bb0ddc
-  data.tar.gz: c8e123361250caec9d0e45373557195a83aa95f5
+  metadata.gz: 601ff0285d317389e4a6ef22cf4060d9b99806c7
+  data.tar.gz: 81935978bdadac036b615e3843c716a581955771
 SHA512:
-  metadata.gz: e57e3ee2f0c27e261e14d1358bcdfd3ef899d6e12889df2f437bd202318cf7cf4b214ffc1418378aaed6959d65dd472e6ea4fcc65bbb9aed75007870cdc52817
-  data.tar.gz: 2d492f6244b21e09951bd99e27f4e653b4170cbfd77abc51e80b366367a28cb7f56176bc7a6fd4c6f5595f9d0868bda922f2e04de10cce64cf7a4a1795e5b297
+  metadata.gz: ee069686795d2674297fa3da000bf446db8ac62aca177ccee92003965abfd7433dd44f2db6db5a050a2d8e2dc52d09dd22119a8e7eeb27e4bea24a45590b834c
+  data.tar.gz: b634103b3ae5507c27609e4e17b382e710d67ce105ea84d2647ef4036e7ec5ae64fd71845742ef0158a3204b0a1ced684b2f5976872a091c4c99b0641df763ee

checksums.yaml.gz.sig

@@ -1,4 +1 @@
-v����F���E#��s]M����NW&����#!��3c�}O�������I�p""_���}Sy����tc�
-C�5`(xy���Im�=!�9�R�]��y�S�#�1���>@�&s�#.�t=|��=
�]�'��ֺ�>�U�.)�����)(�
-MA��{׍���M��l�[����uz50���R��uH�
-%��B��W
+G�i�@�SW��>M�i�`�`����:{�����*��-6�4Q����zb�$�`�P�����O��:��児A�J	ih�b��4_<(|E�׺��5�

data/lib/console_cmdr.rb

@@ -9,7 +9,6 @@ require 'terminfo'
 require 'io/console'
 
 
-
 class ConsoleCmdr < Cmdr
 
   def initialize(pxindex: nil)
@@ -177,45 +176,11 @@ class ConsoleCmdr < Cmdr
       @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)
-          @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)
+        key = select_item(key.to_i-1)        
         
-        if (@linebuffer[/\s/] or a.length == 1) and key == ' ' then
-
-          @linebuffer.sub!(/\w+$/, @item_selected)
-          
-        end
-        print @linebuffer + key
-      else
-        @input_selection = nil
       end
+
+      query key if key
       
     elsif key == :arrow_down or key == :arrow_right      
 
@@ -293,8 +258,10 @@ class ConsoleCmdr < Cmdr
     oldlinebuffer = @linebuffer
     print ("\b" * oldlinebuffer.length)
 
+    type = @selection[-1][-1]
+    branch = @selection[i][1] == :branch
 
-    if @selection[i][1] == :branch or append_command then
+    if  branch or append_command or type == :message then
       
       if @linebuffer[-1] != ' ' then
         a = @linebuffer.split(/ /)
@@ -304,9 +271,12 @@ class ConsoleCmdr < Cmdr
       
       linebuffer.prepend @linebuffer
       execute_command = false
-    else
-      execute_command = true
+    else      
+
+      execute_command = true unless type == :interactive
     end
+    
+    execute_command = true if type == :message
 
     if @selection[i][1] == :branch then
       words = @linebuffer.split(/ /)      
@@ -322,8 +292,67 @@ class ConsoleCmdr < Cmdr
     print rblankpadding
     print ("\b" * rblankpadding.length)    
     
-    execute_command ? "\r" : nil
+    
+    return execute_command ? "\r" : (branch and type != :webpage) ? ' ' : nil
+
+  end
+  
+  def query(key)
+    
+    a = @pxi.q?(@linebuffer+key)
+
+    if a then
+      
+      unless @input_selection == a.map(&:title) then
+        @input_selection = a.map(&:title)
+        @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, target(x.target.to_s)]
+          
+        end
+        
+        print ("\b" * @linebuffer.length) + @selection.map \
+            {|x| x.values_at(0,2).join ' '}.join(" | ") + "\n"
 
+      end
+      
+      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  
+    
   end
 
+  def target(c)
+    
+    case c.to_sym
+    when :i 
+      :interactive
+    when :w 
+      :webpage      
+    when :m
+      :message
+    else
+      :command
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console_cmdr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson