ruco 0.0.22 → 0.0.23

data/Readme.md

@@ -5,16 +5,17 @@ Alpha, lets see if this works...
 Finished:
 
  - viewing / scrolling / editing / saving / creating
+ - selecting via Shift+left/right/up/down
  - Home/End + Page up/down
  - basic Tab support (tab == 2 space)
  - change-indicator (*)
- - writeable indicator (!)
+ - writable indicator (!)
  - backspace / delete
  - find / go to line
  - delete line
  - configuration via `~/.ruco.rb`
  - keeps indentation
- - paste from clipboard (default: Ctrl+v)
+ - cut, copy and paste (defaults: Ctrl+x/c/v)
  - paste-detection (e.g. cmd+v) -> clean indentation
 
 Install
@@ -58,15 +59,14 @@ Customize
 TIPS
 ====
  - [Ruby1.9] Unicode support -> install libncursesw5-dev before installing ruby (does not work for 1.8)
+ - [ssh vs clipboard] access your desktops clipboard by installing `xauth` on the server and then using `ssh -X`
 
 TODO
 =====
  - session storage (stay at same line/column when reopening)
- - selecting -> delete / overwrite / copy / cut
  - smart staying at end of line/column when changing line
  - warnings / messages
  - syntax highlighting
- - support more key-combos/codes in keyboard.rb
  - raise when binding to a unsupported key
  - search & replace
  - 1.8: unicode support <-> already finished but usable due to Curses (see encoding branch)

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/bin/ruco

@@ -53,31 +53,47 @@ def init_screen
   end
 end
 
-def display(lines, offset, color)
+def display(lines, offset, color_mask)
   @screen ||= [] # current screen is used as cache
-  Curses.attrset color
 
   lines.each_with_index do |content, line|
+    colors = color_mask[line] || []
+
+    # expand line with whitespace
     line += offset
-    clearer = Curses.stdscr.maxx - content.size
+    clearer = Curses.stdscr.maxx + 1 - content.size
     clearer = " " * clearer
     content += clearer
 
-    next if @screen[line] == content
-    @screen[line] = content
+    # cache !?
+    next if @screen[line] == [content, colors]
+    @screen[line] = [content, colors]
+
+    # position at start of line
+    index = 0
+    Curses.setpos(line,0)
+    Curses.attrset(Curses::A_NORMAL)
+
+    # write colored string
+    colors.each do |start, color|
+      Curses.addstr(content[index...start])
+      Curses.attrset color
+      index = start
+    end
+    Curses.addstr(content[index...-1])
 
-    write(line, 0, content)
     write(line, 0, (rand(899)+100).to_s) if @options[:debug_cache]
   end
 end
 
 def show_app(app)
   lines = app.view.naive_split("\n")
+  color_mask = app.color_mask
 
   # TODO move this logic into application
-  display([lines.first], 0, Curses::A_REVERSE)
-  display(lines[1..-2], 1, Curses::A_NORMAL)
-  display([lines.last], Curses.stdscr.maxy - 1, Curses::A_REVERSE)
+  display([lines.first], 0, [color_mask.first])
+  display(lines[1..-2], 1, color_mask[1..-2])
+  display([lines.last], Curses.stdscr.maxy - 1, [color_mask.last])
 
   Curses.setpos(app.cursor.line, app.cursor.column)
 end

data/lib/ruco.rb

@@ -2,6 +2,7 @@ require 'ruco/core_ext/object'
 require 'ruco/core_ext/string'
 require 'ruco/core_ext/array'
 require 'ruco/core_ext/hash'
+require 'ruco/core_ext/range'
 
 require 'ruco/keyboard'
 require 'ruco/cursor'

data/lib/ruco/application.rb

@@ -14,6 +14,11 @@ module Ruco
       status.view + "\n" + editor.view + command.view
     end
 
+    def color_mask
+      reverse = [[[0,Curses::A_REVERSE]]]
+      reverse + editor.color_mask + reverse
+    end
+
     def cursor
       Cursor.new(@focused.cursor.line + @status_lines, @focused.cursor.column)
     end
@@ -31,15 +36,33 @@ module Ruco
       case key
 
       # move
-      when :up then @focused.move(:relative, -1,0)
       when :down then @focused.move(:relative, 1,0)
       when :right then @focused.move(:relative, 0,1)
+      when :up then @focused.move(:relative, -1,0)
       when :left then @focused.move(:relative, 0,-1)
       when :end then @focused.move :to_eol
       when :home then @focused.move :to_bol
       when :page_up then @focused.move :page_up
       when :page_down then @focused.move :page_down
 
+      # select
+      when :"Shift+down" then
+        @focused.selecting do
+          move(:relative, 1, 0)
+        end
+      when :"Shift+right"
+        @focused.selecting do
+          move(:relative, 0, 1)
+        end
+      when :"Shift+up"
+        @focused.selecting do
+          move(:relative, -1, 0)
+        end
+      when :"Shift+left" then
+        @focused.selecting do
+          move(:relative, 0, -1)
+        end
+
       # modify
       when :tab then @focused.insert("\t")
       when :enter then
@@ -92,7 +115,16 @@ module Ruco
       @actions = {}
 
       action :paste do
-        editor.insert(Clipboard.paste('clipboard'))
+        @focused.insert(Clipboard.paste)
+      end
+
+      action :copy do
+        Clipboard.copy(@focused.text_in_selection)
+      end
+
+      action :cut do
+        Clipboard.copy(@focused.text_in_selection)
+        @focused.delete(0)
       end
 
       action :save do
@@ -130,6 +162,8 @@ module Ruco
       bind :"Ctrl+g", :go_to_line
       bind :"Ctrl+f", :find
       bind :"Ctrl+d", :delete_line
+      bind :"Ctrl+x", :cut
+      bind :"Ctrl+c", :copy
       bind :"Ctrl+v", :paste
     end
 

data/lib/ruco/core_ext/array.rb

@@ -7,4 +7,27 @@ class Array
   def map_with_index(&block)
     dup.map_with_index!(&block)
   end
+end
+
+# TODO move this to cursor <-> use cursor for calculations
+class Array
+  def between?(a,b)
+    self.>= a and self.<= b
+  end
+
+  def <(other)
+    (self.<=>other) == -1
+  end
+
+  def <=(other)
+    self.<(other) or self.==other
+  end
+
+  def >(other)
+    (self.<=>other) == 1
+  end
+
+  def >=(other)
+    self.>(other) or self.==other
+  end
 end

data/lib/ruco/core_ext/range.rb

@@ -0,0 +1,6 @@
+class Range
+  # http://stackoverflow.com/questions/699448/ruby-how-do-you-check-whether-a-range-contains-a-subset-of-another-range
+  def overlap?(other)
+    (first <= other.last) and (other.first <= last)
+  end
+end

data/lib/ruco/editor.rb

@@ -1,7 +1,7 @@
 module Ruco
   class Editor
     attr_reader :file
-    delegate :view, :move, :cursor, :resize, :delete_line, :to => :text_area
+    delegate :view, :selection, :text_in_selection, :color_mask, :selecting, :move, :cursor, :resize, :delete_line, :to => :text_area
 
     def initialize(file, options)
       @file = file

data/lib/ruco/keyboard.rb

@@ -42,11 +42,15 @@ class Keyboard
     when Curses::Key::RIGHT then :right
     when Curses::Key::LEFT then :left
     when 554 then :"Ctrl+right"
+    when 393 then :"Shift+left"
     when 555 then :"Ctrl+Shift+right"
     when 539 then :"Ctrl+left"
+    when 402 then :"Shift+right"
     when 540 then :"Ctrl+Shift+left"
     when 560 then :"Ctrl+up"
+    when 337 then :"Shift+up"
     when 519 then :"Ctrl+down"
+    when 336 then :"Shift+down"
     when Curses::KEY_END then :end
     when Curses::KEY_HOME then :home
     when Curses::KEY_NPAGE then :page_down

data/lib/ruco/text_area.rb

@@ -1,6 +1,6 @@
 module Ruco
   class TextArea
-    attr_reader :lines
+    attr_reader :lines, :selection
 
     def initialize(content, options)
       @lines = tabs_to_spaces(content).naive_split("\n")
@@ -21,6 +21,24 @@ module Ruco
       end * "\n" + "\n"
     end
 
+    def color_mask
+      mask = Array.new(@options[:lines])
+      return mask unless @selection
+
+      mask.map_with_index do |_,line|
+        visible = visible_area(line)
+        next unless @selection.overlap?(visible)
+
+        first = [@selection.first, visible.first].max
+        last = [@selection.last, visible.last].min
+
+        [
+          [first[1]-@scrolled_columns,Curses::A_REVERSE],
+          [last[1]-@scrolled_columns, Curses::A_NORMAL]
+        ]
+      end
+    end
+
     def move(where, *args)
       case where
       when :relative then
@@ -43,10 +61,35 @@ module Ruco
       else
         raise "Unknown move type #{where} with #{args.inspect}"
       end
+      @selection = nil unless @selecting
       adjust_view
     end
 
+    def selecting(&block)
+      start = if @selection
+        (position == @selection.first ? @selection.last : @selection.first)
+      else
+        position
+      end
+
+      @selecting = true
+      instance_exec(&block)
+      @selecting = false
+
+      sorted = [start, position].sort
+      @selection = sorted[0]..sorted[1]
+    end
+
+    def text_in_selection
+      return '' unless @selection
+      start = index_for_position(*@selection.first)
+      finish = index_for_position(*@selection.last)
+      content.slice(start, finish-start)
+    end
+
     def insert(text)
+      delete_content_in_selection if @selection
+
       text = tabs_to_spaces(text)
       if text == "\n" and @column >= after_last_word
         current_whitespace = current_line.match(/^\s*/)[0]
@@ -58,6 +101,11 @@ module Ruco
     end
 
     def delete(count)
+      if @selection
+        delete_content_in_selection
+        return
+      end
+
       if count > 0
         if current_line[@column..-1].size >= count
           current_line.slice!(@column, count)
@@ -80,12 +128,16 @@ module Ruco
       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
+    def cursor_index(line=@line, column=@column)
+      index = lines[0...line].join("\n").size + column
+      index += 1 if line > 0 # account for missing newline
       index
     end
 
+    def index_for_position(line, column)
+      cursor_index(line, column)
+    end
+
     def position_for_index(index)
       jump = content.slice(0, index).to_s.naive_split("\n")
       [jump.size - 1, jump.last.size]
@@ -231,5 +283,23 @@ module Ruco
     def tabs_to_spaces(text)
       text.gsub("\t",' ' * Ruco::TAB_SIZE)
     end
+
+    def delete_content_in_selection
+      with_lines_as_string do |content|
+        start = index_for_position(*@selection.first)
+        finish = index_for_position(*@selection.last)
+        content.slice!(start, finish-start)
+        move(:to, *@selection.first)
+      end
+      @selection = nil
+    end
+
+    def visible_area(line)
+      line += @scrolled_lines
+      start_of_line = [line, @scrolled_columns]
+      last_visible_column = @scrolled_columns + @options[:columns]
+      end_of_line = [line, last_visible_column]
+      start_of_line..end_of_line
+    end
   end
 end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-22}
+  s.date = %q{2011-01-23}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "lib/ruco/core_ext/array.rb",
     "lib/ruco/core_ext/hash.rb",
     "lib/ruco/core_ext/object.rb",
+    "lib/ruco/core_ext/range.rb",
     "lib/ruco/core_ext/string.rb",
     "lib/ruco/cursor.rb",
     "lib/ruco/editor.rb",
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
     "ruco.gemspec",
     "spec/ruco/application_spec.rb",
     "spec/ruco/command_bar_spec.rb",
+    "spec/ruco/core_ext/array_spec.rb",
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",
@@ -53,6 +55,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/ruco/application_spec.rb",
     "spec/ruco/command_bar_spec.rb",
+    "spec/ruco/core_ext/array_spec.rb",
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",

data/spec/ruco/core_ext/array_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path('spec/spec_helper')
+
+describe Array do
+  it "is bigger" do
+    [1].should > [0]
+    [1].should_not > [1]
+  end
+
+  it "is smaller" do
+    [1].should < [2]
+    [1].should_not < [1]
+  end
+
+  it "is smaller or equal" do
+    [1].should <= [1]
+    [1].should_not <= [0]
+  end
+
+  it "is bigger or equal" do
+    [1].should >= [1]
+    [1].should_not >= [2]
+  end
+
+  it "is between" do
+    [1].between?([1],[1]).should == true
+    [1].between?([1],[2]).should == true
+    [1].between?([0],[1]).should == true
+    [1].between?([0],[0]).should == false
+    [1].between?([2],[2]).should == false
+  end
+end

data/spec/ruco/editor_spec.rb

@@ -184,6 +184,194 @@ describe Ruco::Editor do
     end
   end
 
+  describe :selecting do
+    before do
+      write('012345678')
+    end
+
+    it "remembers the selection" do
+      editor.selecting do
+        move(:to, 0, 4)
+      end
+      editor.selection.should == ([0,0]..[0,4])
+    end
+
+    it "expands the selection" do
+      editor.selecting do
+        move(:to, 0, 4)
+        move(:to, 0, 6)
+      end
+      editor.selection.should == ([0,0]..[0,6])
+    end
+
+    it "expand an old selection" do
+      editor.selecting do
+        move(:to, 0, 4)
+      end
+      editor.selecting do
+        move(:relative, 0, 2)
+      end
+      editor.selection.should == ([0,0]..[0,6])
+    end
+
+    it "can select backwards" do
+      editor.move(:to, 0, 4)
+      editor.selecting do
+        move(:relative, 0, -2)
+      end
+      editor.selecting do
+        move(:relative, 0, -2)
+      end
+      editor.selection.should == ([0,0]..[0,4])
+    end
+
+    it "can select multiple lines" do
+      write("012\n345\n678")
+      editor.move(:to, 0, 2)
+      editor.selecting do
+        move(:relative, 1, 0)
+      end
+      editor.selecting do
+        move(:relative, 1, 0)
+      end
+      editor.selection.should == ([0,2]..[2,2])
+    end
+
+    it "clears the selection once I move" do
+      editor.selecting do
+        move(:to, 0, 4)
+      end
+      editor.move(:relative, 0, 2)
+      editor.selection.should == nil
+    end
+
+    it "replaces the selection with insert" do
+      editor.selecting do
+        move(:to, 0, 4)
+      end
+      editor.insert('X')
+      editor.selection.should == nil
+      editor.cursor.should == [0,1]
+      editor.move(:to, 0,0)
+      editor.view.should == "X4567\n\n\n"
+    end
+
+    it "replaces the multi-line-selection with insert" do
+      write("123\n456\n789")
+      editor.move(:to, 0,1)
+      editor.selecting do
+        move(:to, 1,2)
+      end
+      editor.insert('X')
+      editor.selection.should == nil
+      editor.cursor.should == [0,2]
+      editor.move(:to, 0,0)
+      editor.view.should == "1X6\n789\n\n"
+    end
+
+    it "deletes selection delete" do
+      write("123\n456\n789")
+      editor.move(:to, 0,1)
+      editor.selecting do
+        move(:to, 1,2)
+      end
+      editor.delete(1)
+      editor.cursor.should == [0,1]
+      editor.move(:to, 0,0)
+      editor.view.should == "16\n789\n\n"
+    end
+  end
+
+  describe :text_in_selection do
+    before do
+      write("123\n456\n789")
+    end
+
+    it "returns '' if nothing is selected" do
+      editor.selecting do
+        move(:to, 1,1)
+      end
+      editor.text_in_selection.should == "123\n4"
+    end
+
+    it "returns selected text" do
+      editor.text_in_selection.should == ''
+    end
+  end
+
+  describe :color_mask do
+    it "is empty by default" do
+      editor.color_mask.should == [nil,nil,nil]
+    end
+
+    it "shows one-line selection" do
+      write('12345678')
+      editor.selecting do
+        move(:to, 0, 4)
+      end
+      editor.color_mask.should == [
+        [[0,262144],[4,0]],
+        nil,
+        nil,
+      ]
+    end
+
+    it "shows multi-line selection" do
+      write("012\n345\n678")
+      editor.move(:to, 0,1)
+      editor.selecting do
+        move(:to, 1, 1)
+      end
+      editor.color_mask.should == [
+        [[1,262144],[5,0]],
+        [[0,262144],[1,0]],
+        nil,
+      ]
+    end
+
+    it "shows the selection from offset" do
+      write('12345678')
+      editor.move(:to, 0, 2)
+      editor.selecting do
+        move(:to, 0, 4)
+      end
+      editor.color_mask.should == [
+        [[2,262144], [4,0]],
+        nil,
+        nil,
+      ]
+    end
+
+    it "shows the selection in nth line" do
+      write("\n12345678")
+      editor.move(:to, 1, 2)
+      editor.selecting do
+        move(:to, 1, 4)
+      end
+      editor.color_mask.should == [
+        nil,
+        [[2,262144], [4,0]],
+        nil,
+      ]
+    end
+
+    it "shows multi-line selection in scrolled space" do
+      write("\n\n\n\n\n0123456789\n0123456789\n0123456789\n\n")
+      editor.move(:to, 5,7)
+      editor.move(:relative, 0, 1)
+      editor.selecting do
+        move(:relative, 2, 1)
+      end
+      editor.view.should == "789\n789\n789\n"
+      editor.cursor.should == [2,2]
+      editor.color_mask.should == [
+        [[1,262144],[5,0]], # start to end of screen
+        [[0,262144],[5,0]], # 0 to end of screen
+        [[0,262144],[2,0]], # 0 to end of selection
+      ]
+    end
+  end
+
   describe :view do
     before do
       write('')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 +01:00
+date: 2011-01-23 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/ruco/core_ext/array.rb
 - lib/ruco/core_ext/hash.rb
 - lib/ruco/core_ext/object.rb
+- lib/ruco/core_ext/range.rb
 - lib/ruco/core_ext/string.rb
 - lib/ruco/cursor.rb
 - lib/ruco/editor.rb
@@ -66,6 +67,7 @@ files:
 - ruco.gemspec
 - spec/ruco/application_spec.rb
 - spec/ruco/command_bar_spec.rb
+- spec/ruco/core_ext/array_spec.rb
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb
@@ -111,6 +113,7 @@ summary: Commandline editor written in ruby
 test_files: 
 - spec/ruco/application_spec.rb
 - spec/ruco/command_bar_spec.rb
+- spec/ruco/core_ext/array_spec.rb
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb