ruco 0.0.20 → 0.0.21

data/Readme.md

@@ -61,7 +61,7 @@ TIPS
 TODO
 =====
  - session storage (stay at same line/column when reopening)
- - past detection ? (ctrl+shift+insert / Cmd+v) -> no indentation
+ - paste detection ? (ctrl+shift+insert / Cmd+v) -> no indentation
  - selecting -> delete / overwrite / copy / cut
  - smart staying at end of line/column when changing line
  - warnings / messages

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/bin/ruco

@@ -95,16 +95,24 @@ end
 @options = parse_options
 
 require 'ruco'
-require 'ruco/keyboard' # needs curses <-> not loaded for specs
 
 app = Ruco::Application.new(ARGV[0], :lines => Curses.stdscr.maxy, :columns => Curses.stdscr.maxx)
 
 init_screen do
   show_app app
 
-  Keyboard.listen do |key|
+  Keyboard.input do
+    Curses.getch
+  end
+
+  Keyboard.output do |key|
     debug_key(key) if @options[:debug_keys]
-    result = app.key key
+    if key == :resize
+      app.resize(Curses.stdscr.maxy, Curses.stdscr.maxx)
+      @screen.clear # clear cache
+    else
+      result = app.key key
+    end
     break if result == :quit
     show_app app
   end

data/lib/ruco.rb

@@ -3,6 +3,7 @@ require 'ruco/core_ext/string'
 require 'ruco/core_ext/array'
 require 'ruco/core_ext/hash'
 
+require 'ruco/keyboard'
 require 'ruco/cursor'
 
 require 'ruco/editor'

data/lib/ruco/application.rb

@@ -77,6 +77,13 @@ module Ruco
       instance_exec(&block)
     end
 
+    def resize(lines, columns)
+      @options[:lines] = lines
+      @options[:columns] = columns
+      create_components
+      @editor.resize(editor_lines, columns)
+    end
+
     private
 
     attr_reader :editor, :status, :command
@@ -134,14 +141,16 @@ module Ruco
 
     def create_components
       @status_lines = 1
-      command_lines = 1
-      editor_lines = @options[:lines] - @status_lines - command_lines
-      
-      @editor = Ruco::Editor.new(@file, :lines => editor_lines, :columns => @options[:columns])
+      @editor ||= Ruco::Editor.new(@file, :lines => editor_lines, :columns => @options[:columns])
       @status = Ruco::StatusBar.new(@editor, :columns => @options[:columns])
       @command = Ruco::CommandBar.new(:columns => @options[:columns])
       command.cursor_line = editor_lines
       @focused = @editor
     end
+
+    def editor_lines
+      command_lines = 1
+      editor_lines = @options[:lines] - @status_lines - command_lines
+    end
   end
 end

data/lib/ruco/editor.rb

@@ -1,13 +1,12 @@
 module Ruco
   class Editor
     attr_reader :file
-    delegate :view, :move, :cursor, :delete_line, :to => :text_area
+    delegate :view, :move, :cursor, :resize, :delete_line, :to => :text_area
 
     def initialize(file, options)
       @file = file
-      @options = options
       content = (File.exist?(@file) ? File.read(@file) : '')
-      @text_area = TextArea.new(content, @options)
+      @text_area = TextArea.new(content, options)
       @modified = false
     end
 

data/lib/ruco/keyboard.rb

@@ -1,71 +1,127 @@
+require 'curses'
+
 class Keyboard
+  ENTER = 13
+  IS_18 = RUBY_VERSION =~ /^1\.8/
   SEQUENCE_TIMEOUT = 0.01
   NOTHING = 4294967295 # getch returns this as 'nothing' on 1.8 but nil on 1.9.2
   A_TO_Z = ('a'..'z').to_a
 
-  def self.listen
-    loop do
-      key = Curses.getch || NOTHING
+  def self.input(&block)
+    @input = block
+  end
+
+  def self.output
+    @sequence = nil
+    @started = Time.now.to_f
 
-      if @sequence
-        if sequence_finished?
-          yield @sequence.pack('c*').force_encoding('utf-8')
-          @sequence = nil
+    loop do
+      key = fetch_user_input
+      if sequence_finished?
+        if needs_paste_fix?(@sequence)
+          yield bytes_to_string(@sequence)
         else
-          @sequence << key unless key == NOTHING
+          bytes_to_key_codes(@sequence).each{|c| yield c }
         end
-        next
+        @sequence = nil
       end
-
       next if key == NOTHING
+      start_or_append_sequence key
+    end
+  end
+
+  private
+
+  def self.translate_key_to_code(key)
+    case key
+
+    # move
+    when Curses::Key::UP then :up
+    when Curses::Key::DOWN then :down
+    when Curses::Key::RIGHT then :right
+    when Curses::Key::LEFT then :left
+    when 554 then :"Ctrl+right"
+    when 555 then :"Ctrl+Shift+right"
+    when 539 then :"Ctrl+left"
+    when 540 then :"Ctrl+Shift+left"
+    when 560 then :"Ctrl+up"
+    when 519 then :"Ctrl+down"
+    when Curses::KEY_END then :end
+    when Curses::KEY_HOME then :home
+    when Curses::KEY_NPAGE then :page_down
+    when Curses::KEY_PPAGE then :page_up
+    when Curses::KEY_IC then :insert
+    when Curses::KEY_F0..Curses::KEY_F63 then :"F#{key - Curses::KEY_F0}"
+
+    # modify
+    when 9 then :tab
+    when ENTER then :enter # shadows Ctrl+m
+    when 263, 127 then :backspace # ubuntu / mac
+    when Curses::KEY_DC then :delete
+
+    # misc
+    when 0 then :"Ctrl+space"
+    when 1..26 then :"Ctrl+#{A_TO_Z[key-1]}"
+    when 27 then :escape
+    when Curses::KEY_RESIZE then :resize
+    else
+      key.chr
+    end
+  end
+
+  def self.fetch_user_input
+    key = @input.call || NOTHING
+    key = key.ord if key.is_a?(String) # ruby 1.9 fix
+    key
+  end
+
+  def self.start_or_append_sequence(key)
+    @started = Time.now.to_f
+    @sequence ||= []
+    @sequence << key
+  end
+
+  def self.bytes_to_string(bytes)
+    bytes.pack('c*').gsub("\r","\n").force_encoding('utf-8')
+  end
+
+  # 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
 
-      key = key.ord if key.is_a?(String) # ruby 1.9 fix
-
-      code = case key
-
-      # move
-      when Curses::Key::UP then :up
-      when Curses::Key::DOWN then :down
-      when Curses::Key::RIGHT then :right
-      when Curses::Key::LEFT then :left
-      when 554 then :"Ctrl+right"
-      when 555 then :"Ctrl+Shift+right"
-      when 539 then :"Ctrl+left"
-      when 540 then :"Ctrl+Shift+left"
-      when 560 then :"Ctrl+up"
-      when 519 then :"Ctrl+down"
-      when Curses::KEY_END then :end
-      when Curses::KEY_HOME then :home
-      when Curses::KEY_NPAGE then :page_down
-      when Curses::KEY_PPAGE then :page_up
-      when Curses::KEY_IC then :insert
-      when Curses::KEY_F0..Curses::KEY_F63 then :"F#{key - Curses::KEY_F0}"
-
-      # modify
-      when 9 then :tab
-      when 13 then :enter # shadows Ctrl+m
-      when 263, 127 then :backspace # ubuntu / mac
-      when Curses::KEY_DC then :delete
-
-      # misc
-      when 0 then :"Ctrl+space"
-      when 1..26 then :"Ctrl+#{A_TO_Z[key-1]}"
-      when 27 then :escape
-      when 195..197 # start of unicode sequence
-        @sequence = [key]
-        @sequence_started = Time.now.to_f
-        next
+    bytes.each do |byte|
+      if multi_byte_part?(byte)
+        multi_byte ||= []
+        multi_byte << byte
       else
-        key > 255 ? key : key.chr # output printable chars
+        if multi_byte
+          # finish multi-byte char
+          result << bytes_to_string(multi_byte)
+          multi_byte = nil
+        end
+        result << translate_key_to_code(byte)
       end
+    end
 
-      yield code
+    if multi_byte
+      result << bytes_to_string(multi_byte)
     end
+
+    result
   end
 
-  private
+  # not ascii and not control-char
+  def self.multi_byte_part?(byte)
+    127 < byte and byte < 256
+  end
 
   def self.sequence_finished?
-    (Time.now.to_f - @sequence_started) > SEQUENCE_TIMEOUT
+    @sequence 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
 end

data/lib/ruco/text_area.rb

@@ -95,6 +95,11 @@ module Ruco
       (lines * "\n").freeze
     end
 
+    def resize(lines, columns)
+      @options[:lines] = lines
+      @options[:columns] = columns
+    end
+
     protected
 
     def with_lines_as_string

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-19}
+  s.date = %q{2011-01-21}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",
+    "spec/ruco/keyboard_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/text_area_spec.rb",
     "spec/ruco_spec.rb",
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",
+    "spec/ruco/keyboard_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/text_area_spec.rb",
     "spec/ruco_spec.rb",

data/spec/ruco/application_spec.rb

@@ -47,6 +47,12 @@ describe Ruco::Application do
     app.cursor.should == [2,0] # 0 offset + 1 for statusbar
   end
 
+  it "can resize" do
+    write("01234567\n1\n2\n3\n4\n5678910111213\n6\n7\n8")
+    app.resize(8, 7)
+    app.view.should == "#{status}0123456\n1\n2\n3\n4\n5678910\n#{command}"
+  end
+
   describe 'closing' do
     it "can quit" do
       result = app.key(:"Ctrl+w")

data/spec/ruco/keyboard_spec.rb

@@ -0,0 +1,78 @@
+# encoding: UTF-8
+require File.expand_path('spec/spec_helper')
+
+describe Keyboard do
+  def output
+    keys = []
+    Timeout.timeout(0.3) do
+      Keyboard.output do |key|
+        keys << key
+      end
+    end
+    keys
+  rescue Timeout::Error
+    keys
+  end
+
+  def type(chars)
+    Keyboard.input do
+      char = chars.shift
+      if char == :sleep_long
+        sleep 0.1
+        nil
+      else
+        char
+      end
+    end
+  end
+
+  it "can listen to simple keys" do
+    type [32]
+    output.should == [' ']
+  end
+
+  it "can listen to multiple keys" do
+    type [32, :sleep_long, 97]
+    output.should == [' ','a']
+  end
+
+  it "can listen ctrl+x" do
+    type [26]
+    output.should == [:'Ctrl+z']
+  end
+
+  it "can listen to enter" do
+    type [13]
+    output.should == [:enter]
+  end
+
+  it "does not listen to nil / NOTHING" do
+    type [nil, Keyboard::NOTHING, 13]
+    output.should == [:enter]
+  end
+
+  it "can fetch uft8-chars" do
+    type [195, 164]
+    output.should == ['ä']
+  end
+
+  it "cannot fetch long sequences" do
+    type [195, :sleep_long, 164]
+    output.map{|s|s.bytes.to_a}.should == [[195], [164]]
+  end
+
+  it "fetches pastes between normal key strokes" do
+    type [32, :sleep_long, 32, 13, 32, :sleep_long, 32]
+    output.should == [' '," \n ",' ']
+  end
+
+  it "returns pastes that do not need indentation fix as normal chars" do
+    type [32, :sleep_long, 32, 32, 32, :sleep_long, 32]
+    output.should == [' ',' ',' ',' ',' ']
+  end
+
+  it "returns control chars separately" do
+    type [260, 127, 127, 261, 260, 195, 164, 261, 260, 195, 164]
+    output.should == [:left, :backspace, :backspace, :right, :left, "ä", :right, :left, "ä"]
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift 'lib'
 require 'ruco'
+require 'timeout'
 
 require 'tempfile'
 class Tempfile

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +01:00
+date: 2011-01-21 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb
+- spec/ruco/keyboard_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/text_area_spec.rb
 - spec/ruco_spec.rb
@@ -85,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 588820097
+      hash: -755587743
       segments: 
       - 0
       version: "0"
@@ -110,6 +111,7 @@ test_files:
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb
+- spec/ruco/keyboard_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/text_area_spec.rb
 - spec/ruco_spec.rb