ruco 0.0.5 → 0.0.6

data/Readme.md

@@ -11,6 +11,7 @@ Finished:
  - writeable indicator
  - backspace / delete
  - find / go to line
+ - delete line
 
 Install
 =======
@@ -22,8 +23,6 @@ Usage
 
 TODO
 =====
- - delete line
- - scrolling inside text field
  - smart staying at end of line/column when changing line
  - indentation + paste support
  - warnings / messages

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/ruco

@@ -76,19 +76,19 @@ init_screen do
     display editor, status_lines, Curses::A_NORMAL
     display command, status_lines + editor_lines, Curses::A_REVERSE
 
-    Curses.setpos(focused.cursor_line + status_lines, focused.cursor_column)
+    Curses.setpos(focused.cursor.line + status_lines, focused.cursor.column)
 
     key = Curses.getch
 
     case key
 
     # move
-    when Curses::Key::UP then focused.move(-1,0)
-    when Curses::Key::DOWN then focused.move(1,0)
-    when Curses::Key::RIGHT then focused.move(0,1)
-    when Curses::Key::LEFT then focused.move(0,-1)
-    when Curses::KEY_END then focused.move_to_eol
-    when Curses::KEY_HOME then focused.move_to_bol
+    when Curses::Key::UP then focused.move(:relative, -1,0)
+    when Curses::Key::DOWN then focused.move(:relative, 1,0)
+    when Curses::Key::RIGHT then focused.move(:relative, 0,1)
+    when Curses::Key::LEFT then focused.move(:relative, 0,-1)
+    when Curses::KEY_END then focused.move :to_eol
+    when Curses::KEY_HOME then focused.move :to_bol
 
     # modify
     when 9 then focused.insert(key.chr) # tab
@@ -103,6 +103,8 @@ init_screen do
     when Curses::KEY_DC then focused.delete(1) # delete
 
     # misc
+    when ?\C-d then
+      editor.delete_line
     when ?\C-f then
       focused = command
       command.find

data/lib/ruco.rb

@@ -2,7 +2,7 @@ require 'ruco/core_ext/object'
 require 'ruco/core_ext/string'
 require 'ruco/core_ext/array'
 
-require 'ruco/focusable'
+require 'ruco/cursor'
 require 'ruco/command'
 
 require 'ruco/editor'
@@ -10,6 +10,7 @@ require 'ruco/status_bar'
 require 'ruco/command_bar'
 
 require 'ruco/form'
+require 'ruco/text_area'
 require 'ruco/text_field'
 
 module Ruco

data/lib/ruco/command_bar.rb

@@ -1,7 +1,5 @@
 module Ruco
   class CommandBar
-    include Focusable
-
     attr_accessor :cursor_line, :form
     delegate :move, :delete, :insert, :to => :form
 
@@ -13,8 +11,6 @@ module Ruco
       '^G Go to line'
     ]
 
-    SEARCH_PREFIX = "Find: "
-
     def initialize(options)
       @options = options
       @forms_cache = {}
@@ -30,11 +26,17 @@ module Ruco
     end
 
     def find
-      @form = @forms_cache[:find] ||= Form.new('Find: ', :columns => @options[:columns], :command => :find)
+      @forms_cache[:find] ||= Form.new('Find: ', :columns => @options[:columns]) do |value|
+        Command.new(:find, value)
+      end
+      @form = @forms_cache[:find]
     end
 
     def move_to_line
-      @form = Form.new('Go to Line: ', :columns => @options[:columns], :command => :move_to_line, :type => :integer)
+      @form = Form.new('Go to Line: ', :columns => @options[:columns], :type => :integer) do |value|
+        reset
+        Command.new(:move, :to_line, value.to_i)
+      end
     end
 
     def reset
@@ -42,11 +44,11 @@ module Ruco
       @form = nil
     end
 
-    def cursor_column
+    def cursor
       if @form
-        @form.cursor[1]
+        Cursor.new cursor_line, @form.cursor.column
       else
-        0
+        Cursor.new cursor_line, 0
       end
     end
 

data/lib/ruco/cursor.rb

@@ -0,0 +1,10 @@
+module Ruco
+  class Cursor < Array
+    def initialize(line, column)
+      super([line, column])
+    end
+
+    alias_method :line, :first
+    alias_method :column, :last
+  end
+end

data/lib/ruco/editor.rb

@@ -1,202 +1,56 @@
 module Ruco
   class Editor
-    include Focusable
-
-    SCROLLING_OFFSET = 20
-
-    attr_reader :cursor_line, :cursor_column, :file
+    attr_reader :file
+    delegate :view, :move, :cursor, :to => :text_area
 
     def initialize(file, options)
       @file = file
       @options = options
-      @content = tabs_to_spaces((File.exist?(@file) ? File.read(@file) : ''))
-      @line = 0
-      @column = 0
-      @cursor_line = 0
-      @cursor_column = 0
-      @scrolled_lines = 0
-      @scrolled_columns = 0
+      content = (File.exist?(@file) ? File.read(@file) : '')
+      @text_area = TextArea.new(content, @options)
       @modified = false
-      @options[:line_scrolling_offset] ||= @options[:lines] / 2
-      @options[:column_scrolling_offset] ||= @options[:columns] / 2
-    end
-
-    def view
-      Array.new(@options[:lines]).map_with_index do |_,i|
-        (lines[i + @scrolled_lines] || "").slice(@scrolled_columns, @options[:columns])
-      end * "\n" + "\n"
-    end
-
-    def move(line, column)
-      @line += line
-      @column += column
-      adjust_view
-    end
-
-    def move_to(line, column)
-      @line = line
-      @column = column
-      adjust_view
-    end
-
-    def move_to_line(line)
-      move_to(line, @column)
-    end
-
-    def move_to_column(column)
-      move_to(@line, column)
-    end
-
-    def move_to_eol
-      after_last_word = current_line.index(/\s*$/)
-      after_last_whitespace = current_line.size
-
-      if @column == after_last_whitespace or @column < after_last_word
-        move_to_column after_last_word
-      else
-        move_to_column after_last_whitespace
-      end
-    end
-
-    def move_to_bol
-      before_first_word = current_line.index(/[^\s]/) || 0
-      if @column == 0 or @column > before_first_word
-        move_to_column before_first_word
-      else
-        move_to_column 0
-      end
     end
 
     def find(text)
-      index = @content.index(text, cursor_index+1) || cursor_index
-      move_to *cursor_for_index(index)
+      index = text_area.content.index(text, text_area.cursor_index+1) || text_area.cursor_index
+      move :to, *text_area.cursor_for_index(index)
     end
 
+    def reset;end
+
     def insert(text)
-      text = tabs_to_spaces(text)
-      insert_into_content cursor_index, text
-      move_according_to_insert(text)
       @modified = true
+      text_area.insert(text)
     end
 
-    def delete(count)
-      if count > 0
-        @content.slice!(cursor_index, count)
-      else
-        backspace(count.abs)
-      end
+    def delete(*args)
+      text_area.delete(*args)
       @modified = true
     end
 
-    def backspace(count)
-      start_index = cursor_index - count
-      if start_index < 0
-        count += start_index
-        start_index = 0
+    def delete_line
+      old_cursor = cursor
+      move :to, cursor.line, 0
+      delete text_area.line_length
+      if cursor == [0,0]
+        delete(1)
+      else
+        delete(-1)
       end
-
-      @content.slice!(start_index, count)
-      move_to *cursor_for_index(start_index)
-      @modified = true
-    end
-
-    def save
-      File.open(@file,'w'){|f| f.write(@content) }
-      @modified = false
-    end
-
-    def cursor
-      [cursor_line, cursor_column]
+      move :to, *old_cursor
     end
 
     def modified?
       @modified
     end
 
-    private
-
-    def lines
-      @content.naive_split("\n")
-    end
-
-    def adjust_view
-      @line =    [[@line,   0].max, lines.size - 1].min
-      @column =  [[@column, 0].max, (lines[@line]||'').size].min
-      reposition_cursor
-      scroll_column_into_view
-      scroll_line_into_view
-      reposition_cursor
-    end
-
-    def scroll_column_into_view
-      offset = [@options[:column_scrolling_offset], @options[:columns]].min
-
-      if @cursor_column >= @options[:columns]
-        @scrolled_columns = @column - @options[:columns] + offset
-      end
-
-      if @cursor_column < 0
-        @scrolled_columns = @column - offset
-      end
-
-      @scrolled_columns = [[@scrolled_columns, 0].max, @column].min
-    end
-
-    def scroll_line_into_view
-      offset = [@options[:line_scrolling_offset], @options[:lines]].min
-
-      if @cursor_line >= @options[:lines]
-        @scrolled_lines = @line - @options[:lines] + offset
-      end
-
-      if @cursor_line < 0
-        @scrolled_lines = @line - offset
-      end
-
-      @scrolled_lines = [[@scrolled_lines, 0].max, @line].min
-    end
-
-    def reposition_cursor
-      @cursor_column = @column - @scrolled_columns
-      @cursor_line = @line - @scrolled_lines
-    end
-
-    def insert_into_content(index, text)
-      # expand with newlines when inserting after maximum position
-      if index > @content.size
-        @content << "\n" * (index - @content.size)
-      end
-      @content.insert(index, text)
-    end
-
-    def current_line
-      lines[@line] || ''
-    end
-
-    def cursor_index
-      index = lines[0...@line].join("\n").size + @column
-      index += 1 if @line > 0 # account for missing newline
-      index
-    end
-
-    def cursor_for_index(index)
-      jump = @content.slice(0, index).to_s.naive_split("\n")
-      [jump.size - 1, jump.last.size]
+    def save
+      File.open(@file,'w'){|f| f.write(text_area.content) }
+      @modified = false
     end
 
-    def move_according_to_insert(text)
-      inserted_lines = text.naive_split("\n")
-      if inserted_lines.size > 1
-        # column position does not add up when hitting return
-        @column = inserted_lines.last.size
-        move(inserted_lines.size - 1, 0)
-      else
-        move(inserted_lines.size - 1, inserted_lines.last.size)
-      end
-    end
+    private
 
-    def tabs_to_spaces(text)
-      text.gsub("\t",' ' * Ruco::TAB_SIZE)
-    end
+    attr_reader :text_area
   end
 end

data/lib/ruco/form.rb

@@ -2,9 +2,10 @@ module Ruco
   class Form
     delegate :move, :delete, :to => :text_field
 
-    def initialize(label, options)
+    def initialize(label, options, &submit)
       @options = options
       @label = label.strip + ' '
+      @submit = submit
       reset
     end
 
@@ -17,12 +18,12 @@ module Ruco
       if text.include?("\n")
         result = @text_field.value
         result = result.to_i if @options[:type] == :integer
-        Command.new(@options[:command], result)
+        @submit.call(result)
       end
     end
 
     def cursor
-      [0, @label.size + @text_field.cursor[1]]
+      Cursor.new 0, @label.size + @text_field.cursor.column
     end
 
     def reset

data/lib/ruco/text_area.rb

@@ -0,0 +1,181 @@
+module Ruco
+  class TextArea
+    attr_reader :content
+
+    def initialize(content, options)
+      @content = tabs_to_spaces(content)
+      @options = options
+      @line = 0
+      @column = 0
+      @cursor_line = 0
+      @cursor_column = 0
+      @scrolled_lines = 0
+      @scrolled_columns = 0
+      @options[:line_scrolling_offset] ||= @options[:lines] / 2
+      @options[:column_scrolling_offset] ||= @options[:columns] / 2
+    end
+
+    def view
+      Array.new(@options[:lines]).map_with_index do |_,i|
+        (lines[i + @scrolled_lines] || "").slice(@scrolled_columns, @options[:columns])
+      end * "\n" + "\n"
+    end
+
+    def move(where, *args)
+      case where
+      when :relative then
+        @line += args.first
+        @column += args.last
+      when :to then
+        @line, @column = args
+      when :to_bol then move_to_bol(*args)
+      when :to_eol then move_to_eol(*args)
+      when :to_line then @line = args.first
+      when :to_column then @column = args.first
+      else
+        raise "Unknown move type #{where} with #{args.inspect}"
+      end
+      adjust_view
+    end
+
+    def insert(text)
+      text = tabs_to_spaces(text)
+      insert_into_content cursor_index, text
+      move_according_to_insert(text)
+    end
+
+    def delete(count)
+      if count > 0
+        @content.slice!(cursor_index, count)
+      else
+        backspace(count.abs)
+      end
+    end
+
+    def cursor
+      Cursor.new @cursor_line, @cursor_column
+    end
+
+    def cursor_index
+      index = lines[0...@line].join("\n").size + @column
+      index += 1 if @line > 0 # account for missing newline
+      index
+    end
+
+    def cursor_for_index(index)
+      jump = @content.slice(0, index).to_s.naive_split("\n")
+      [jump.size - 1, jump.last.size]
+    end
+
+    def line_length
+      lines[@line].size
+    end
+
+    private
+
+    def move_to_eol
+      after_last_word = current_line.index(/\s*$/)
+      after_last_whitespace = current_line.size
+
+      if @column == after_last_whitespace or @column < after_last_word
+        move :to_column, after_last_word
+      else
+        move :to_column, after_last_whitespace
+      end
+    end
+
+    def move_to_bol
+      before_first_word = current_line.index(/[^\s]/) || 0
+      column = if @column == 0 or @column > before_first_word
+        before_first_word
+      else
+        0
+      end
+      move :to_column, column
+    end
+
+    def backspace(count)
+      start_index = cursor_index - count
+      if start_index < 0
+        count += start_index
+        start_index = 0
+      end
+
+      @content.slice!(start_index, count)
+      move :to, *cursor_for_index(start_index)
+    end
+
+    def lines
+      @content.naive_split("\n")
+    end
+
+    def adjust_view
+      @line =    [[@line,   0].max, lines.size - 1].min
+      @column =  [[@column, 0].max, (lines[@line]||'').size].min
+      reposition_cursor
+      scroll_column_into_view
+      scroll_line_into_view
+      reposition_cursor
+    end
+
+    def scroll_column_into_view
+      offset = [@options[:column_scrolling_offset], @options[:columns]].min
+
+      if @cursor_column >= @options[:columns]
+        @scrolled_columns = @column - @options[:columns] + offset
+      end
+
+      if @cursor_column < 0
+        @scrolled_columns = @column - offset
+      end
+
+      @scrolled_columns = [[@scrolled_columns, 0].max, @column].min
+    end
+
+    def scroll_line_into_view
+      offset = [@options[:line_scrolling_offset], @options[:lines]].min
+
+      if @cursor_line >= @options[:lines]
+        @scrolled_lines = @line - @options[:lines] + offset
+      end
+
+      if @cursor_line < 0
+        @scrolled_lines = @line - offset
+      end
+
+      @scrolled_lines = [[@scrolled_lines, 0].max, @line].min
+    end
+
+    def reposition_cursor
+      @cursor_column = @column - @scrolled_columns
+      @cursor_line = @line - @scrolled_lines
+    end
+
+    def insert_into_content(index, text)
+      # expand with newlines when inserting after maximum position
+      if index > @content.size
+        @content << "\n" * (index - @content.size)
+      end
+      @content.insert(index, text)
+    end
+
+    def current_line
+      lines[@line] || ''
+    end
+
+    def move_according_to_insert(text)
+      inserted_lines = text.naive_split("\n")
+      if inserted_lines.size > 1
+        # column position does not add up when hitting return
+        @column = inserted_lines.last.size
+        move(:relative, inserted_lines.size - 1, 0)
+      else
+        move(:relative, inserted_lines.size - 1, inserted_lines.last.size)
+      end
+    end
+
+    def tabs_to_spaces(text)
+      text.gsub("\t",' ' * Ruco::TAB_SIZE)
+    end
+  end
+end

data/lib/ruco/text_field.rb

@@ -1,40 +1,15 @@
 module Ruco
-  class TextField
+  class TextField < TextArea
     def initialize(options)
-      @options = options
-      @content = ''
-      @column = 0
-    end
-
-    def insert(text)
-      @content += text
-      move(0, text.size)
-    end
-
-    def delete(count)
-      if count > 0
-        @content.slice!(@column, count)
-      else
-        delete_start = [@column - count.abs, 0].max
-        @content[delete_start...@column] = ''
-        @column = delete_start
-      end
+      super('', options.merge(:lines => 1))
     end
 
     def view
-      @content
+      super.gsub("\n",'')
     end
 
     def value
-      @content
-    end
-
-    def move(line, column)
-      @column = [[@column + column, 0].max, @content.size].min
-    end
-
-    def cursor
-      [0, @column]
+      content.gsub("\n",'')
     end
   end
 end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-10}
+  s.date = %q{2011-01-11}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -26,10 +26,11 @@ Gem::Specification.new do |s|
     "lib/ruco/core_ext/array.rb",
     "lib/ruco/core_ext/object.rb",
     "lib/ruco/core_ext/string.rb",
+    "lib/ruco/cursor.rb",
     "lib/ruco/editor.rb",
-    "lib/ruco/focusable.rb",
     "lib/ruco/form.rb",
     "lib/ruco/status_bar.rb",
+    "lib/ruco/text_area.rb",
     "lib/ruco/text_field.rb",
     "ruco.gemspec",
     "spec/ruco/command_bar_spec.rb",

data/spec/ruco/command_bar_spec.rb

@@ -1,15 +1,16 @@
 require File.expand_path('spec/spec_helper')
 
 describe Ruco::CommandBar do
+  let(:default_view){ "^W Exit    ^S Save    ^F Find" }
   let(:bar){ Ruco::CommandBar.new(:columns => 30) }
 
   it "shows shortcuts by default" do
-    bar.view.should == "^W Exit    ^S Save    ^F Find"
+    bar.view.should == default_view
   end
 
   it "shows less shortcuts when space is low" do
     bar = Ruco::CommandBar.new(:columns => 29)
-    bar.view.should == "^W Exit    ^S Save    ^F Find"
+    bar.view.should == default_view
     bar = Ruco::CommandBar.new(:columns => 28)
     bar.view.should == "^W Exit    ^S Save"
   end
@@ -18,14 +19,14 @@ describe Ruco::CommandBar do
     it "sets command bar into search mode" do
       bar.find
       bar.view.should == "Find: "
-      bar.cursor_column.should == 6
+      bar.cursor.column.should == 6
     end
 
     it "can enter stuff" do
       bar.find
       bar.insert('abc')
       bar.view.should == "Find: abc"
-      bar.cursor_column.should == 9
+      bar.cursor.column.should == 9
     end
 
     it "keeps entered stuff" do
@@ -33,7 +34,7 @@ describe Ruco::CommandBar do
       bar.insert('abc')
       bar.find
       bar.view.should == "Find: abc"
-      bar.cursor_column.should == 9
+      bar.cursor.column.should == 9
     end
 
     it "can reset the search" do
@@ -42,7 +43,7 @@ describe Ruco::CommandBar do
       bar.insert("\n")
       bar.reset
 
-      bar.view.should include("^W Exit ") # default view
+      bar.view.should == default_view
       bar.find
       bar.view.should == "Find: " # term removed
     end
@@ -73,23 +74,29 @@ describe Ruco::CommandBar do
       bar.move_to_line
       bar.insert('123')
       result = bar.insert("\n")
-      result.should == Ruco::Command.new(:move_to_line, 123)
+      result.should == Ruco::Command.new(:move, :to_line, 123)
     end
 
-    it "gets reset" do
+    it "gets reset when starting a new go to line" do
       bar.move_to_line
       bar.insert('123')
       bar.move_to_line
       bar.view.should == "Go to Line: "
     end
 
+    it "gets reset when submitting" do
+      bar.move_to_line
+      bar.insert("123\n")
+      bar.view.should == default_view
+    end
+
     it "does not reset search when resetting" do
       bar.find
       bar.insert('abc')
       bar.move_to_line
       bar.reset
 
-      bar.view.should include("^W Exit ") # default view
+      bar.view.should == default_view
       bar.find
       bar.view.should == "Find: abc"
     end

data/spec/ruco/editor_spec.rb

@@ -26,62 +26,62 @@ describe Ruco::Editor do
     end
 
     it "can move" do
-      editor.move(1,2)
+      editor.move(:relative, 1,2)
       editor.cursor.should == [1,2]
-      editor.move(1,1)
+      editor.move(:relative, 1,1)
       editor.cursor.should == [2,3]
     end
 
     it "can move in empty file" do
       write("\n\n\n")
-      editor.move(2,0)
+      editor.move(:relative, 2,0)
       editor.cursor.should == [2,0]
     end
 
     it "cannot move left/top off screen" do
-      editor.move(-1,-1)
+      editor.move(:relative, -1,-1)
       editor.cursor.should == [0,0]
     end
 
     it "cannot move right of characters" do
-      editor.move(2,6)
+      editor.move(:relative, 2,6)
       editor.cursor.should == [2,4]
     end
 
     it "stays in last line when moving past lines" do
       write("    ")
-      editor.move(6,3)
+      editor.move(:relative, 6,3)
       editor.cursor.should == [0,3]
     end
 
     describe 'column scrolling' do
       it "can scroll columns" do
         write("123456789\n123")
-        editor.move(0,4)
+        editor.move(:relative, 0,4)
         editor.view.should == "12345\n123\n\n"
-        editor.cursor_column.should == 4
+        editor.cursor.column.should == 4
 
-        editor.move(0,1)
+        editor.move(:relative, 0,1)
         editor.view.should == "6789\n\n\n"
-        editor.cursor_column.should == 0
+        editor.cursor.column.should == 0
       end
 
       it "cannot scroll past the screen" do
         write('123456789')
-        editor.move(0,4)
-        6.times{ editor.move(0,1) }
+        editor.move(:relative, 0,4)
+        6.times{ editor.move(:relative, 0,1) }
         editor.view.should == "6789\n\n\n"
-        editor.cursor_column.should == 4
+        editor.cursor.column.should == 4
       end
 
       it "can scroll columns backwards" do
         write('123456789')
-        editor.move(0,5)
+        editor.move(:relative, 0,5)
         editor.view.should == "6789\n\n\n"
 
-        editor.move(0,-1)
+        editor.move(:relative, 0,-1)
         editor.view.should == "12345\n\n\n"
-        editor.cursor_column.should == 4
+        editor.cursor.column.should == 4
       end
     end
 
@@ -91,119 +91,96 @@ describe Ruco::Editor do
       end
 
       it "can scroll lines down (at maximum of screen size)" do
-        editor.move(2,0)
+        editor.move(:relative, 2,0)
         editor.view.should == "1\n2\n3\n"
 
-        editor.move(1,0)
+        editor.move(:relative, 1,0)
         editor.view.should == "4\n5\n6\n"
-        editor.cursor_line.should == 0
+        editor.cursor.line.should == 0
       end
 
       it "can scroll till end of file" do
-        editor.move(15,0)
+        editor.move(:relative, 15,0)
         editor.view.should == "9\n\n\n"
-        editor.cursor_line.should == 0
+        editor.cursor.line.should == 0
       end
     end
-  end
-
-  describe :move_to do
-    it "cannot move outside of text (bottom/right)" do
-      write("123\n456")
-      editor.move_to(10,10)
-      editor.cursor.should == [1,3]
-    end
-
-    it "cannot move outside of text (top/left)" do
-      write("123\n456")
-      editor.move(1,1)
-      editor.move_to(-10,-10)
-      editor.cursor.should == [0,0]
-    end
-  end
-
-  describe :move_to_eol do
-    before do
-      write("\n aa \n  ")
-    end
 
-    it 'stays at start when line is empty' do
-      editor.move_to_eol
-      editor.cursor.should == [0,0]
-    end
+    describe :to do
+      it "cannot move outside of text (bottom/right)" do
+        write("123\n456")
+        editor.move(:to, 10,10)
+        editor.cursor.should == [1,3]
+      end
 
-    it 'moves after last word if cursor was before it' do
-      editor.move(1,1)
-      editor.move_to_eol
-      editor.cursor.should == [1,3]
+      it "cannot move outside of text (top/left)" do
+        write("123\n456")
+        editor.move(:relative, 1,1)
+        editor.move(:to, -10,-10)
+        editor.cursor.should == [0,0]
+      end
     end
 
-    it 'moves after last whitespace if cursor was after last word' do
-      editor.move(1,3)
-      editor.move_to_eol
-      editor.cursor.should == [1,4]
-    end
+    describe :to_eol do
+      before do
+        write("\n aa \n  ")
+      end
 
-    it 'moves after last work if cursor was after last whitespace' do
-      editor.move(1,4)
-      editor.move_to_eol
-      editor.cursor.should == [1,3]
-    end
-  end
+      it 'stays at start when line is empty' do
+        editor.move :to_eol
+        editor.cursor.should == [0,0]
+      end
 
-  describe :move_to_bol do
-    before do
-      write("\n  aa \n  ")
-    end
+      it 'moves after last word if cursor was before it' do
+        editor.move(:relative, 1,1)
+        editor.move :to_eol
+        editor.cursor.should == [1,3]
+      end
 
-    it 'stays at start when line is empty' do
-      editor.move_to_bol
-      editor.cursor.should == [0,0]
-    end
+      it 'moves after last whitespace if cursor was after last word' do
+        editor.move(:relative, 1,3)
+        editor.move :to_eol
+        editor.cursor.should == [1,4]
+      end
 
-    it 'moves before first work if at start of line' do
-      editor.move(1,0)
-      editor.move_to_bol
-      editor.cursor.should == [1,2]
+      it 'moves after last work if cursor was after last whitespace' do
+        editor.move(:relative, 1,4)
+        editor.move :to_eol
+        editor.cursor.should == [1,3]
+      end
     end
 
-    it 'moves to start of line if before first word' do
-      editor.move(1,1)
-      editor.move_to_bol
-      editor.cursor.should == [1,0]
-
-      editor.move(0,2)
-      editor.move_to_bol
-      editor.cursor.should == [1,0]
-    end
+    describe :to_bol do
+      before do
+        write("\n  aa \n  ")
+      end
 
-    it 'moves before first word if inside line' do
-      editor.move(1,5)
-      editor.move_to_bol
-      editor.cursor.should == [1,2]
-    end
-  end
+      it 'stays at start when line is empty' do
+        editor.move :to_bol
+        editor.cursor.should == [0,0]
+      end
 
-  describe :find do
-    before do
-      write("\n ab\n ab")
-    end
+      it 'moves before first work if at start of line' do
+        editor.move(:relative, 1,0)
+        editor.move :to_bol
+        editor.cursor.should == [1,2]
+      end
 
-    it "moves to first occurrence" do
-      editor.find('ab')
-      editor.cursor.should == [1,1]
-    end
+      it 'moves to start of line if before first word' do
+        editor.move(:relative, 1,1)
+        editor.move :to_bol
+        editor.cursor.should == [1,0]
 
-    it "moves to next occurrence" do
-      editor.move(1,1)
-      editor.find('ab')
-      editor.cursor.should == [2,1]
-    end
+        editor.move(:relative, 0,2)
+        editor.move :to_bol
+        editor.cursor.should == [1,0]
+      end
 
-    it "stays in place when nothing was found" do
-      editor.move(2,1)
-      editor.find('ab')
-      editor.cursor.should == [2,1]
+      it 'moves before first word if inside line' do
+        editor.move(:relative, 1,5)
+        editor.move :to_bol
+        editor.cursor.should == [1,2]
+      end
     end
   end
 
@@ -239,7 +216,7 @@ describe Ruco::Editor do
 
     it "can insert new chars" do
       write('123')
-      editor.move(0,1)
+      editor.move(:relative, 0,1)
       editor.insert('ab')
       editor.view.should == "1ab23\n\n\n"
       editor.cursor.should == [0,3]
@@ -253,7 +230,7 @@ describe Ruco::Editor do
 
     it "jumps to correct column when inserting newline" do
       write("abc\ndefg")
-      editor.move(1,2)
+      editor.move(:relative, 1,2)
       editor.insert("1\n23")
       editor.view.should == "abc\nde1\n23fg\n"
       editor.cursor.should == [2,2]
@@ -261,7 +238,7 @@ describe Ruco::Editor do
 
     it "jumps to correct column when inserting 1 newline" do
       write("abc\ndefg")
-      editor.move(1,2)
+      editor.move(:relative, 1,2)
       editor.insert("\n")
       editor.view.should == "abc\nde\nfg\n"
       editor.cursor.should == [2,0]
@@ -276,7 +253,7 @@ describe Ruco::Editor do
 
     it "can add newlines to the moveable end" do
       write('abc')
-      editor.move(0,3)
+      editor.move(:relative, 0,3)
       editor.insert("\n")
       editor.insert("\n")
       editor.cursor.should == [2,0]
@@ -315,7 +292,7 @@ describe Ruco::Editor do
 
     it 'removes a line' do
       write("123\n45")
-      editor.move(0,3)
+      editor.move(:relative, 0,3)
       editor.delete(1)
       editor.view.should == "12345\n\n\n"
       editor.cursor.should == [0,3]
@@ -323,7 +300,7 @@ describe Ruco::Editor do
 
     it "cannot backspace over 0,0" do
       write("aa")
-      editor.move(0,1)
+      editor.move(:relative, 0,1)
       editor.delete(-3)
       editor.view.should == "a\n\n\n"
       editor.cursor.should == [0,0]
@@ -331,7 +308,7 @@ describe Ruco::Editor do
 
     it 'backspaces a char' do
       write('123')
-      editor.move(0,3)
+      editor.move(:relative, 0,3)
       editor.delete(-1)
       editor.view.should == "12\n\n\n"
       editor.cursor.should == [0,2]
@@ -339,7 +316,7 @@ describe Ruco::Editor do
 
     it 'backspaces a newline' do
       write("1\n234")
-      editor.move(1,0)
+      editor.move(:relative, 1,0)
       editor.delete(-1)
       editor.view.should == "1234\n\n\n"
       editor.cursor.should == [0,1]
@@ -362,7 +339,7 @@ describe Ruco::Editor do
     end
 
     it "is not changed after move" do
-      editor.move(1,1)
+      editor.move(:relative, 1,1)
       editor.modified?.should == false
     end
 
@@ -372,4 +349,75 @@ describe Ruco::Editor do
       editor.modified?.should == false
     end
   end
+
+  describe :find do
+    before do
+      write("\n ab\n ab")
+    end
+
+    it "moves to first occurrence" do
+      editor.find('ab')
+      editor.cursor.should == [1,1]
+    end
+
+    it "moves to next occurrence" do
+      editor.move(:relative, 1,1)
+      editor.find('ab')
+      editor.cursor.should == [2,1]
+    end
+
+    it "stays in place when nothing was found" do
+      editor.move(:relative, 2,1)
+      editor.find('ab')
+      editor.cursor.should == [2,1]
+    end
+  end
+
+  describe :delete_line do
+    before do
+      write("1\nlonger_than_columns\n56789")
+    end
+
+    it "removes the current line from first char" do
+      editor.move(:to, 1, 0)
+      editor.delete_line
+      editor.view.should == "1\n56789\n\n"
+      editor.cursor.should == [1, 0]
+    end
+
+    it "removes the current line from last char" do
+      editor.move(:to, 1, 3)
+      editor.delete_line
+      editor.view.should == "1\n56789\n\n"
+      editor.cursor.should == [1, 3]
+    end
+
+    it "can remove the first line" do
+      editor.delete_line
+      editor.view.should == "longe\n56789\n\n"
+      editor.cursor.should == [0, 0]
+    end
+
+    it "can remove the last line" do
+      write("aaa")
+      editor.delete_line
+      editor.view.should == "\n\n\n"
+      editor.cursor.should == [0, 0]
+    end
+
+    it "can remove the last line with lines remaining" do
+      write("aaa\nbbb")
+      editor.move(:to, 1,1)
+      editor.delete_line
+      editor.view.should == "aaa\n\n\n"
+      editor.cursor.should == [0, 1]
+    end
+
+    it "jumps to end of next lines end when put of space" do
+      write("1\n234\n5")
+      editor.move(:to, 1, 3)
+      editor.delete_line
+      editor.cursor.should == [1, 1]
+    end
+  end
 end

data/spec/ruco/form_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('spec/spec_helper')
 
 describe Ruco::Form do
-  let(:form){ Ruco::Form.new('Test', :columns => 30, :command => :find) }
+  let(:form){ Ruco::Form.new('Test', :columns => 30){|value| Ruco::Command.new(:find, value) } }
 
   it "positions cursor in text field" do
     form.cursor.should == [0, 5]
@@ -26,20 +26,20 @@ describe Ruco::Form do
   describe :move do
     it "moves in text-field" do
       form.insert('abc')
-      form.move(0, -1)
+      form.move(:relative, 0, -1)
       form.cursor.should == [0,7]
     end
 
     it "cannot move out of left side" do
-      form.move(0, -3)
+      form.move(:relative, 0, -3)
       form.cursor.should == [0,5]
     end
 
     it "cannot move out of right side" do
-      form.move(0, 4)
+      form.move(:relative, 0, 4)
       form.cursor.should == [0,5]
       form.insert('abc')
-      form.move(0, 4)
+      form.move(:relative, 0, 4)
       form.cursor.should == [0,8]
     end
   end
@@ -47,21 +47,21 @@ describe Ruco::Form do
   describe :delete do
     it "removes characters forward" do
       form.insert('abc')
-      form.move(0, -2)
+      form.move(:relative, 0, -2)
       form.delete(1)
       form.view.should == 'Test ac' 
     end
 
     it "removes characters backward" do
       form.insert('abc')
-      form.move(0, -1)
+      form.move(:relative, 0, -1)
       form.delete(-1)
       form.view.should == 'Test ac'
     end
 
     it "moves the cursor backward" do
       form.insert('abc')
-      form.move(0, -1)
+      form.move(:relative, 0, -1)
       form.delete(-1)
       form.cursor.should == [0,6]
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +01:00
 default_executable: ruco
 dependencies: []
 
@@ -40,10 +40,11 @@ files:
 - lib/ruco/core_ext/array.rb
 - lib/ruco/core_ext/object.rb
 - lib/ruco/core_ext/string.rb
+- lib/ruco/cursor.rb
 - lib/ruco/editor.rb
-- lib/ruco/focusable.rb
 - lib/ruco/form.rb
 - lib/ruco/status_bar.rb
+- lib/ruco/text_area.rb
 - lib/ruco/text_field.rb
 - ruco.gemspec
 - spec/ruco/command_bar_spec.rb

data/lib/ruco/focusable.rb

@@ -1,11 +0,0 @@
-module Ruco
-  # Stub so things do not explode
-  module Focusable
-    def reset;end
-    def move(line, column);end
-    def move_to_eol;end
-    def move_to_bol;end
-    def insert(char);end
-    def delete(count);end
-  end
-end