spinal_tap 0.1.3 → 0.1.4

data/lib/spinal_tap/client_helpers.rb

@@ -3,11 +3,9 @@ module SpinalTap
   module ClientHelpers
     def setup(server)
       @server = server
+      @history = SpinalTap::History.new
 
-      @history = []
-      @history_pos = 0
-
-      reset_buffer
+      reset
 
       setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
@@ -27,6 +25,7 @@ module SpinalTap
 
         case command
         when 'help' then exec_help
+        when 'history' then exec_history
         when 'eval' then exec_eval(args.join(' '))
         when 'quit'
           close
@@ -40,13 +39,13 @@ module SpinalTap
       @server.unregister(Thread.current)
     end
 
-    def reset_buffer
-      @buffer = ''
+    def reset
+      @buffer = @history.current
       @cursor_pos = 1
     end
 
     def read_parsed_line
-      reset_buffer
+      reset
       redraw_cmd_line
 
       while byte = getbyte
@@ -70,17 +69,15 @@ module SpinalTap
           if (byte = getbyte) == 91 # [ Char.
             case getbyte
             when 65 # A Char - Up Arrow.
-              if @history_pos > 0
-                @history_pos -= 1
-                @buffer = @history[@history_pos].to_s
+              if (result = @history.previous)
+                @buffer = result
                 @cursor_pos = @buffer.length + 1
               else
                 bell
               end
             when 66 # B Char - Down Arrow.
-              if @history_pos < @history.length
-                @history_pos += 1
-                @buffer = @history[@history_pos].to_s
+              if (result = @history.next)
+                @buffer = result
                 @cursor_pos = @buffer.length + 1
               else
                 bell
@@ -109,8 +106,7 @@ module SpinalTap
           args = tokens[1..-1]
 
           if @buffer.length > 0
-            @history.push(@buffer)
-            @history_pos = @history.length
+            @history.append(@buffer)
           end
 
           return {:command => command, :args => args}
@@ -137,7 +133,13 @@ module SpinalTap
     end
 
     def exec_help
-      write("Commands: help quit eval\r\n")
+      write("Commands: help quit history eval\r\n")
+    end
+
+    def exec_history
+      @history.all.each_with_index do |entry, index|
+        write("#{index.to_s.ljust(4, ' ')} #{entry}\r\n")
+      end
     end
 
     def exec_eval(code)

data/lib/spinal_tap/cmd_line.rb

@@ -0,0 +1,6 @@
+module SpinalTap
+
+  class CmdLine
+  end
+
+end

data/lib/spinal_tap/history.rb

@@ -0,0 +1,77 @@
+module SpinalTap
+
+  class History
+    MAX_LINES = 100
+
+    def initialize
+      @history = ['']
+      @history_pos = 0
+    end
+
+    def current
+      cur = @history[@history_pos]
+      cur = cur.clone unless last?
+
+      return cur
+    end
+
+    def previous?
+      return @history_pos > 0
+    end
+
+    def previous
+      if previous?
+        @history_pos -= 1
+        return current
+      else
+        return false
+      end
+    end
+
+    def next?
+      return @history_pos < @history.length - 1
+    end
+
+    def next
+      if next?
+        @history_pos += 1
+        return current
+      else
+        return false
+      end
+    end
+
+    def last?
+      return @history_pos >= @history.length - 1
+    end
+
+    def append(cmd_line)
+      @history.pop
+      @history << cmd_line.clone
+      @history << ''
+
+      trim
+      fast_forward
+
+      return true
+    end
+
+    def all
+      return @history[0..-2].map { |e| e.clone }
+    end
+
+    def fast_forward
+      @history_pos = @history.length - 1
+
+      return current
+    end
+
+    private
+
+    def trim
+      while @history.length > MAX_LINES + 1
+        @history.shift
+      end
+    end
+  end
+end

data/lib/spinal_tap/version.rb

@@ -1,3 +1,3 @@
 module SpinalTap
-  VERSION = "0.1.3"
+  VERSION = '0.1.4'
 end

data/lib/spinal_tap.rb

@@ -1,5 +1,7 @@
 require 'spinal_tap/version'
 require 'spinal_tap/server'
+require 'spinal_tap/cmd_line'
+require 'spinal_tap/history'
 require 'spinal_tap/client_helpers'
 
 module SpinalTap

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinal_tap
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -122,6 +122,8 @@ files:
 - Rakefile
 - lib/spinal_tap.rb
 - lib/spinal_tap/client_helpers.rb
+- lib/spinal_tap/cmd_line.rb
+- lib/spinal_tap/history.rb
 - lib/spinal_tap/server.rb
 - lib/spinal_tap/version.rb
 - spec/spec_helper.rb
@@ -140,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1111823406379054715
+      hash: -2867284756879300883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1111823406379054715
+      hash: -2867284756879300883
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23