coolline 0.1.0 → 0.2.0

data/lib/coolline/coolline.rb

@@ -24,38 +24,38 @@ class Coolline
     :word_boundaries => [" ", "-", "_"],
 
     :handlers =>
-     [
-      Handler.new(/\A(?:\C-h|\x7F)\z/, &:kill_backward_char),
-      Handler.new("\C-a", &:beginning_of_line),
-      Handler.new("\C-e", &:end_of_line),
-      Handler.new("\C-k", &:kill_line),
-      Handler.new("\C-f", &:forward_char),
-      Handler.new("\C-b", &:backward_char),
-      Handler.new("\C-d", &:kill_current_char_or_leave),
-      Handler.new("\C-c") { Process.kill(:INT, Process.pid) },
-      Handler.new("\C-w", &:kill_backward_word),
-      Handler.new("\C-t", &:transpose_chars),
-      Handler.new("\C-n", &:next_history_line),
-      Handler.new("\C-p", &:previous_history_line),
-      Handler.new("\C-r", &:interactive_search),
-      Handler.new("\t", &:complete),
-      Handler.new("\C-a".."\C-z") {},
-
-      Handler.new(/\A\e(?:\C-h|\x7F)\z/, &:kill_backward_word),
-      Handler.new("\eb", &:backward_word),
-      Handler.new("\ef", &:forward_word),
-      Handler.new("\e[A", &:previous_history_line),
-      Handler.new("\e[B", &:next_history_line),
-      Handler.new("\e[5~", &:previous_history_line),
-      Handler.new("\e[6~", &:next_history_line),
-      Handler.new("\e[C", &:forward_char),
-      Handler.new("\e[D", &:backward_char),
-      Handler.new("\et", &:transpose_words),
-      Handler.new("\ec", &:capitalize_word),
-      Handler.new("\eu", &:uppercase_word),
-      Handler.new("\el", &:lowercase_word),
-
-      Handler.new(/\e.+/) {},
+    [
+     Handler.new(/\A(?:\C-h|\x7F)\z/, &:kill_backward_char),
+     Handler.new(?\C-a, &:beginning_of_line),
+     Handler.new(?\C-e, &:end_of_line),
+     Handler.new(?\C-k, &:kill_line),
+     Handler.new(?\C-f, &:forward_char),
+     Handler.new(?\C-b, &:backward_char),
+     Handler.new(?\C-d, &:kill_current_char_or_leave),
+     Handler.new(?\C-c) { Process.kill(:INT, Process.pid) },
+     Handler.new(?\C-w, &:kill_backward_word),
+     Handler.new(?\C-t, &:transpose_chars),
+     Handler.new(?\C-n, &:next_history_line),
+     Handler.new(?\C-p, &:previous_history_line),
+     Handler.new(?\C-r, &:interactive_search),
+     Handler.new(?\t,   &:complete),
+     Handler.new(?\C-a..?\C-z) {},
+
+     Handler.new(/\A\e(?:\C-h|\x7F)\z/, &:kill_backward_word),
+     Handler.new("\eb", &:backward_word),
+     Handler.new("\ef", &:forward_word),
+     Handler.new("\e[A", &:previous_history_line),
+     Handler.new("\e[B", &:next_history_line),
+     Handler.new("\e[5~", &:previous_history_line),
+     Handler.new("\e[6~", &:next_history_line),
+     Handler.new("\e[C", &:forward_char),
+     Handler.new("\e[D", &:backward_char),
+     Handler.new("\et", &:transpose_words),
+     Handler.new("\ec", &:capitalize_word),
+     Handler.new("\eu", &:uppercase_word),
+     Handler.new("\el", &:lowercase_word),
+
+     Handler.new(/\e.+/) {},
     ],
 
     :unknown_char_proc => :insert_string.to_proc,
@@ -155,11 +155,12 @@ class Coolline
   def readline(prompt = ">> ")
     @prompt = prompt
 
+    @history.delete_empty
+
     @line        = ""
     @pos         = 0
     @accumulator = nil
 
-    @history_index = @history.size
     @history_moved = false
 
     @should_exit = false
@@ -167,19 +168,20 @@ class Coolline
     print "\r\e[0m\e[0K"
     print @prompt
 
+    @history.index = @history.size - 1
+    @history << @line
+
     until (char = @input.getch) == "\r"
       handle(char)
       return if @should_exit
 
       if @history_moved
         @history_moved = false
-      else
-        @history_index = @history.size
       end
 
-      width       = @input.winsize[1]
-      prompt_size = strip_ansi_codes(@prompt).size
-      line        = transform(@line)
+      width          = @input.winsize[1]
+      prompt_size    = strip_ansi_codes(@prompt).size
+      line           = transform(@line)
 
       stripped_line_width = strip_ansi_codes(line).size
       line << " " * [width - stripped_line_width - prompt_size, 0].max
@@ -214,7 +216,6 @@ class Coolline
             break if i >= end_index
           end
         end
-
         if @pos < left_width + 1
           print "\e[#{prompt_size + @pos + 1}G"
         end
@@ -223,7 +224,8 @@ class Coolline
 
     print "\n"
 
-    @history << @line
+    @history[-1] = @line if @history.size != 0
+    @history.index = @history.size
 
     @line + "\n"
   end
@@ -240,14 +242,13 @@ class Coolline
 
   # Selects the previous line in history (if any)
   def previous_history_line
-    if @history_index - 1 >= 0
-      @line.replace @history[@history_index - 1]
-      @pos = [@line.size, @pos].min
-
-      @history_index -= 1
+    if @history.index >= 0
+      @line.replace @history[@history.index]
+      @history.index -= 1
     end
 
     @history_moved = true
+    end_of_line
   end
 
   # Selects the next line in history (if any).
@@ -255,19 +256,22 @@ class Coolline
   # When on the last line, this method replaces the current line with an empty
   # string.
   def next_history_line
-    if @history_index + 1 <= @history.size
-      @line.replace @history[@history_index + 1] || ""
-      @pos = [@line.size, @pos].min
-
-      @history_index += 1
+    if @history.index + 2 < @history.size
+      @history.index += 1
+      @line.replace @history[@history.index + 1] || @history.current
+    else
+      @line.replace @history[-1]
+      @history.index = @history.size - 2
     end
 
     @history_moved = true
+
+    end_of_line
   end
 
   # Prompts the user to search for a line
   def interactive_search
-    found_index   = @history_index
+    found_index = @history.index
 
     # Use another coolline instance for the search! :D
     Coolline.new { |c|
@@ -278,7 +282,7 @@ class Coolline
       c.transform_proc = proc do
         pattern = Regexp.new Regexp.escape(c.line)
 
-        line, found_index = @history.search(pattern, @history_index).first
+        line, found_index = @history.search(pattern, @history.index).first
 
         if line
           "#{c.line}): #{line}"
@@ -292,10 +296,12 @@ class Coolline
       c.history_size = 0
     }.readline("(search:")
 
+    found_index ||= @history.index
+
     @line.replace @history[found_index]
     @pos = [@line.size, @pos].min
 
-    @history_index = found_index
+    @history.index = found_index
     @history_moved = true
   end
 

data/lib/coolline/history.rb

@@ -2,6 +2,8 @@ class Coolline
   # Class used to keep track of input. It keeps a certain amount of lines at
   # most in memory, and stores them in a file.
   class History
+    attr_accessor :index
+
     def initialize(filename, max_size = 5000)
       @io       = File.open(filename, 'a+')
       @max_size = max_size
@@ -9,6 +11,8 @@ class Coolline
       @lines = []
 
       load_lines
+      delete_empty
+      @index = size
     end
 
     def reopen(filename)
@@ -33,6 +37,10 @@ class Coolline
       end
     end
 
+    def delete_empty
+      @lines.reject!(&:empty?)
+    end
+
     def <<(el)
       @io.puts el
       @io.flush
@@ -43,10 +51,18 @@ class Coolline
       self
     end
 
+    def current
+      self[@index]
+    end
+
     def [](id)
       @lines[id]
     end
 
+    def []=(id, val)
+      @lines[id] = val
+    end
+
     def size
       @lines.size
     end

data/lib/coolline/version.rb

@@ -1,3 +1,3 @@
 class Coolline
-  Version = "0.1.0"
+  Version = "0.2.0"
 end

data/repl.rb

@@ -20,7 +20,6 @@ end
 
 loop do
   line = cool.readline
-
   obj  = eval(line)
 
   print "=> "

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coolline
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &23189860 !ruby/object:Gem::Requirement
+  requirement: &12993820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23189860
+  version_requirements: *12993820
 description: ! 'A readline-like library that allows to change how the input
 
   is displayed.
@@ -69,3 +69,4 @@ signing_key:
 specification_version: 3
 summary: Sounds like readline, smells like readline, but isn't readline
 test_files: []
+has_rdoc: