ruco 0.0.6 → 0.0.7

data/Readme.md

@@ -23,6 +23,7 @@ Usage
 
 TODO
 =====
+ - buffer <-> faster response via ssh session
  - smart staying at end of line/column when changing line
  - indentation + paste support
  - warnings / messages

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/bin/ruco

@@ -4,7 +4,8 @@ require 'optparse'
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 def parse_options
-  options = OptionParser.new do |opts|
+  options = {}
+  parser = OptionParser.new do |opts|
     opts.banner = <<BANNER
 [Ru]by [Co]mmandline editor
 
@@ -17,14 +18,17 @@ Usage:
 
 Options:
 BANNER
+    opts.on("--show-cache","Show caching in action(ugly)") { options[:show_cache] = true }
     opts.on("-h", "--help","Show this.") { puts opts; exit }
   end
-  options.parse!
+  parser.parse!
 
   if ARGV.empty?
-    puts options
+    puts parser
     exit
   end
+
+  options
 end
 
 def write(line,row,text)
@@ -45,77 +49,48 @@ def init_screen
   end
 end
 
-def display(widget, offset, color)
+def display(lines, offset, color)
+  @screen ||= [] # current screen is used as cache
   Curses.attrset color
-  lines = widget.view.naive_split("\n")
-  Curses.stdscr.maxy.times do |i|
-    line = lines[i] || ''
-    clearer = Curses.stdscr.maxx - line.size
+
+  lines.each_with_index do |content, line|
+    line += offset
+    clearer = Curses.stdscr.maxx - content.size
     clearer = " " * clearer
-    write(i + offset, 0, line + clearer)
+    content += clearer
+
+    next if @screen[line] == content
+    @screen[line] = content
+
+    write(line, 0, content)
+    write(line, 0, (rand(899)+100).to_s) if @options[:show_cache]
   end
 end
 
-parse_options
+def show_app(app)
+  lines = app.view.naive_split("\n")
 
-require 'ruco'
-status_lines = 1
-command_lines = 1
-editor_lines = Curses.stdscr.maxy - status_lines - command_lines
+  # 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)
 
-editor = Ruco::Editor.new(ARGV[0], :lines => editor_lines, :columns => Curses.stdscr.maxx)
-status = Ruco::StatusBar.new(editor, :columns => Curses.stdscr.maxx)
-command = Ruco::CommandBar.new(:columns => Curses.stdscr.maxx)
-command.cursor_line = editor_lines
+  Curses.setpos(app.cursor.line, app.cursor.column)
+end
+
+@options = parse_options
 
-focused = editor
+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
-  loop do
-    display status, 0, Curses::A_REVERSE
-    display editor, status_lines, Curses::A_NORMAL
-    display command, status_lines + editor_lines, Curses::A_REVERSE
-
-    Curses.setpos(focused.cursor.line + status_lines, focused.cursor.column)
-
-    key = Curses.getch
-
-    case key
-
-    # move
-    when Curses::Key::UP then focused.move(:relative, -1,0)
-    when Curses::Key::DOWN then focused.move(:relative, 1,0)
-    when Curses::Key::RIGHT then focused.move(:relative, 0,1)
-    when Curses::Key::LEFT then focused.move(:relative, 0,-1)
-    when Curses::KEY_END then focused.move :to_eol
-    when Curses::KEY_HOME then focused.move :to_bol
-
-    # modify
-    when 9 then focused.insert(key.chr) # tab
-    when 32..126 then focused.insert(key.chr) # printable
-    when 10 then # enter
-      result = focused.insert("\n")
-      if result.is_a?(Ruco::Command)
-        result.send_to(editor)
-        focused = editor
-      end
-    when 263 then focused.delete(-1) # backspace
-    when Curses::KEY_DC then focused.delete(1) # delete
-
-    # misc
-    when ?\C-d then
-      editor.delete_line
-    when ?\C-f then
-      focused = command
-      command.find
-    when ?\C-g then
-      focused = command
-      command.move_to_line
-    when 27 then
-      focused.reset
-      focused = editor # escape from focused
-    when ?\C-s then editor.save
-    when ?\C-w, ?\C-q then break # quit
-    end
+  show_app app
+
+  Keyboard.listen do |key|
+    result = app.key key
+    break if result == :quit
+    show_app app
   end
 end

data/lib/ruco/application.rb

@@ -0,0 +1,69 @@
+module Ruco
+  class Application
+    def initialize(file, options)
+      @file = file
+      @options = options
+
+      @status_lines = 1
+      @command_lines = 1
+      @editor_lines = @options[:lines] - @status_lines - @command_lines
+      create_components
+    end
+
+    def view
+      @status.view + "\n" + @editor.view + @command.view
+    end
+
+    def cursor
+      Cursor.new(@focused.cursor.line + @status_lines, @focused.cursor.column)
+    end
+
+    def key(key)
+      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 :left then @focused.move(:relative, 0,-1)
+      when :end then @focused.move :to_eol
+      when :home then @focused.move :to_bol
+
+      # modify
+      when :tab then @focused.insert("\t")
+      when 32..126 then @focused.insert(key.chr) # printable
+      when :enter then
+        result = @focused.insert("\n")
+        if result.is_a?(Ruco::Command)
+          result.send_to(@editor)
+          @focused = @editor
+        end
+      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 create_components
+      @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
+  end
+end

data/lib/ruco/keyboard.rb

@@ -0,0 +1,34 @@
+class Keyboard
+  def self.listen
+    loop do
+      key = Curses.getch
+
+      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)
+
+      # 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)
+
+      # 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")
+      end
+    end
+  end
+end

data/lib/ruco.rb

@@ -8,6 +8,7 @@ require 'ruco/command'
 require 'ruco/editor'
 require 'ruco/status_bar'
 require 'ruco/command_bar'
+require 'ruco/application'
 
 require 'ruco/form'
 require 'ruco/text_area'

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-11}
+  s.date = %q{2011-01-12}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/ruco",
     "lib/ruco.rb",
+    "lib/ruco/application.rb",
     "lib/ruco/command.rb",
     "lib/ruco/command_bar.rb",
     "lib/ruco/core_ext/array.rb",
@@ -29,10 +30,12 @@ Gem::Specification.new do |s|
     "lib/ruco/cursor.rb",
     "lib/ruco/editor.rb",
     "lib/ruco/form.rb",
+    "lib/ruco/keyboard.rb",
     "lib/ruco/status_bar.rb",
     "lib/ruco/text_area.rb",
     "lib/ruco/text_field.rb",
     "ruco.gemspec",
+    "spec/ruco/application_spec.rb",
     "spec/ruco/command_bar_spec.rb",
     "spec/ruco/command_spec.rb",
     "spec/ruco/core_ext/string_spec.rb",
@@ -47,6 +50,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Commandline editor written in ruby}
   s.test_files = [
+    "spec/ruco/application_spec.rb",
     "spec/ruco/command_bar_spec.rb",
     "spec/ruco/command_spec.rb",
     "spec/ruco/core_ext/string_spec.rb",

data/spec/ruco/application_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::Application do
+  before do
+    @file = 'spec/temp.txt'
+  end
+
+  def write(content)
+    File.open(@file,'w'){|f| f.write(content) }
+  end
+
+  let(:app){ Ruco::Application.new(@file, :lines => 5, :columns => 10) }
+  let(:status){ "Ruco 0.0.6 -- spec/temp.txt  \n" }
+  let(:command){ "^W Exit" }
+
+  it "renders status + editor + command" do
+    write("xxx\nyyy\nzzz")
+    app.view.should == "#{status}xxx\nyyy\nzzz\n#{command}"
+  end
+
+  it "can enter stuff" do
+    write("")
+    app.key(50)
+    app.key(50)
+    app.key(:enter)
+    app.key(50)
+    app.key(:enter)
+    app.view.should == "#{status.sub('.txt ','.txt*')}22\n2\n\n#{command}"
+  end
+
+  it "can execute a command" do
+    write("123\n456\n789\n")
+    app.key(:"Ctrl+g") # go to line
+    app.key(50) # 2
+    app.key(:enter)
+    app.view.should == "#{status}123\n456\n789\n#{command}"
+    app.cursor.should == [3,0] # 0 offset + 1 for statusbar
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +01:00
+date: 2011-01-12 00:00:00 +01:00
 default_executable: ruco
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - VERSION
 - bin/ruco
 - lib/ruco.rb
+- lib/ruco/application.rb
 - lib/ruco/command.rb
 - lib/ruco/command_bar.rb
 - lib/ruco/core_ext/array.rb
@@ -43,10 +44,12 @@ files:
 - lib/ruco/cursor.rb
 - lib/ruco/editor.rb
 - lib/ruco/form.rb
+- lib/ruco/keyboard.rb
 - lib/ruco/status_bar.rb
 - lib/ruco/text_area.rb
 - lib/ruco/text_field.rb
 - ruco.gemspec
+- spec/ruco/application_spec.rb
 - spec/ruco/command_bar_spec.rb
 - spec/ruco/command_spec.rb
 - spec/ruco/core_ext/string_spec.rb
@@ -90,6 +93,7 @@ signing_key:
 specification_version: 3
 summary: Commandline editor written in ruby
 test_files: 
+- spec/ruco/application_spec.rb
 - spec/ruco/command_bar_spec.rb
 - spec/ruco/command_spec.rb
 - spec/ruco/core_ext/string_spec.rb