ruco 0.0.43 → 0.0.44

data/Readme.md

@@ -26,6 +26,11 @@ Customize
 
     # ~/.ruco.rb
     Ruco.configure do
+      # set options
+      options.window_line_scroll_offset = 5 # default 1
+      options.history_entries = 10          # default 100
+      ...
+
       # bind a key
       # - you can use Integers and Symbols
       # - use "ruco --debug-keys foo" to see which keys are possible
@@ -65,6 +70,7 @@ TIPS
 
 TODO
 =====
+ - align soft-tabs
  - strip whitespace after content / whitespace only lines, without removing intentional whitespace e.g. from markdown
  - handle \\r and \\r\\n nicely <-> breaks curses output
  - highlight tabs (e.g. strange character or reverse/underline/color)

data/VERSION

@@ -1 +1 @@
-0.0.43
+0.0.44

data/lib/ruco.rb

@@ -10,6 +10,7 @@ require 'ruco/core_ext/file'
 require 'ruco/keyboard'
 require 'ruco/position'
 require 'ruco/history'
+require 'ruco/option_accessor'
 require 'ruco/file_store'
 require 'ruco/window'
 require 'ruco/style_map'

data/lib/ruco/application.rb

@@ -1,8 +1,10 @@
 module Ruco
   class Application
+    attr_reader :editor, :status, :command, :options
+
     def initialize(file, options)
       @file = file
-      @options = options
+      @options = OptionAccessor.new(options)
 
       setup_actions
       setup_keys
@@ -123,8 +125,6 @@ module Ruco
 
     private
 
-    attr_reader :editor, :status, :command
-
     def setup_actions
       @actions = {}
 
@@ -228,22 +228,31 @@ module Ruco
 
     def load_user_config
       Ruco.application = self
-      config = File.expand_path("~/.ruco.rb")
+      config = File.expand_path(@options[:rc] || "~/.ruco.rb")
       load config if File.exist?(config)
     end
 
     def create_components
       @status_lines = 1
-      @editor ||= Ruco::Editor.new(@file, :lines => editor_lines, :columns => @options[:columns], :convert_tabs => @options[:convert_tabs], :convert_return => @options[:convert_return])
-      @status = Ruco::StatusBar.new(@editor, :columns => @options[:columns])
-      @command = Ruco::CommandBar.new(:columns => @options[:columns])
+
+      editor_options = @options.slice(
+        :columns, :convert_tabs, :convert_newlines
+      ).merge(
+        :window => @options.nested(:window),
+        :history => @options.nested(:history),
+        :lines => editor_lines
+      ).merge(@options.nested(:editor))
+
+      @editor ||= Ruco::Editor.new(@file, editor_options)
+      @status = Ruco::StatusBar.new(@editor, @options.nested(:status_bar).merge(:columns => options[:columns]))
+      @command = Ruco::CommandBar.new(@options.nested(:command_bar).merge(: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
+      @options[:lines] - @status_lines - command_lines
     end
   end
 end

data/lib/ruco/core_ext/hash.rb

@@ -13,4 +13,8 @@ class Hash
     hash = self
     keys.inject({}){|returned, key| returned.update key => hash[key]}
   end
-end
+
+  def reverse_merge(other)
+    other.merge(self)
+  end
+end

data/lib/ruco/editor_area.rb

@@ -4,7 +4,7 @@ module Ruco
   class EditorArea < TextArea
     def initialize(*args)
       super(*args)
-      @history = History.new(:state => state, :track => [:content], :entries => 100, :timeout => 2)
+      @history = History.new((args.last[:history]||{}).reverse_merge(:state => state, :track => [:content], :entries => 100, :timeout => 2))
     end
 
     def undo

data/lib/ruco/keyboard.rb

@@ -38,16 +38,16 @@ class Keyboard
     when Curses::Key::DOWN then :down
     when Curses::Key::RIGHT then :right
     when Curses::Key::LEFT then :left
-    when 554 then :"Ctrl+right"
-    when 393 then :"Shift+left"
-    when 555 then :"Ctrl+Shift+right"
-    when 539 then :"Ctrl+left"
-    when 402 then :"Shift+right"
-    when 540 then :"Ctrl+Shift+left"
-    when 560 then :"Ctrl+up"
-    when 337 then :"Shift+up"
-    when 519 then :"Ctrl+down"
-    when 336 then :"Shift+down"
+    when 402, '^[1;2C' then :"Shift+right"
+    when 554, '^[1;5C' then :"Ctrl+right"
+    when 555, '^[1;6C' then :"Ctrl+Shift+right"
+    when 393, '^[1;2D' then :"Shift+left"
+    when 539, '^[1;5D' then :"Ctrl+left"
+    when 540, '^[1;6D' then :"Ctrl+Shift+left"
+    when 337, '^[1;2A' then :"Shift+up"
+    when 560, '^[1;5A' then :"Ctrl+up"
+    when 336, '^[1;2B' then :"Shift+down"
+    when 519, '^[1;5B' then :"Ctrl+down"
     when Curses::KEY_END then :end
     when Curses::KEY_HOME then :home
     when Curses::KEY_NPAGE then :page_down
@@ -68,7 +68,13 @@ class Keyboard
     when ESCAPE then :escape
     when Curses::KEY_RESIZE then :resize
     else
-      key > MAX_CHAR ? key : key.chr
+      if key.is_a? Fixnum
+        key > MAX_CHAR ? key : key.chr
+      elsif is_alt_key_code?(key)
+        :"Alt+#{key.slice(1,1)}"
+      else
+        key
+      end
     end
   end
 
@@ -133,7 +139,8 @@ class Keyboard
     else
       # when connected via ssh escape sequences are used
       if escape_sequence?(sequence)
-        [escape_sequence_to_key(sequence)]
+        stringified = bytes_to_string(sequence).sub("\e",'^').sub('[[','[')
+        [translate_key_to_code(stringified)]
       else
         bytes_to_key_codes(sequence)
       end
@@ -144,16 +151,7 @@ class Keyboard
     sequence[0] == ESCAPE and sequence.size.between?(2,6) # Esc
   end
 
-  def self.escape_sequence_to_key(sequence)
-    case sequence
-    when [ESCAPE, 91, 49, 59, 50, 65] then :"Shift+up"
-    when [ESCAPE, 91, 49, 59, 50, 66] then :"Shift+down"
-    else
-      if sequence.size == 2
-        :"Alt+#{sequence[1].chr}"
-      else
-        bytes_to_string(sequence)
-      end
-    end
+  def self.is_alt_key_code?(key)
+    key.slice(0,1) == "^" and key.size == 2
   end
 end

data/lib/ruco/option_accessor.rb

@@ -0,0 +1,25 @@
+module Ruco
+  # Can be used like a hash, but also allows .key access
+  class OptionAccessor
+    attr_reader :wrapped
+    delegate :[], :[]=, :slice, :to => :wrapped
+
+    def initialize(wrapped={})
+      @wrapped = wrapped
+    end
+
+    def nested(key)
+      Hash[wrapped.map do |k,v|
+        if k.to_s =~ /^#{key}_(.*)$/
+          [$1.to_sym,v]
+        end
+      end.compact]
+    end
+
+    def method_missing(method, *args)
+      base = method.to_s.sub('=','').to_sym
+      raise if args.size != 1
+      @wrapped[base] = args.first
+    end
+  end
+end

data/lib/ruco/text_area.rb

@@ -7,7 +7,7 @@ module Ruco
       @options = options.dup
       @column = 0
       @line = 0
-      @window = Window.new(@options.delete(:lines), @options.delete(:columns))
+      @window = Window.new(@options.delete(:lines), @options.delete(:columns), @options[:window]||{})
       adjust_window
     end
 
@@ -80,7 +80,7 @@ module Ruco
       delete_content_in_selection if @selection
 
       text.tabs_to_spaces!
-      if text == "\n" and @column >= after_last_word
+      if text == "\n" and @column >= current_line.leading_whitespace.size
         current_whitespace = current_line.leading_whitespace
         next_whitespace = lines[line+1].to_s.leading_whitespace
         text = text + [current_whitespace, next_whitespace].max

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.43"
+  s.version = "0.0.44"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-06}
+  s.date = %q{2011-02-09}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/ruco/form.rb",
     "lib/ruco/history.rb",
     "lib/ruco/keyboard.rb",
+    "lib/ruco/option_accessor.rb",
     "lib/ruco/position.rb",
     "lib/ruco/status_bar.rb",
     "lib/ruco/style_map.rb",
@@ -52,6 +53,7 @@ Gem::Specification.new do |s|
     "spec/ruco/form_spec.rb",
     "spec/ruco/history_spec.rb",
     "spec/ruco/keyboard_spec.rb",
+    "spec/ruco/option_accessor_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/style_map_spec.rb",
     "spec/ruco/text_area_spec.rb",
@@ -61,7 +63,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",
@@ -73,6 +75,7 @@ Gem::Specification.new do |s|
     "spec/ruco/form_spec.rb",
     "spec/ruco/history_spec.rb",
     "spec/ruco/keyboard_spec.rb",
+    "spec/ruco/option_accessor_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/style_map_spec.rb",
     "spec/ruco/text_area_spec.rb",
@@ -82,6 +85,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/application_spec.rb

@@ -4,10 +4,15 @@ require File.expand_path('spec/spec_helper')
 describe Ruco::Application do
   before do
     `rm -rf ~/.ruco/sessions`
+    `rm #{rucorc} 2>&1`
     @file = 'spec/temp.txt'
     write('')
   end
 
+  after do
+    `rm #{rucorc} 2>&1`
+  end
+
   def write(content)
     File.open(@file,'w'){|f| f.write(content) }
   end
@@ -24,7 +29,8 @@ describe Ruco::Application do
     keys.each{|k| app.key k }
   end
 
-  let(:app){ Ruco::Application.new(@file, :lines => 5, :columns => 10) }
+  let(:rucorc){ 'spec/.ruco.rb' }
+  let(:app){ Ruco::Application.new(@file, :lines => 5, :columns => 10, :rc => rucorc) }
   let(:status){ "Ruco #{Ruco::VERSION} -- spec/temp.txt  \n" }
   let(:command){ "^W Exit" }
 
@@ -239,12 +245,16 @@ describe Ruco::Application do
       editor_part(app.view).should == "a\n  c\n  b"
     end
 
-    it "does not indent when inside line and next line has more whitespace" do
+    it "indents when inside line and next line has more whitespace" do
       write("ab\n  b\n")
-      app.key(:right)
-      app.key(:enter)
-      app.key('c')
-      editor_part(app.view).should == "a\ncb\n  b"
+      type :right, :enter, 'c'
+      editor_part(app.view).should == "a\n  cb\n  b"
+    end
+
+    it "indents when inside indented line" do
+      write("  ab\nc\n")
+      type :right, :right, :right, :enter, 'd'
+      editor_part(app.view).should == "  a\n  db\nc"
     end
 
     it "indents when tabbing on selection" do
@@ -262,19 +272,27 @@ describe Ruco::Application do
   end
 
   describe '.ruco.rb' do
-    around do |block|
-      rucorc = File.expand_path('~/.ruco.rb')
-      `mv #{rucorc} #{rucorc}.backup  2>&1`
-      File.write(rucorc, "Ruco.configure{ bind(:'Ctrl+e'){ @editor.insert('TEST') } }")
-      block.call
-      `rm #{rucorc} && mv #{rucorc}.backup #{rucorc} 2>&1`
-    end
-
     it "loads it and can use the bound keys" do
+      File.write(rucorc, "Ruco.configure{ bind(:'Ctrl+e'){ @editor.insert('TEST') } }")
       app.view.should_not include('TEST')
       app.key(:"Ctrl+e")
       app.view.should include("TEST")
     end
+
+    it "uses settings" do
+      File.write(rucorc, "Ruco.configure{ options.convert_tabs = true }")
+      app.options[:convert_tabs].should == true
+    end
+
+    it "passes settings to the window" do
+      File.write(rucorc, "Ruco.configure{ options.window_line_scroll_offset = 10 }")
+      app.send(:editor).send(:text_area).instance_eval{@window}.instance_eval{@options[:line_scroll_offset]}.should == 10
+    end
+
+    it "passes settings to history" do
+      File.write(rucorc, "Ruco.configure{ options.history_entries = 10 }")
+      app.send(:editor).send(:text_area).instance_eval{@history}.instance_eval{@options[:entries]}.should == 10
+    end
   end
 
   describe :save do

data/spec/ruco/editor_spec.rb

@@ -517,6 +517,12 @@ describe Ruco::Editor do
       editor.view.should == "  \n\n\n"
       editor.cursor.should == [0,2]
     end
+
+    it "keeps indentation" do
+      write("ab\n  cd")
+      editor.move(:to, 1,2)
+      editor.insert("\n")
+    end
   end
 
   describe :indent do

data/spec/ruco/option_accessor_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::OptionAccessor do
+  let(:options){ Ruco::OptionAccessor.new }
+
+  it "can be accessed like a hash" do
+    options[:xx].should == nil
+    options[:xx] = 1
+    options[:xx].should == 1
+  end
+
+  it "can be written" do
+    options.foo = true
+    options[:foo].should == true
+  end
+
+  it "can access nested keys" do
+    options.foo_bar = 1
+    options.history_size = 1
+    options.nested(:history).should == {:size => 1}
+  end
+
+  it "has empty hash for nested key" do
+    options.nested(:history).should == {}
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 73
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 43
-  version: 0.0.43
+  - 44
+  version: 0.0.44
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,25 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 +01:00
+date: 2011-02-09 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: 
@@ -64,6 +62,7 @@ files:
 - lib/ruco/form.rb
 - lib/ruco/history.rb
 - lib/ruco/keyboard.rb
+- lib/ruco/option_accessor.rb
 - lib/ruco/position.rb
 - lib/ruco/status_bar.rb
 - lib/ruco/style_map.rb
@@ -81,6 +80,7 @@ files:
 - spec/ruco/form_spec.rb
 - spec/ruco/history_spec.rb
 - spec/ruco/keyboard_spec.rb
+- spec/ruco/option_accessor_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/style_map_spec.rb
 - spec/ruco/text_area_spec.rb
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -55157123
       segments: 
       - 0
       version: "0"
@@ -110,14 +110,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
@@ -131,6 +130,7 @@ test_files:
 - spec/ruco/form_spec.rb
 - spec/ruco/history_spec.rb
 - spec/ruco/keyboard_spec.rb
+- spec/ruco/option_accessor_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/style_map_spec.rb
 - spec/ruco/text_area_spec.rb