ruco 0.1.12 → 0.1.13

data/Readme.md

@@ -86,7 +86,6 @@ TODO
  - do not fall back to 0:0 after undoing the first change
  - check writable status every x seconds (e.g. in background) -> faster while typing
  - search help e.g. 'Nothing found' '#4 of 6 hits' 'no more hits, start from beginning ?'
- - highlight current work when reopening search (so typing replaces it)
  - align soft-tabs
  - highlight tabs (e.g. strange character or reverse/underline/color)
  - big warning when editing a not-writable file
@@ -96,7 +95,6 @@ TODO
  - raise when binding to a unsupported key
  - search history via up/down arrow
  - search options regex + case-sensitive
- - add auto-confirm to 'replace?' dialog -> type s == skip, no enter needed
  - 1.8: unicode support <-> already finished but unusable due to Curses (see encoding branch)
  - add double quotes/braces when typing one + skip over quote/brace when its already typed at current position
 

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/bin/ruco

@@ -40,75 +40,6 @@ BANNER
   options
 end
 
-def write(line,row,text)
-  Curses.setpos(line,row)
-  Curses.addstr(text);
-end
-
-def init_screen
-  Curses.noecho # do not show typed chars
-  Curses.nonl # turn off newline translation
-  Curses.stdscr.keypad(true) # enable arrow keys
-  Curses.raw # give us all other keys
-  Curses.stdscr.nodelay = 1 # do not block -> we can use timeouts
-  Curses.init_screen
-
-  begin
-    yield
-  ensure
-    Curses.clear # needed to clear the menu/status bar on windows
-    Curses.close_screen
-  end
-end
-
-def display(lines, style_mask)
-  columns = Curses.stdscr.maxx
-  @screen ||= [] # current screen is used as cache
-  style_mask = style_mask.flatten
-
-  lines.each_with_index do |content, line|
-    styles = style_mask[line]
-
-    # expand line with whitespace to overwrite previous content
-    missing = columns - content.size
-    raise content if missing < 0
-    content += " " * missing
-
-    # display tabs as single-space -> nothing breaks
-    content.gsub!("\t",' ')
-
-    # cache !?
-    next if @screen[line] == [content, styles]
-    @screen[line] = [content, styles]
-
-    # position at start of line and draw
-    Curses.setpos(line,0)
-    Ruco::StyleMap.styled(content, styles).each do |style, part|
-      Curses.attrset Ruco::StyleMap.curses_style(style)
-      Curses.addstr part
-    end
-
-    if @options[:debug_cache]
-      write(line, 0, (rand(899)+100).to_s)
-    end
-  end
-end
-
-def show_app(app)
-  lines = app.view.naive_split("\n")
-  style_map = app.style_map
-
-  # TODO move this logic into application
-  display(lines, style_map)
-  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.inspect}---")
-end
-
 def log(stuff)
   File.open('ruco.log','ab'){|f| f.puts stuff }
 end
@@ -117,28 +48,30 @@ end
 
 require 'ruco'
 
-app = Ruco::Application.new(ARGV[0],
-  :convert_tabs => @options[:convert_tabs],
-  :undo_stack_size => @options[:undo_stack_size],
-  :lines => Curses.stdscr.maxy, :columns => Curses.stdscr.maxx
-)
+# draw app and redraw after each keystroke (or paste)
+Ruco::Screen.open(@options) do |screen|
+  app = Ruco::Application.new(ARGV[0],
+    :convert_tabs => @options[:convert_tabs],
+    :undo_stack_size => @options[:undo_stack_size],
+    :lines => screen.lines, :columns => screen.columns
+  )
 
-init_screen do
-  show_app app
+  screen.draw *app.display_info
 
   Keyboard.input do
     Curses.getch
   end
 
   Keyboard.output do |key|
-    debug_key(key) if @options[:debug_keys]
+    screen.debug_key(key) if @options[:debug_keys]
     if key == :resize
-      app.resize(Curses.stdscr.maxy, Curses.stdscr.maxx)
-      @screen.clear # clear cache
+      app.resize(lines, columns)
+      screen.clear_cache
     else
       result = app.key key
+      break if result == :quit
     end
-    break if result == :quit
-    show_app app
+    
+    screen.draw *app.display_info
   end
 end

data/lib/ruco.rb

@@ -13,6 +13,7 @@ require 'ruco/history'
 require 'ruco/option_accessor'
 require 'ruco/file_store'
 require 'ruco/window'
+require 'ruco/screen'
 require 'ruco/style_map'
 
 require 'ruco/editor'

data/lib/ruco/application.rb

@@ -14,31 +14,30 @@ module Ruco
       @editor.move(:to, go_to_line.to_i-1,0) if go_to_line
     end
 
+    def display_info
+      [view, style_map, cursor]
+    end
+
     def view
-      status.view + "\n" + editor.view + "\n" + command.view
+      [status.view, editor.view, command.view].join("\n")
     end
 
     def style_map
-      reverse = StyleMap.single_line_reversed(@options[:columns])
-      reverse + editor.style_map + @command.style_map
+      status.style_map + editor.style_map + command.style_map
     end
 
     def cursor
       Position.new(@focused.cursor.line + @status_lines, @focused.cursor.column)
     end
 
+    # user typed a key
     def key(key)
       # deactivate select_mode if its not re-enabled in this action
       @select_mode_was_on = @select_mode
       @select_mode = false
 
       if bound = @bindings[key]
-        result = if bound.is_a?(Symbol)
-          @actions[bound].call
-        else
-          bound.call
-        end
-        return result
+        return execute_action(bound)
       end
 
       case key
@@ -70,8 +69,7 @@ module Ruco
           @focused.insert("\t")
         end
       when :"Shift+tab" then @editor.unindent
-      when :enter then
-        @focused.insert("\n")
+      when :enter then @focused.insert("\n")
       when :backspace then @focused.delete(-1)
       when :delete then @focused.delete(1)
 
@@ -85,7 +83,7 @@ module Ruco
 
     def bind(key, action=nil, &block)
       raise "Ctrl+m cannot be bound" if key == :"Ctrl+m" # would shadow enter -> bad
-      raise if action and block
+      raise "Cannot bind an action and a block" if action and block
       @bindings[key] = action || block
     end
 
@@ -185,7 +183,7 @@ module Ruco
         ask("Find: ", :cache => true) do |term|
           if editor.find(term)
             ask("Replace with: ", :cache => true) do |replace|
-              loop_ask("Replace=Enter Skip=s All=a Cancel=Esc") do |ok|
+              loop_ask("Replace=Enter Skip=s All=a Cancel=Esc", :auto_enter => true) do |ok|
                 case ok
                 when '' # enter
                   editor.insert(replace)
@@ -290,5 +288,13 @@ module Ruco
         @focused.send(:move, *args)
       end
     end
+
+    def execute_action(action)
+      if action.is_a?(Symbol)
+        @actions[action].call
+      else
+        action.call
+      end
+    end
   end
 end

data/lib/ruco/command_bar.rb

@@ -40,7 +40,7 @@ module Ruco
 
     def ask(question, options={}, &block)
       @form = cached_form_if(options[:cache], question) do
-        Form.new(question, :columns => @options[:columns]) do |result|
+        Form.new(question, :columns => @options[:columns], :auto_enter => options[:auto_enter]) do |result|
           @form = nil
           block.call(result)
         end

data/lib/ruco/core_ext/string.rb

@@ -1,12 +1,12 @@
 class String
-  # fix strange string split behavior without cluttering the knowledge
-  # all over the codebase
+  # http://grosser.it/2011/08/28/ruby-string-naive-split-because-split-is-to-clever/
   # "    ".split(' ') == []
-  # "    ".split(/ /) == []
-  # "    ".split(' ',-1) == ['']
   # "    ".naive_split(' ') == ['','','','']
+  # "".split(' ') == []
+  # "".naive_split(' ') == ['']
   def naive_split(pattern)
-    result = split(/#{pattern}/, -1)
+    pattern = /#{pattern}/ unless pattern.is_a?(Regexp)
+    result = split(pattern, -1)
     result.empty? ? [''] : result
   end
 

data/lib/ruco/form.rb

@@ -21,7 +21,7 @@ module Ruco
 
     def insert(text)
       @text_field.insert(text.gsub("\n",'')) unless text == "\n"
-      @submit.call(@text_field.value) if text.include?("\n")
+      @submit.call(@text_field.value) if text.include?("\n") or @options[:auto_enter]
     end
 
     def cursor

data/lib/ruco/screen.rb

@@ -0,0 +1,101 @@
+module Ruco
+  class Screen
+    def initialize(options)
+      @options = options
+      @cache = []
+    end
+
+    def self.open(options, &block)
+      new(options).open(&block)
+    end
+
+    def open(&block)
+      Curses.noecho # do not show typed chars
+      Curses.nonl # turn off newline translation
+      Curses.stdscr.keypad(true) # enable arrow keys
+      Curses.raw # give us all other keys
+      Curses.stdscr.nodelay = 1 # do not block -> we can use timeouts
+      Curses.init_screen
+      yield self
+    ensure
+      Curses.clear # needed to clear the menu/status bar on windows
+      Curses.close_screen
+    end
+
+    def columns
+      Curses.stdscr.maxx
+    end
+
+    def lines
+      Curses.stdscr.maxy
+    end
+
+    def clear_cache
+      @cache.clear
+    end
+
+    def draw(view, style_map, cursor)
+      draw_view(view, style_map)
+      Curses.setpos(*cursor)
+    end
+
+    def debug_key(key)
+      @key_line ||= -1
+      @key_line = (@key_line + 1) % lines
+      write(@key_line, 0, "#{key.inspect}---")
+    end
+
+    private
+
+    def write(line,row,text)
+      Curses.setpos(line,row)
+      Curses.addstr(text);
+    end
+
+    def draw_view(view, style_mask)
+      lines = view.naive_split("\n")
+      style_mask = style_mask.flatten
+
+      lines.each_with_index do |line, line_number|
+        styles = style_mask[line_number]
+
+        # expand line with whitespace to overwrite previous content
+        missing = columns - line.size
+        raise line if missing < 0
+        line += " " * missing
+
+        # display tabs as single-space -> nothing breaks
+        line.gsub!("\t",' ')
+
+        if_line_changes line_number, [line, styles] do
+          # position at start of line and draw
+          Curses.setpos(line_number,0)
+          Ruco::StyleMap.styled(line, styles).each do |style, part|
+            Curses.attrset self.class.curses_style(style)
+            Curses.addstr part
+          end
+
+          if @options[:debug_cache]
+            write(line_number, 0, (rand(899)+100).to_s)
+          end
+        end
+      end
+    end
+
+    def if_line_changes(key, args)
+      return if @cache[key] == args # would not change the line -> nothing to do
+      @cache[key] = args # store current line
+      yield # render the line
+    end
+
+    STYLES = {
+      :normal => 0,
+      :reverse => Curses::A_REVERSE
+    }
+
+    def self.curses_style(style)
+      return 0 unless style
+      STYLES[style] or raise("Unknown style #{style.inspect}")
+    end
+  end
+end

data/lib/ruco/status_bar.rb

@@ -22,6 +22,10 @@ module Ruco
       "#{version}#{file}#{indicators}#{' ' * space_left}#{position}"[0, columns]
     end
 
+    def style_map
+      StyleMap.single_line_reversed(@options[:columns])
+    end
+
     def change_indicator
       @editor.modified? ? '*' : ' '
     end

data/lib/ruco/style_map.rb

@@ -100,16 +100,6 @@ module Ruco
       build
     end
 
-    STYLES = {
-      :normal => 0,
-      :reverse => Curses::A_REVERSE
-    }
-
-    def self.curses_style(style)
-      return 0 unless style
-      STYLES[style] or raise("Unknown style #{style.inspect}")
-    end
-
     def self.single_line_reversed(columns)
       map = StyleMap.new(1)
       map.add(:reverse, 0, 0...columns)

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.1.12"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/ruco/keyboard.rb",
     "lib/ruco/option_accessor.rb",
     "lib/ruco/position.rb",
+    "lib/ruco/screen.rb",
     "lib/ruco/status_bar.rb",
     "lib/ruco/style_map.rb",
     "lib/ruco/text_area.rb",
@@ -56,6 +57,7 @@ Gem::Specification.new do |s|
     "spec/ruco/history_spec.rb",
     "spec/ruco/keyboard_spec.rb",
     "spec/ruco/option_accessor_spec.rb",
+    "spec/ruco/screen_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/style_map_spec.rb",
     "spec/ruco/text_area_spec.rb",
@@ -83,6 +85,7 @@ Gem::Specification.new do |s|
     "spec/ruco/history_spec.rb",
     "spec/ruco/keyboard_spec.rb",
     "spec/ruco/option_accessor_spec.rb",
+    "spec/ruco/screen_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/style_map_spec.rb",
     "spec/ruco/text_area_spec.rb",

data/spec/ruco/application_spec.rb

@@ -199,9 +199,9 @@ describe Ruco::Application do
       app.view.should include("Replace with:")
       type 'd', :enter
       app.view.should include("Replace=Enter")
-      type 's', :enter # skip
+      type 's' # skip
       app.view.should include("Replace=Enter")
-      type 's', :enter # skip
+      type 's' # skip
       app.view.should_not include("Replace=Enter")
       editor_part(app.view).should == "xabac\n\n"
     end
@@ -212,9 +212,9 @@ describe Ruco::Application do
       app.view.should include("Replace with:")
       type 'd', :enter
       app.view.should include("Replace=Enter")
-      type 's', :enter # skip first
+      type 's' # skip first
       app.view.should include("Replace=Enter")
-      type 'a', :enter # all
+      type 'a' # all
       app.view.should_not include("Replace=Enter")
       editor_part(app.view).should == "_a_d_d_d\n\n"
     end
@@ -225,7 +225,7 @@ describe Ruco::Application do
       app.view.should include("Replace with:")
       type "d", :enter
       app.view.should include("Replace=Enter")
-      type 'x', :enter
+      type 'x' # stupid user
       app.view.should_not include("Replace=Enter")
       editor_part(app.view).should == "xabac\n\n"
     end

data/spec/ruco/form_spec.rb

@@ -23,6 +23,12 @@ describe Ruco::Form do
       form.insert("d\n")
       @result.should == "abcd"
     end
+
+    it "returns result on normal insert when auto_enter is given" do
+      form.instance_eval{ @options[:auto_enter] = true }
+      form.insert('a')
+      @result.should == 'a'
+    end
   end
 
   describe :move do
@@ -74,4 +80,4 @@ describe Ruco::Form do
       form.view.should == "Test "
     end
   end
-end
+end

data/spec/ruco/screen_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::Screen do
+  describe :curses_style do
+    it "is 'normal' for nothing" do
+      Ruco::Screen.curses_style(:normal).should == Curses::A_NORMAL
+    end
+
+    it "is red for red" do
+      pending
+      Ruco::Screen.curses_style(:red).should == Curses::color_pair( Curses::COLOR_RED )
+    end
+
+    it "is reverse for reverse" do
+      Ruco::Screen.curses_style(:reverse).should == Curses::A_REVERSE
+    end
+
+    it "raises on unknown style" do
+      lambda{
+        Ruco::Screen.curses_style(:foo)
+      }.should raise_error
+    end
+  end
+end

data/spec/ruco/style_map_spec.rb

@@ -110,25 +110,4 @@ describe Ruco::StyleMap do
       Ruco::StyleMap.styled("abc", [:reverse, :normal]).should == [[:normal, ""], [:reverse, "a"],[:normal,'bc']]
     end
   end
-
-  describe :curses_style do
-    it "is 'normal' for nothing" do
-      Ruco::StyleMap.curses_style(:normal).should == Curses::A_NORMAL
-    end
-
-    it "is red for red" do
-      pending
-      Ruco::StyleMap.curses_style(:red).should == Curses::color_pair( Curses::COLOR_RED )
-    end
-
-    it "is reverse for reverse" do
-      Ruco::StyleMap.curses_style(:reverse).should == Curses::A_REVERSE
-    end
-
-    it "raises on unknown style" do
-      lambda{
-        Ruco::StyleMap.curses_style(:foo)
-      }.should raise_error
-    end
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Michael Grosser
@@ -68,6 +68,7 @@ files:
 - lib/ruco/keyboard.rb
 - lib/ruco/option_accessor.rb
 - lib/ruco/position.rb
+- lib/ruco/screen.rb
 - lib/ruco/status_bar.rb
 - lib/ruco/style_map.rb
 - lib/ruco/text_area.rb
@@ -85,6 +86,7 @@ files:
 - spec/ruco/history_spec.rb
 - spec/ruco/keyboard_spec.rb
 - spec/ruco/option_accessor_spec.rb
+- spec/ruco/screen_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/style_map_spec.rb
 - spec/ruco/text_area_spec.rb
@@ -140,6 +142,7 @@ test_files:
 - spec/ruco/history_spec.rb
 - spec/ruco/keyboard_spec.rb
 - spec/ruco/option_accessor_spec.rb
+- spec/ruco/screen_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/style_map_spec.rb
 - spec/ruco/text_area_spec.rb