ruco 0.0.28 → 0.0.29

data/Readme.md

@@ -1,22 +1,15 @@
-Commandline editor written in ruby
+Simple, extendable, test-driven commandline editor written in ruby.
 
-Alpha, lets see if this works...
+Features:
 
-Finished:
-
- - viewing / scrolling / editing / saving / creating
+ - **Intuitive interface**
  - selecting via Shift+left/right/up/down and Ctrl+a(all)
- - Home/End + Page up/down
  - Tab -> indent / Shift+Tab -> unindent (tab == 2 space)
- - change-indicator (*)
- - writable indicator (!)
- - backspace / delete
- - find / go to line
- - delete line
+ - keeps indentation (+ paste-detection e.g. via Cmd+v)
+ - change (*) + writable (!) indicators
+ - find / go to line / delete line
  - configuration via `~/.ruco.rb`
- - keeps indentation
- - cut, copy and paste (defaults: Ctrl+x/c/v)
- - paste-detection (e.g. cmd+v) -> clean indentation
+ - cut, copy and paste -> Ctrl+x/c/v
 
 Install
 =======
@@ -69,8 +62,10 @@ TODO
  - warnings / messages
  - syntax highlighting
  - raise when binding to a unsupported key
+ - search options regex + case-sensitive
  - search & replace
  - 1.8: unicode support <-> already finished but unusable due to Curses (see encoding branch)
+ - support Alt+Fx keys
 
 Author
 ======

data/VERSION

@@ -1 +1 @@
-0.0.28
+0.0.29

data/lib/ruco/application.rb

@@ -20,7 +20,7 @@ module Ruco
     end
 
     def cursor
-      Cursor.new(@focused.cursor.line + @status_lines, @focused.cursor.column)
+      Position.new(@focused.cursor.line + @status_lines, @focused.cursor.column)
     end
 
     def key(key)

data/lib/ruco/command_bar.rb

@@ -41,9 +41,9 @@ module Ruco
 
     def cursor
       if @form
-        Cursor.new cursor_line, @form.cursor.column
+        Position.new cursor_line, @form.cursor.column
       else
-        Cursor.new cursor_line, 0
+        Position.new cursor_line, 0
       end
     end
 

data/lib/ruco/form.rb

@@ -19,7 +19,7 @@ module Ruco
     end
 
     def cursor
-      Cursor.new 0, @label.size + @text_field.cursor.column
+      Position.new 0, @label.size + @text_field.cursor.column
     end
 
     def reset

data/lib/ruco/keyboard.rb

@@ -140,7 +140,7 @@ class Keyboard
   end
 
   def self.escape_sequence?(sequence)
-    sequence[0..1] == [27, 91] # Esc [
+    sequence[0] == 27 # Esc
   end
 
   def self.escape_sequence_to_key(sequence)
@@ -148,7 +148,11 @@ class Keyboard
     when [27, 91, 49, 59, 50, 65] then :"Shift+up"
     when [27, 91, 49, 59, 50, 66] then :"Shift+down"
     else
-      bytes_to_string(sequence)
+      if sequence.size == 2
+        :"Alt+#{sequence[1].chr}"
+      else
+        bytes_to_string(sequence)
+      end
     end
   end
 end

data/lib/ruco/{cursor.rb → position.rb}

@@ -1,9 +1,17 @@
 module Ruco
-  class Cursor < Array
+  class Position < Array
     def initialize(line, column)
       super([line, column])
     end
 
+    def line=(x)
+      self[0] = x
+    end
+
+    def column=(x)
+      self[1] = x
+    end
+
     alias_method :line, :first
     alias_method :column, :last
   end

data/lib/ruco/text_area.rb

@@ -83,8 +83,8 @@ module Ruco
 
     def text_in_selection
       return '' unless @selection
-      start = index_for_position(*@selection.first)
-      finish = index_for_position(*@selection.last)
+      start = index_for_position(@selection.first)
+      finish = index_for_position(@selection.last)
       content.slice(start, finish-start)
     end
 
@@ -149,12 +149,12 @@ module Ruco
     end
 
     def cursor
-      Cursor.new @cursor_line, @cursor_column
+      Position.new @cursor_line, @cursor_column
     end
 
-    def index_for_position(line=@line, column=@column)
-      index = lines[0...line].join("\n").size + column
-      index += 1 if line > 0 # account for missing newline
+    def index_for_position(position=self.position)
+      index = lines[0...position.line].join("\n").size + position.column
+      index += 1 if position.line > 0 # account for missing newline
       index
     end
 
@@ -170,7 +170,7 @@ module Ruco
     protected
 
     def position
-      Cursor.new(@line, @column)
+      Position.new(@line, @column)
     end
 
     def position_for_index(index)
@@ -302,8 +302,8 @@ module Ruco
 
     def delete_content_in_selection
       with_lines_as_string do |content|
-        start = index_for_position(*@selection.first)
-        finish = index_for_position(*@selection.last)
+        start = index_for_position(@selection.first)
+        finish = index_for_position(@selection.last)
         content.slice!(start, finish-start)
         move(:to, *@selection.first)
       end
@@ -322,8 +322,8 @@ module Ruco
       last ||= first
       if selection
         adjust_cursor = selection.first == position ? first : last
-        selection.first[1] = [selection.first[1] + first, 0].max
-        selection.last[1] = [selection.last[1] + last, 0].max
+        selection.first.column = [selection.first.column + first, 0].max
+        selection.last.column = [selection.last.column + last, 0].max
         @column += adjust_cursor
       else
         @column += first
@@ -331,7 +331,7 @@ module Ruco
     end
 
     def selected_lines
-      selection.first[0].upto(selection.last[0])
+      selection.first.line.upto(selection.last.line)
     end
   end
 end

data/lib/ruco.rb

@@ -7,7 +7,7 @@ require 'ruco/core_ext/hash'
 require 'ruco/core_ext/range'
 
 require 'ruco/keyboard'
-require 'ruco/cursor'
+require 'ruco/position'
 
 require 'ruco/editor'
 require 'ruco/status_bar'

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.28"
+  s.version = "0.0.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
     "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",
     "lib/ruco/form.rb",
     "lib/ruco/keyboard.rb",
+    "lib/ruco/position.rb",
     "lib/ruco/status_bar.rb",
     "lib/ruco/text_area.rb",
     "lib/ruco/text_field.rb",
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/grosser/ruco}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Commandline editor written in ruby}
   s.test_files = [
     "spec/ruco/application_spec.rb",
@@ -68,7 +68,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/ruco/keyboard_spec.rb

@@ -100,4 +100,9 @@ describe Keyboard do
     type ['a']
     output.should == ["a"]
   end
+
+  it "can handle Alt+x codes" do
+    type [27,103]
+    output.should == [:"Alt+g"]
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 37
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 28
-  version: 0.0.28
+  - 29
+  version: 0.0.29
 platform: ruby
 authors: 
 - Michael Grosser
@@ -18,20 +19,21 @@ date: 2011-01-26 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: clipboard
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 9
         - 4
         version: 0.9.4
-  type: :runtime
   prerelease: false
   version_requirements: *id001
+  type: :runtime
+  name: clipboard
 description: 
 email: michael@grosser.it
 executables: 
@@ -55,10 +57,10 @@ files:
 - 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
 - lib/ruco/form.rb
 - lib/ruco/keyboard.rb
+- lib/ruco/position.rb
 - lib/ruco/status_bar.rb
 - lib/ruco/text_area.rb
 - lib/ruco/text_field.rb
@@ -89,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 712420077
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -98,13 +100,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Commandline editor written in ruby