ruco 0.0.7 → 0.0.8

data/Readme.md

@@ -5,10 +5,10 @@ Alpha, lets see if this works...
 Finished:
 
  - viewing / scrolling / editing / saving / creating
- - Home/End
+ - Home/End + Page up/down
  - basic Tab support (tab == 2 space)
- - change-indicator
- - writeable indicator
+ - change-indicator (*)
+ - writeable indicator (!)
  - backspace / delete
  - find / go to line
  - delete line
@@ -23,7 +23,10 @@ Usage
 
 TODO
 =====
- - buffer <-> faster response via ssh session
+ - backspace on mac ?
+ - bind/action must use instance_exec
+ - read .rucorc.rb
+ - write key binding guide
  - smart staying at end of line/column when changing line
  - indentation + paste support
  - warnings / messages

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/ruco

@@ -18,7 +18,8 @@ Usage:
 
 Options:
 BANNER
-    opts.on("--show-cache","Show caching in action(ugly)") { options[:show_cache] = true }
+    opts.on("--debug-cache","Show caching in action") { options[:debug_cache] = true }
+    opts.on("--debug-keys", "Show pressed keys") { options[:debug_keys] = true }
     opts.on("-h", "--help","Show this.") { puts opts; exit }
   end
   parser.parse!
@@ -63,7 +64,7 @@ def display(lines, offset, color)
     @screen[line] = content
 
     write(line, 0, content)
-    write(line, 0, (rand(899)+100).to_s) if @options[:show_cache]
+    write(line, 0, (rand(899)+100).to_s) if @options[:debug_cache]
   end
 end
 
@@ -78,6 +79,12 @@ def show_app(app)
   Curses.setpos(app.cursor.line, app.cursor.column)
 end
 
+def debug_key(key)
+  @key_line ||= -1
+  @key_line = (@key_line + 1) % Curses.stdscr.maxy
+  write(@key_line, 0, "#{key}---")
+end
+
 @options = parse_options
 
 require 'ruco'
@@ -89,6 +96,7 @@ init_screen do
   show_app app
 
   Keyboard.listen do |key|
+    debug_key(key) if @options[:debug_keys]
     result = app.key key
     break if result == :quit
     show_app app

data/lib/ruco/application.rb

@@ -4,10 +4,16 @@ module Ruco
       @file = file
       @options = options
 
+      @bindings = {}
+      @actions = {}
+
       @status_lines = 1
       @command_lines = 1
       @editor_lines = @options[:lines] - @status_lines - @command_lines
       create_components
+
+      setup_actions
+      setup_keys
     end
 
     def view
@@ -19,6 +25,15 @@ module Ruco
     end
 
     def key(key)
+      if bound = @bindings[key]
+        result = if bound.is_a?(Symbol)
+          @actions[bound].call
+        else
+          bound.call
+        end
+        return result
+      end
+
       case key
 
       # move
@@ -28,6 +43,8 @@ module Ruco
       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
 
       # modify
       when :tab then @focused.insert("\t")
@@ -41,23 +58,56 @@ module Ruco
       when :backspace then @focused.delete(-1)
       when :delete then @focused.delete(1)
 
-      # misc
-      when :"Ctrl+d" then
-        @editor.delete_line
-      when :"Ctrl+f" then
-        @focused = @command
-        @command.find
-      when :"Ctrl+g" then
-        @focused = @command
-        @command.move_to_line
       when :escape then # escape from focused
         @focused.reset
         @focused = @editor
-      when :"Ctrl+s" then @editor.save
-      when :"Ctrl+w", :"Ctrl+q" then return(:quit) # quit
       end
     end
 
+    def bind(key, action=nil, &block)
+      raise if action and block
+      @bindings[key] = action || block
+    end
+
+    def action(name, &block)
+      @actions[name] = block
+    end
+
+    private
+
+    def setup_actions
+      action :save do
+        @editor.save
+      end
+
+      action :quit do
+        :quit
+      end
+
+      action :go_to_line do
+        @focused = @command
+        @command.move_to_line
+      end
+
+      action :delete_line do
+        @editor.delete_line
+      end
+
+      action :find do
+        @focused = @command
+        @command.find
+      end
+    end
+
+    def setup_keys
+      bind :"Ctrl+s", :save
+      bind :"Ctrl+w", :quit
+      bind :"Ctrl+q", :quit
+      bind :"Ctrl+g", :go_to_line
+      bind :"Ctrl+f", :find
+      bind :"Ctrl+d", :delete_line
+    end
+
     def create_components
       @editor = Ruco::Editor.new(@file, :lines => @editor_lines, :columns => @options[:columns])
       @status = Ruco::StatusBar.new(@editor, :columns => @options[:columns])

data/lib/ruco/command_bar.rb

@@ -27,6 +27,7 @@ module Ruco
 
     def find
       @forms_cache[:find] ||= Form.new('Find: ', :columns => @options[:columns]) do |value|
+        @form = nil
         Command.new(:find, value)
       end
       @form = @forms_cache[:find]
@@ -34,7 +35,7 @@ module Ruco
 
     def move_to_line
       @form = Form.new('Go to Line: ', :columns => @options[:columns], :type => :integer) do |value|
-        reset
+        @form = nil
         Command.new(:move, :to_line, value.to_i)
       end
     end

data/lib/ruco/keyboard.rb

@@ -3,32 +3,38 @@ class Keyboard
     loop do
       key = Curses.getch
 
-      case key
+      code = case key
 
       # move
-      when Curses::Key::UP then yield(:up)
-      when Curses::Key::DOWN then yield(:down)
-      when Curses::Key::RIGHT then yield(:right)
-      when Curses::Key::LEFT then yield(:left)
-      when Curses::KEY_END then yield(:end)
-      when Curses::KEY_HOME then yield(:home)
+      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 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
 
       # modify
-      when 9 then yield(:tab)
-      when 32..126 then yield(key) # printable
-      when 10 then yield(:enter)
-      when 263 then yield(:backspace)
-      when Curses::KEY_DC then yield(:delete)
+      when 9 then :tab
+      when 32..126 then key # printable
+      when 10 then :enter
+      when 263 then :backspace
+      when Curses::KEY_DC then :delete
 
       # misc
-      when ?\C-d then yield(:"Ctrl+d")
-      when ?\C-f then yield(:"Ctrl+f")
-      when ?\C-g then yield(:"Ctrl+g")
-      when 27 then yield(:escape)
-      when ?\C-s then yield(:"Ctrl+s")
-      when ?\C-w then yield(:"Ctrl+w")
-      when ?\C-q then yield(:"Ctrl+q")
+      when ?\C-d then :"Ctrl+d"
+      when ?\C-f then :"Ctrl+f"
+      when ?\C-g then :"Ctrl+g"
+      when 27 then :escape
+      when ?\C-s then :"Ctrl+s"
+      when ?\C-w then :"Ctrl+w"
+      when ?\C-q then :"Ctrl+q"
+      else
+        key
       end
+
+      yield code
     end
   end
 end

data/lib/ruco/text_area.rb

@@ -32,6 +32,14 @@ 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 :page_down then
+        shift = @options[:lines] - 1
+        @line += shift
+        @scrolled_lines += shift
+      when :page_up then
+        shift = @options[:lines] - 1
+        @line -= shift
+        @scrolled_lines -= shift
       else
         raise "Unknown move type #{where} with #{args.inspect}"
       end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-12}
+  s.date = %q{2011-01-13}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",
     "spec/ruco/status_bar_spec.rb",
+    "spec/ruco/text_area_spec.rb",
     "spec/ruco_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -57,6 +58,7 @@ Gem::Specification.new do |s|
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",
     "spec/ruco/status_bar_spec.rb",
+    "spec/ruco/text_area_spec.rb",
     "spec/ruco_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/ruco/application_spec.rb

@@ -10,7 +10,7 @@ describe Ruco::Application do
   end
 
   let(:app){ Ruco::Application.new(@file, :lines => 5, :columns => 10) }
-  let(:status){ "Ruco 0.0.6 -- spec/temp.txt  \n" }
+  let(:status){ "Ruco #{Ruco::VERSION} -- spec/temp.txt  \n" }
   let(:command){ "^W Exit" }
 
   it "renders status + editor + command" do
@@ -36,4 +36,30 @@ describe Ruco::Application do
     app.view.should == "#{status}123\n456\n789\n#{command}"
     app.cursor.should == [3,0] # 0 offset + 1 for statusbar
   end
+
+  it "can quit" do
+    result = app.key(:"Ctrl+w")
+    result.should == :quit
+  end
+
+  describe :bind do
+    it "can execute bound stuff" do
+      test = 0
+      app.bind :'Ctrl+q' do
+        test = 1
+      end
+      app.key(:'Ctrl+q')
+      test.should == 1
+    end
+
+    it "can execute an action via bind" do
+      test = 0
+      app.action :foo do
+        test = 1
+      end
+      app.bind :'Ctrl+q', :foo
+      app.key(:'Ctrl+q')
+      test.should == 1
+    end
+  end
 end

data/spec/ruco/command_bar_spec.rb

@@ -32,6 +32,7 @@ describe Ruco::CommandBar do
     it "keeps entered stuff" do
       bar.find
       bar.insert('abc')
+      bar.insert("\n")
       bar.find
       bar.view.should == "Find: abc"
       bar.cursor.column.should == 9
@@ -40,7 +41,6 @@ describe Ruco::CommandBar do
     it "can reset the search" do
       bar.find
       bar.insert('abc')
-      bar.insert("\n")
       bar.reset
 
       bar.view.should == default_view
@@ -59,6 +59,7 @@ describe Ruco::CommandBar do
       bar.find
       bar.insert('abcd')
       bar.insert("\n")
+      bar.find
       result = bar.insert("\n")
       result.should == Ruco::Command.new(:find, 'abcd')
     end

data/spec/ruco/text_area_spec.rb

@@ -0,0 +1,57 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::TextArea do
+  describe :move do
+    describe 'pages' do
+      it "can move down a page" do
+        text = Ruco::TextArea.new("1\n2\n3\n4\n5\n6\n7\n8\n9\n", :lines => 3, :columns => 3)
+        text.move(:page_down)
+        text.view.should == "3\n4\n5\n"
+        text.cursor.should == [0,0]
+      end
+
+      it "keeps cursor position when moving down" do
+        text = Ruco::TextArea.new("1\n2abc\n3\n4ab\n5\n6\n7\n8\n9\n", :lines => 3, :columns => 5)
+        text.move(:to, 1,4)
+        text.move(:page_down)
+        text.view.should == "3\n4ab\n5\n"
+        text.cursor.should == [1,3]
+      end
+
+      it "can move up a page" do
+        text = Ruco::TextArea.new("0\n1\n2\n3\n4\n5\n6\n7\n8\n", :lines => 3, :columns => 3)
+        text.move(:to, 4, 0)
+        text.view.should == "2\n3\n4\n"
+        text.cursor.should == [2,0]
+        text.move(:page_up)
+        text.view.should == "0\n1\n2\n"
+        text.cursor.should == [2,0]
+      end
+
+      it "keeps column position when moving up" do
+        text = Ruco::TextArea.new("0\n1\n2\n3ab\n4\n5abc\n6\n7\n8\n", :lines => 3, :columns => 5)
+        text.move(:to, 5, 4)
+        text.view.should == "3ab\n4\n5abc\n"
+        text.cursor.should == [2,4]
+        text.move(:page_up)
+        text.view.should == "1\n2\n3ab\n"
+        text.cursor.should == [2,3]
+      end
+
+      it "moves pages symetric" do
+        text = Ruco::TextArea.new("0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n", :lines => 3, :columns => 3)
+        text.move(:to, 4, 1)
+        text.view.should == "2\n3\n4\n"
+        text.cursor.should == [2,1]
+
+        text.move(:page_down)
+        text.move(:page_down)
+        text.move(:page_up)
+        text.move(:page_up)
+
+        text.cursor.should == [2,1]
+        text.view.should == "2\n3\n4\n"
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +01:00
+date: 2011-01-13 00:00:00 +01:00
 default_executable: ruco
 dependencies: []
 
@@ -56,6 +56,7 @@ files:
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb
 - spec/ruco/status_bar_spec.rb
+- spec/ruco/text_area_spec.rb
 - spec/ruco_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -100,5 +101,6 @@ test_files:
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb
 - spec/ruco/status_bar_spec.rb
+- spec/ruco/text_area_spec.rb
 - spec/ruco_spec.rb
 - spec/spec_helper.rb