coolline 0.2.0 → 0.3.0

data/lib/coolline/coolline.rb

@@ -1,15 +1,20 @@
 require 'io/console'
 
 class Coolline
-  if ENV["XDG_CONFIG_HOME"]
-    ConfigDir   = ENV["XDG_CONFIG_HOME"]
-    ConfigFile  = File.join(ConfigDir,  "coolline.rb")
+  if config_home = ENV["XDG_CONFIG_HOME"] and !config_home.empty?
+    ConfigDir = File.join(config_home, "coolline")
   else
-    ConfigDir  = ENV["HOME"]
-    ConfigFile = File.join(ConfigDir, ".coolline.rb")
+    ConfigDir = File.join(ENV["HOME"], ".config", "coolline")
   end
 
-  HistoryFile = File.join(ConfigDir, ".coolline-history")
+  if cache_home = ENV["XDG_CACHE_HOME"] and !cache_home.empty?
+    CacheDir = File.join(cache_home, "coolline")
+  else
+    CacheDir = File.join(ENV["HOME"], ".cache", "coolline")
+  end
+
+  ConfigFile = File.join(ConfigDir, "coolline.rb")
+  HistoryFile = File.join(CacheDir, "history")
 
   NullFile = if defined? File::NULL
                File::NULL
@@ -17,7 +22,7 @@ class Coolline
                "/dev/null"
              end
 
-  AnsiCode = %r{(\e\[\??\d+(?:;\d+)?\w)}
+  AnsiCode = %r{(\e\[\??\d+(?:[;\d]*)\w)}
 
   # @return [Hash] All the defaults settings
   Settings = {
@@ -29,6 +34,7 @@ class Coolline
      Handler.new(?\C-a, &:beginning_of_line),
      Handler.new(?\C-e, &:end_of_line),
      Handler.new(?\C-k, &:kill_line),
+     Handler.new(?\C-u, &:clear_line),
      Handler.new(?\C-f, &:forward_char),
      Handler.new(?\C-b, &:backward_char),
      Handler.new(?\C-d, &:kill_current_char_or_leave),
@@ -38,6 +44,7 @@ class Coolline
      Handler.new(?\C-n, &:next_history_line),
      Handler.new(?\C-p, &:previous_history_line),
      Handler.new(?\C-r, &:interactive_search),
+     Handler.new(?\C-l, &:clear_screen),
      Handler.new(?\t,   &:complete),
      Handler.new(?\C-a..?\C-z) {},
 
@@ -46,14 +53,21 @@ class Coolline
      Handler.new("\ef", &:forward_word),
      Handler.new("\e[A", &:previous_history_line),
      Handler.new("\e[B", &:next_history_line),
+     Handler.new("\e[3~", &:kill_current_char),
      Handler.new("\e[5~", &:previous_history_line),
      Handler.new("\e[6~", &:next_history_line),
+     Handler.new("\e[7~", &:beginning_of_line),
+     Handler.new("\e[8~", &:end_of_line),
      Handler.new("\e[C", &:forward_char),
      Handler.new("\e[D", &:backward_char),
+     Handler.new("\e[F", &:end_of_line),
+     Handler.new("\e[H", &:beginning_of_line),
      Handler.new("\et", &:transpose_words),
      Handler.new("\ec", &:capitalize_word),
      Handler.new("\eu", &:uppercase_word),
      Handler.new("\el", &:lowercase_word),
+     Handler.new("\e<", &:first_history_line),
+     Handler.new("\e>", &:last_history_line),
 
      Handler.new(/\e.+/) {},
     ],
@@ -84,6 +98,15 @@ class Coolline
     load_config! unless @config_loaded
   end
 
+  # Binds a key to a block. This key binding will have precedence over already
+  # defined key bindings.
+  #
+  # @param [String] key Key code sent by the terminal
+  # @yieldparam [Coolline] cool Coolline instance to use
+  def self.bind(key, &action)
+    Coolline::Settings[:handlers].unshift Coolline::Handler.new(key, &action)
+  end
+
   # Creates a new cool line.
   #
   # @yieldparam [Coolline] self
@@ -227,6 +250,8 @@ class Coolline
     @history[-1] = @line if @history.size != 0
     @history.index = @history.size
 
+    @history.save_line
+
     @line + "\n"
   end
 
@@ -240,6 +265,12 @@ class Coolline
     @output.print(*objs)
   end
 
+  # Closes the History object. Should be called when you're done with a Coolline
+  # instance.
+  def close
+    @history.close
+  end
+
   # Selects the previous line in history (if any)
   def previous_history_line
     if @history.index >= 0
@@ -251,6 +282,15 @@ class Coolline
     end_of_line
   end
 
+  # Selects the first line of history
+  def first_history_line
+    @history.index = 0
+    @line.replace @history[0]
+
+    @history_moved = true
+    end_of_line
+  end
+
   # Selects the next line in history (if any).
   #
   # When on the last line, this method replaces the current line with an empty
@@ -269,6 +309,15 @@ class Coolline
     end_of_line
   end
 
+  # Selects the last line of history
+  def last_history_line
+    @history.index = @history.size - 2
+    @line.replace @history[@history.index]
+
+    @history_moved = true
+    end_of_line
+  end
+
   # Prompts the user to search for a line
   def interactive_search
     found_index = @history.index
@@ -349,6 +398,11 @@ class Coolline
     (string =~ AnsiCode) == 0
   end
 
+  def clear_screen
+    print "\e[2J"   # clear
+    print "\e[0;0H" # goto 0, 0
+  end
+
   private
   def transform(line)
     @transform_proc.call(line)

data/lib/coolline/editor.rb

@@ -128,6 +128,12 @@ class Coolline
       line[pos..-1] = ""
     end
 
+    # Removes all the characters in the line
+    def clear_line
+      line.clear
+      self.pos = 0
+    end
+
     # Swaps the previous character with the current one
     def transpose_chars
       if line.size >= 2

data/lib/coolline/history.rb

@@ -5,7 +5,7 @@ class Coolline
     attr_accessor :index
 
     def initialize(filename, max_size = 5000)
-      @io       = File.open(filename, 'a+')
+      @io       = open_file(filename)
       @max_size = max_size
 
       @lines = []
@@ -17,7 +17,7 @@ class Coolline
 
     def reopen(filename)
       close
-      @io = File.open(filename, 'a+')
+      @io = open_file(filename)
 
       load_lines
     end
@@ -42,9 +42,6 @@ class Coolline
     end
 
     def <<(el)
-      @io.puts el
-      @io.flush
-
       @lines << el.dup
       @lines.delete_at(0) if @lines.size > @max_size
 
@@ -63,6 +60,11 @@ class Coolline
       @lines[id] = val
     end
 
+    def save_line
+      @io.puts self[-1]
+      @io.flush
+    end
+
     def size
       @lines.size
     end
@@ -70,6 +72,7 @@ class Coolline
     attr_accessor :max_size
 
     private
+
     def load_lines
       line_count = @io.count
       @io.rewind
@@ -83,5 +86,25 @@ class Coolline
         end
       end
     end
+
+    def open_file(filename)
+      dirname = File.dirname(filename)
+
+      if !Dir.exist?(dirname)
+        create_path(dirname)
+      end
+
+      File.open(filename, "a+")
+    end
+
+    def create_path(path)
+      dir = File.dirname(path)
+
+      if !Dir.exist? dir
+        create_path(dir)
+      end
+
+      Dir.mkdir(path, 0700)
+    end
   end
 end

data/lib/coolline/version.rb

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

data/repl.rb

@@ -4,6 +4,10 @@ require 'coolline'
 require 'coderay'
 require 'pp'
 
+Coolline.bind "\C-z" do |c|
+  puts c.object_id
+end
+
 cool = Coolline.new do |c|
   c.transform_proc = proc do
     CodeRay.scan(c.line, :ruby).term
@@ -20,8 +24,12 @@ end
 
 loop do
   line = cool.readline
-  obj  = eval(line)
+  break if line == "exit\n"
+
+  obj = eval(line)
 
   print "=> "
   pp obj
 end
+
+cool.close

data/test/coolline_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path("helpers.rb", File.dirname(__FILE__))
+
+context "a user uses colors for live code highlighting" do
+  setup do
+    Coolline.new
+  end
+
+  context "stripping 8-color ANSI codes" do
+    asserts(:strip_ansi_codes, "\033[42mLove\033[0m").equals "Love"
+    asserts(:strip_ansi_codes, "\e[42mLove\e[0m").equals "Love"
+  end
+
+  context "stripping non 8-color ANSI codes" do
+    asserts(:strip_ansi_codes, "\033[38;5;232mHate\033[0m").equals "Hate"
+    asserts(:strip_ansi_codes, "\e[38;5;232mHate\e[0m").equals "Hate"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coolline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &12993820 !ruby/object:Gem::Requirement
+  requirement: &18648680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12993820
+  version_requirements: *18648680
 description: ! 'A readline-like library that allows to change how the input
 
   is displayed.
@@ -40,6 +40,7 @@ files:
 - lib/coolline.rb
 - test/helpers.rb
 - test/editor_test.rb
+- test/coolline_test.rb
 - test/run_all.rb
 - test/history_test.rb
 - repl.rb