ruco 0.0.25 → 0.0.26

data/VERSION

@@ -1 +1 @@
-0.0.25
+0.0.26

data/lib/ruco/editor.rb

@@ -1,7 +1,9 @@
 module Ruco
   class Editor
     attr_reader :file
-    delegate :view, :selection, :text_in_selection, :color_mask, :selecting, :move, :cursor, :resize, :delete_line, :to => :text_area
+    attr_reader :text_area
+    private :text_area
+    delegate :view, :selection, :text_in_selection, :color_mask, :selecting, :move, :cursor, :resize, :to => :text_area
 
     def initialize(file, options)
       @file = file
@@ -11,15 +13,17 @@ module Ruco
     end
 
     def find(text)
-      index = text_area.content.index(text, text_area.cursor_index+1) || text_area.cursor_index
-      move :to, *text_area.position_for_index(index)
+      return unless start = text_area.content.index(text, text_area.index_for_position+1)
+      finish = start + text.size
+      move(:to_index, finish)
+      selecting{ move(:to_index, start) }
     end
 
     def reset;end
 
     def insert(text)
-      @modified = true
       text_area.insert(text)
+      @modified = true
     end
 
     def delete(*args)
@@ -27,6 +31,11 @@ module Ruco
       @modified = true
     end
 
+    def delete_line(*args)
+      text_area.delete_line(*args)
+      @modified = true
+    end
+
     def modified?
       @modified
     end
@@ -35,9 +44,5 @@ module Ruco
       File.open(@file,'w'){|f| f.write(text_area.content) }
       @modified = false
     end
-
-    private
-
-    attr_reader :text_area
   end
 end

data/lib/ruco/keyboard.rb

@@ -13,28 +13,17 @@ class Keyboard
   end
 
   def self.output
-    @sequence = nil
+    @sequence = []
     @started = Time.now.to_f
 
     loop do
       key = fetch_user_input
       if sequence_finished?
-        if needs_paste_fix?(@sequence)
-          yield bytes_to_string(@sequence)
-        else
-          # weird stuff that happens when connected via ssh
-          if @sequence == [27, 91, 49, 59, 50, 65]
-            yield :"Shift+up"
-          elsif @sequence == [27, 91, 49, 59, 50, 66]
-            yield :"Shift+down"
-          else
-            bytes_to_key_codes(@sequence).each{|c| yield c }
-          end
-        end
-        @sequence = nil
+        sequence_to_keys(@sequence).each{|key| yield key }
+        @sequence = []
       end
       next unless key
-      start_or_append_sequence key
+      append_to_sequence key
     end
   end
 
@@ -88,9 +77,8 @@ class Keyboard
     key
   end
 
-  def self.start_or_append_sequence(key)
+  def self.append_to_sequence(key)
     @started = Time.now.to_f
-    @sequence ||= []
     @sequence << key
   end
 
@@ -101,26 +89,25 @@ class Keyboard
   # split a text so fast-typers do not get bugs like ^B^C in output
   def self.bytes_to_key_codes(bytes)
     result = []
-    multi_byte = nil
+    multi_byte = []
+
+    append_multibyte = lambda{
+      unless multi_byte.empty?
+        result << bytes_to_string(multi_byte)
+        multi_byte = []
+      end
+    }
 
     bytes.each do |byte|
       if multi_byte_part?(byte)
-        multi_byte ||= []
         multi_byte << byte
       else
-        if multi_byte
-          # finish multi-byte char
-          result << bytes_to_string(multi_byte)
-          multi_byte = nil
-        end
+        append_multibyte.call
         result << translate_key_to_code(byte)
       end
     end
 
-    if multi_byte
-      result << bytes_to_string(multi_byte)
-    end
-
+    append_multibyte.call
     result
   end
 
@@ -130,11 +117,37 @@ class Keyboard
   end
 
   def self.sequence_finished?
-    @sequence and (Time.now.to_f - @started) > SEQUENCE_TIMEOUT
+    @sequence.size != 0 and (Time.now.to_f - @started) > SEQUENCE_TIMEOUT
   end
 
   # paste of multiple \n or \n in text would cause weird indentation
   def self.needs_paste_fix?(sequence)
     sequence.size > 1 and sequence.include?(ENTER)
   end
+
+  def self.sequence_to_keys(sequence)
+    if needs_paste_fix?(sequence)
+      [bytes_to_string(sequence)]
+    else
+      # weird stuff that happens when connected via ssh
+      if escape_sequence?(sequence)
+        [escape_sequence_to_key(sequence)]
+      else
+        bytes_to_key_codes(sequence)
+      end
+    end
+  end
+
+  def self.escape_sequence?(sequence)
+    sequence[0..1] == [27, 91] # Esc [
+  end
+
+  def self.escape_sequence_to_key(sequence)
+    case sequence
+    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)
+    end
+  end
 end

data/lib/ruco/text_area.rb

@@ -50,6 +50,7 @@ module Ruco
       when :to_eol then move_to_eol(*args)
       when :to_line then @line = args.first
       when :to_column then @column = args.first
+      when :to_index then move(:to, *position_for_index(*args))
       when :page_down then
         shift = @options[:lines] - 1
         @line += shift
@@ -111,7 +112,7 @@ module Ruco
           current_line.slice!(@column, count)
         else
           with_lines_as_string do |content|
-            content.slice!(cursor_index, count)
+            content.slice!(index_for_position, count)
           end
         end
       else
@@ -128,21 +129,12 @@ module Ruco
       Cursor.new @cursor_line, @cursor_column
     end
 
-    def cursor_index(line=@line, column=@column)
+    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
       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]
-    end
-
     def content
       (lines * "\n").freeze
     end
@@ -154,6 +146,15 @@ module Ruco
 
     protected
 
+    def position
+      Cursor.new(@line, @column)
+    end
+
+    def position_for_index(index)
+      jump = content.slice(0, index).to_s.naive_split("\n")
+      [jump.size - 1, jump.last.size]
+    end
+
     def with_lines_as_string
       string = @lines * "\n"
       yield string
@@ -164,10 +165,6 @@ module Ruco
       current_line.index(/\s*$/)
     end
 
-    def position
-      [@line, @column]
-    end
-
     def move_to_eol
       after_last_whitespace = current_line.size
 
@@ -194,7 +191,7 @@ module Ruco
         current_line.slice!(new_colum, count)
         move :to_column, new_colum
       else
-        start_index = cursor_index - count
+        start_index = index_for_position - count
         if start_index < 0
           count += start_index
           start_index = 0
@@ -253,7 +250,7 @@ module Ruco
     def insert_into_content(text)
       if text.include?("\n")
         with_lines_as_string do |content|
-          content.insert(cursor_index, text)
+          content.insert(index_for_position, text)
         end
       else
         # faster but complicated for newlines

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-25}
+  s.date = %q{2011-01-26}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -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.4.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Commandline editor written in ruby}
   s.test_files = [
     "spec/ruco/application_spec.rb",
@@ -68,6 +68,7 @@ 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/editor_spec.rb

@@ -536,6 +536,11 @@ describe Ruco::Editor do
       editor.save
       editor.modified?.should == false
     end
+
+    it "is changed after delete_line" do
+      editor.delete_line
+      editor.modified?.should == true
+    end
   end
 
   describe :find do
@@ -559,6 +564,11 @@ describe Ruco::Editor do
       editor.find('ab')
       editor.cursor.should == [2,1]
     end
+
+    it "selects the occurrence" do
+      editor.find('ab')
+      editor.selection.should == ([1, 1]..[1, 3])
+    end
   end
 
   describe :delete_line do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 45
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 25
-  version: 0.0.25
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,25 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 +01:00
+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: 
@@ -91,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -84268255
       segments: 
       - 0
       version: "0"
@@ -100,14 +98,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Commandline editor written in ruby