oterm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c57083633eb77e165e8331ee3b28ce62a2a25c41
-  data.tar.gz: db9c45d79b15fa85e8c5a82c413e29108e7e1d41
+  metadata.gz: c4ffb3d022acd1a1c9d19c8fe681e244bd5776c4
+  data.tar.gz: 9ccc958e6be60b2901b09d1d7cae2149d0abe2d6
 SHA512:
-  metadata.gz: 59fb9a821cde9ba1c4974ecf18fa32cef38a1db7d3c187b8a274273c4459d225be3f308d4132cb4f4f126751d1a75eb786869542ffedb88f830ed63f2855d6df
-  data.tar.gz: 5702073e0ce8e0afe661019d0da7f8c42a845cbd2d9c09297332290996217b954ad7b063b944d4d1d13575225c0c55fef8ab941d9db8a1720e4c8369d224ac5c
+  metadata.gz: 29ce77069d8db5bc35118f5019136fce4d411855cb94b5fc3610e1909b45d7f389b2d015c39d4597924af04e4b1e44d472303f203a62b5a5d69f7e4e6e3a8a84
+  data.tar.gz: 9fa38ef102e1fcd4de434e016c256efa6cecfcae73d119aec5e056eb8eb783b58130f627e1fef4f36980da0086888f297dbd195d7860b980b906a11ec9b53fa7

data/README.md

@@ -35,12 +35,18 @@ soon in the ODisk application and later in a more interesting project.
 
 *RubyGems* *repo*: https://rubygems.org/gems/oterm
 
-Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Oj gem.
+Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the OTerm gem.
 
 ## <a name="build_status">Build Status</a>
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oterm.png?branch=master)](http://travis-ci.org/ohler55/oterm)
 
+### Current Release 1.0.1 - December 27, 2013
+
+ - Improved completion handling
+
+ - Fixed some bugs
+
 ### Current Release 1.0.0 - December 22, 2013
 
  - First release. There will be rough edges.

data/lib/oterm/executor.rb

@@ -20,7 +20,7 @@ module OTerm
     def execute(cmd, listener)
       name, args = cmd.split(' ', 2)
       c = @cmds[name]
-      if nil == c
+      if c.nil?
         missing(cmd, listener)
         return
       end
@@ -29,9 +29,9 @@ module OTerm
 
     def help(listener, arg=nil)
       listener.out.pl()
-      if nil != arg
+      if !arg.nil?
         c = @cmds[arg]
-        if nil != c
+        if !c.nil?
           listener.out.pl("#{arg} - #{c.summary}")
           c.desc.each do |line|
             listener.out.pl("  #{line}")
@@ -81,6 +81,8 @@ module OTerm
       @cmds.each_key do |name|
         comp << name if name.start_with?(cmd)
       end
+      return if 0 == comp.size
+
       if 1 == comp.size
         listener.move_col(1000)
         listener.insert(comp[0][listener.buf.size..-1])
@@ -91,7 +93,15 @@ module OTerm
         comp.each do |name|
           listener.out.pl(name)
         end
-        listener.update_cmd(0)
+        best = best_completion(cmd, comp)
+        if best == cmd
+          listener.update_cmd(0)
+        else
+          listener.move_col(1000)
+          listener.insert(best[listener.buf.size..-1])
+          listener.out.prompt()
+          listener.out.p(listener.buf)
+        end
       end
     end
 
@@ -99,6 +109,22 @@ module OTerm
       @cmds[cmd] = Cmd.new(target, op, summary, desc)
     end
 
+    def best_completion(pre, names)
+      plen = pre.size
+      # Must make a copy as pre is not frozen.
+      pre = String.new(pre)
+      target = names[0]
+      names = names[1..-1]
+      for i in plen..target.size
+        c = target[i]
+        names.each do |n|
+          return pre unless c == n[i]
+        end
+        pre << c
+      end
+      pre
+    end
+
     class Cmd
       attr_accessor :target
       attr_accessor :op
@@ -109,7 +135,11 @@ module OTerm
         @target = target
         @op = op
         @summary = summary
-        @desc = desc.split("\n")
+        if desc.nil?
+          @desc = summary
+        else
+          @desc = desc.split("\n")
+        end
       end
     end # Cmd
 

data/lib/oterm/listener.rb

@@ -27,13 +27,13 @@ module OTerm
       @done = false
 
       greeting = executor.greeting()
-      @out.pl(greeting) if nil != greeting
+      @out.pl(greeting) unless greeting.nil?
 
       # initiate negotiations for single character mode and no echo
       @out.p(Telnet.msg(Telnet::DO, Telnet::SGA) + Telnet.msg(Telnet::DO, Telnet::ECHO))
 
       out.prompt()
-      while !@done
+      until @done
         line = con.recv(100)
         begin
           len = line.size()
@@ -104,8 +104,19 @@ module OTerm
     end
 
     def vt100_cmd(line)
-      puts "*** vt100 command"
-      # TBD
+      # Possible arrow key.
+      if 3 == line.size() && '[' == line[1]
+        case line[2]
+        when 'A' # up arrow
+          history_back()
+        when 'B' # down arrow
+          history_forward()
+        when 'C' # right arrow
+          move_col(1)
+        when 'D' # left arrow
+          move_col(-1)
+        end
+      end
     end
 
     def exec_cmd(cmd)
@@ -156,23 +167,9 @@ module OTerm
           update_cmd(blen)
         end
       when 14 # ^n
-        if 0 < @hp && @hp <= @history.size()
-          @hp -= 1
-          blen = @buf.size()
-          if 0 == @hp
-            @buf = ''
-          else
-            @buf = @history[-@hp]
-          end
-          update_cmd(blen)
-        end
+        history_forward()
       when 16 # ^p
-        if @hp < @history.size()
-          @hp += 1
-          blen = @buf.size()
-          @buf = @history[-@hp]
-          update_cmd(blen)
-        end
+        history_back()
       when 21 # ^u
         @hp -= 1
         @buf = ''
@@ -210,6 +207,28 @@ module OTerm
       end
     end
 
+    def history_back()
+      if @hp < @history.size()
+        @hp += 1
+        blen = @buf.size()
+        @buf = @history[-@hp]
+        update_cmd(blen)
+      end
+    end
+
+    def history_forward()
+      if 0 < @hp && @hp <= @history.size()
+        @hp -= 1
+        blen = @buf.size()
+        if 0 == @hp
+          @buf = ''
+        else
+          @buf = @history[-@hp]
+        end
+        update_cmd(blen)
+      end
+    end
+
     def insert(str)
       # TBD be smarter with vt100
       if 0 == @col

data/lib/oterm/output.rb

@@ -7,7 +7,9 @@ module OTerm
     end
 
     def prompt()
+      dim()
       @con.print("\r> ")
+      attrs_off()
     end
 
     def p(str)

data/lib/oterm/server.rb

@@ -32,5 +32,9 @@ module OTerm
       @listeners.delete(listener)
     end
 
+    def join()
+      @acceptThread.join()
+    end
+
   end # Server
 end # OTerm

data/lib/oterm/version.rb

@@ -1,4 +1,4 @@
 module OTerm
   # Current version of the module. 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/oterm/vt100.rb

@@ -3,7 +3,7 @@ module OTerm
 
   class VT100
     ESC = 27.chr
-    MAX_DIM = 10000
+    MAX_DIM = 9999
 
     # graphic font characters
     BLANK = '_'
@@ -140,7 +140,6 @@ module OTerm
     def bold()
       @con.print("\x1b[1m") if @is_vt100
     end
-    alias bright bold
 
     def dim()
       @con.print("\x1b[2m") if @is_vt100
@@ -158,6 +157,10 @@ module OTerm
       @con.print("\x1b[7m") if @is_vt100
     end
 
+    def invisible()
+      @con.print("\x1b[8m") if @is_vt100
+    end
+
     def big_top()
       @con.print("\x1b#3") if @is_vt100
     end

data/test/server_test.rb

@@ -39,13 +39,15 @@ class Ex < OTerm::Executor
     o.restore_cursor()
   end
 
+=begin
   def missing(cmd, listener)
-    listerner.out.pl("'#{cmd}' is not a recognized command.")
+    listener.out.pl("'#{cmd}' is not a recognized command.")
   end
+=end
 
 end # Ex
 
 executor = Ex.new()
 
 server = OTerm::Server.new(executor, 6060, true)
-server.acceptThread.join()
+server.join()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oterm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies: []
 description: 'A remote terminal that can be used for interacting with an application
   and invoking operations remotely. Telnet and VT100 over a telnet connection are
@@ -19,6 +19,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- LICENSE
+- README.md
+- lib/oterm.rb
 - lib/oterm/errors.rb
 - lib/oterm/executor.rb
 - lib/oterm/listener.rb
@@ -28,10 +31,7 @@ files:
 - lib/oterm/telnet.rb
 - lib/oterm/version.rb
 - lib/oterm/vt100.rb
-- lib/oterm.rb
 - test/server_test.rb
-- LICENSE
-- README.md
 homepage: http://www.ohler.com/oterm
 licenses:
 - MIT
@@ -39,23 +39,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oterm
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A operations terminal server.