ruco 0.0.50 → 0.0.51

data/Readme.md

@@ -3,7 +3,7 @@ Simple, extendable, test-driven commandline editor written in ruby.
 Features:
 
  - **Intuitive interface**
- - selecting via Shift + arrow-keys (Linux only) or 'select mode' Ctrl+b + arrow-keys
+ - selecting via Shift + arrow-keys (only Linux or iTerm) or 'select mode' Ctrl+b + arrow-keys
  - move line up/down (Alt+Ctrl+up/down)
  - Tab -> indent / Shift+Tab -> unindent
  - keeps indentation (+ paste-detection e.g. via Cmd+v)
@@ -69,6 +69,7 @@ Customize
 
 TIPS
 ====
+ - [Mac] arow-keys + Shift/Alt does not work in default terminal (use iTerm)
  - [Tabs] Ruco does not like tabs. Existing tabs are displayed as ' ' and pressing tab inserts 2*' '
  - [RVM] `alias r="rvm ree exec ruco"` and you only have to install ruco once
  - [Ruby1.9] Unicode support -> install libncursesw5-dev before installing ruby (does not work for 1.8)
@@ -78,11 +79,9 @@ TIPS
 TODO
 =====
  - align soft-tabs
- - handle \\r and \\r\\n nicely <-> breaks curses output
  - highlight tabs (e.g. strange character or reverse/underline/color)
  - big warning when editing a not-writable file
  - find next (Alt+n)
- - add selection colors to forms in command_bar
  - smart staying at column when changing line
  - syntax highlighting
  - raise when binding to a unsupported key
@@ -90,8 +89,6 @@ TODO
  - 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)
- - support Alt+Fx keys
- - (later) extract keyboard and html-style components into separate project
 
 Author
 ======

data/VERSION

@@ -1 +1 @@
-0.0.50
+0.0.51

data/bin/ruco

@@ -137,4 +137,4 @@ init_screen do
     break if result == :quit
     show_app app
   end
-end
+end

data/lib/ruco/application.rb

@@ -19,9 +19,8 @@ module Ruco
     end
 
     def style_map
-      reverse = StyleMap.new(1)
-      reverse.add(:reverse, 0, 0...@options[:columns])
-      reverse + editor.style_map + reverse
+      reverse = StyleMap.single_line_reversed(@options[:columns])
+      reverse + editor.style_map + @command.style_map
     end
 
     def cursor

data/lib/ruco/command_bar.rb

@@ -9,7 +9,8 @@ module Ruco
       '^F Find',
       '^R Replace',
       '^D Delete line',
-      '^G Go to line'
+      '^G Go to line',
+      '^B Select mode'
     ]
 
     def initialize(options)
@@ -26,6 +27,17 @@ module Ruco
       end
     end
 
+    def style_map
+      if @form
+        map = @form.style_map
+        map.invert!
+        map.prepend(:reverse, 0, 0..@options[:columns])
+        map
+      else
+        StyleMap.single_line_reversed(@options[:columns])
+      end
+    end
+
     def ask(question, options={}, &block)
       @form = cached_form_if(options[:cache], question) do
         Form.new(question, :columns => @options[:columns]) do |result|
@@ -72,4 +84,4 @@ module Ruco
       shortcuts_that_fit * spacer
     end
   end
-end
+end

data/lib/ruco/form.rb

@@ -13,6 +13,12 @@ module Ruco
       @label + @text_field.view
     end
 
+    def style_map
+      map = @text_field.style_map
+      map.left_pad!(@label.size)
+      map
+    end
+
     def insert(text)
       @text_field.insert(text.gsub("\n",''))
       @submit.call(@text_field.value) if text.include?("\n")
@@ -30,4 +36,4 @@ module Ruco
 
     attr_reader :text_field
   end
-end
+end

data/lib/ruco/style_map.rb

@@ -11,29 +11,51 @@ module Ruco
       @lines[line] << [style, columns]
     end
 
+    def prepend(style, line, columns)
+      @lines[line] ||= []
+      @lines[line].unshift [style, columns]
+    end
+
     def flatten
       @lines.map do |styles|
         next unless styles
 
         # start and one after end of every column-range changes styles
-        points_of_change = styles.map{|s,c| [c.first, c.last+1] }.flatten
+        points_of_change = styles.map{|s,c| [c.first, c.last+1] }.flatten.uniq
 
         flat = []
 
         styles.each do |style, columns|
           points_of_change.each do |point|
             next unless columns.include?(point)
-            flat[point] ||= []
-            flat[point].unshift style
+            flat[point] = style
           end
         end
 
-        max = styles.map{|s,c|c.last}.max
-        flat[max+1] = []
+        max = styles.map{|_,columns| columns.last }.max
+        flat[max+1] = :normal
         flat
       end
     end
 
+    def left_pad!(offset)
+      @lines.compact.each do |styles|
+        next unless styles
+        styles.map! do |style, columns|
+          [style, (columns.first + offset)..(columns.last + offset)]
+        end
+      end
+    end
+
+    def invert!
+      map = {:reverse => :normal, :normal => :reverse}
+      @lines.compact.each do |styles|
+        styles.map! do |style, columns|
+          [map[style] || style, columns]
+        end
+      end
+    end
+
     def +(other)
       lines = self.lines + other.lines
       new = StyleMap.new(0)
@@ -55,18 +77,13 @@ module Ruco
     def pop
       slice!(-1, 1)
     end
-    
-    STYLES = {
-      :normal => 0,
-      :reverse => Curses::A_REVERSE
-    }
 
     def self.styled(content, styles)
       styles ||= []
       content = content.dup
 
       build = []
-      build << [[]]
+      build << [:normal]
 
       buffered = ''
       styles.each do |style|
@@ -83,8 +100,20 @@ module Ruco
       build
     end
 
-    def self.curses_style(styles)
-      styles.sum{|style| STYLES[style] or raise("Unknown style #{style}") }
+    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)
+      map
     end
   end
-end
+end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.50"
+  s.version = "0.0.51"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-21}
+  s.date = %q{2011-02-24}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -63,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",
@@ -85,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/command_bar_spec.rb

@@ -89,4 +89,20 @@ describe Ruco::CommandBar do
       @result.should == 'abcd'
     end
   end
-end
+
+  describe :style_map do
+    let(:bar){ Ruco::CommandBar.new(:columns => 10) }
+
+    it "is reverse" do
+      bar.style_map.flatten.should == [[:reverse, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, :normal]]
+    end
+
+    it "has normal style for selected input field" do
+      bar.ask('Q'){}
+      bar.insert('abc')
+      bar.selecting{ move(:to, 0,0) }
+      bar.view.should == 'Q abc'
+      bar.style_map.flatten.should == [[:reverse, nil, :normal, nil, nil, nil, :reverse, nil, nil, nil, nil, :normal]]
+    end
+  end
+end

data/spec/ruco/editor_spec.rb

@@ -121,7 +121,7 @@ describe Ruco::Editor do
       read.should == "aaa\n\n"
     end
   end
-  
+
   describe 'convert tabs' do
     before do
       write("\t\ta")
@@ -491,7 +491,7 @@ describe Ruco::Editor do
         move(:to, 0, 4)
       end
       editor.style_map.flatten.should == [
-        [[:reverse], nil, nil, nil, nil, []],
+        [:reverse, nil, nil, nil, nil, :normal],
         nil,
         nil
       ]
@@ -504,8 +504,8 @@ describe Ruco::Editor do
         move(:to, 1, 1)
       end
       editor.style_map.flatten.should == [
-        [nil, [:reverse], nil, nil, nil, nil, []],
-        [[:reverse], nil, []],
+        [nil, :reverse, nil, nil, nil, nil, :normal],
+        [:reverse, nil, :normal],
         nil
       ]
     end
@@ -517,7 +517,7 @@ describe Ruco::Editor do
         move(:to, 0, 4)
       end
       editor.style_map.flatten.should == [
-        [nil, nil, [:reverse], nil, nil, []],
+        [nil, nil, :reverse, nil, nil, :normal],
         nil,
         nil
       ]
@@ -531,7 +531,7 @@ describe Ruco::Editor do
       end
       editor.style_map.flatten.should == [
         nil,
-        [nil, nil, [:reverse], nil, nil, []],
+        [nil, nil, :reverse, nil, nil, :normal],
         nil
       ]
     end
@@ -547,9 +547,9 @@ describe Ruco::Editor do
       editor.view.should == "789\n789\n789\n"
       editor.cursor.should == [2,2]
       editor.style_map.flatten.should == [
-        [nil, [:reverse], nil, nil, nil, nil, []], # start to end of screen
-        [[:reverse], nil, nil, nil, nil, nil, []], # 0 to end of screen
-        [[:reverse], nil, nil, []] # 0 to end of selection
+        [nil, :reverse, nil, nil, nil, nil, :normal], # start to end of screen
+        [:reverse, nil, nil, nil, nil, nil, :normal], # 0 to end of screen
+        [:reverse, nil, nil, :normal] # 0 to end of selection
       ]
     end
   end

data/spec/ruco/style_map_spec.rb

@@ -13,18 +13,28 @@ describe Ruco::StyleMap do
       # red from 3 to 5
       map.flatten.should == [
         nil,
-        [nil, nil, nil, [:red], nil, nil, []],
+        [nil, nil, nil, :red, nil, nil, :normal],
         nil
       ]
     end
 
     it "reproduces merged styles" do
-      map.add(:red, 1, 3..5)
       map.add(:reverse, 1, 2..4)
+      map.add(:red, 1, 3..5)
       # reverse at 2 -- reverse and red at 3,4 -- red at 5
       map.flatten.should == [
         nil,
-        [nil, nil, [:reverse], [:reverse, :red], nil, [:red], []],
+        [nil, nil, :reverse, :red, nil, :red, :normal],
+        nil
+      ]
+    end
+
+    it "overwrites styles" do
+      map.add(:reverse, 0, 0..1)
+      map.add(:normal, 0, 0..1)
+      map.flatten.should == [
+        [:normal, nil, :normal],
+        nil,
         nil
       ]
     end
@@ -37,8 +47,8 @@ describe Ruco::StyleMap do
       s2 = Ruco::StyleMap.new(2)
       s2.add(:reverse, 0, 2..3)
       (s1 + s2).flatten.should == [
-        [[:reverse], nil, []],
-        [nil, nil, [:reverse], nil, []],
+        [:reverse, nil, :normal],
+        [nil, nil, :reverse, nil, :normal],
         nil
       ]
     end
@@ -47,51 +57,78 @@ describe Ruco::StyleMap do
       s = Ruco::StyleMap.new(2)
       s.add(:reverse, 0, 0..1)
       s.add(:reverse, 1, 1..2)
-      s.shift.flatten.should == [[[:reverse],nil,[]]]
-      s.flatten.should == [[nil, [:reverse],nil,[]]]
+      s.shift.flatten.should == [[:reverse, nil, :normal]]
+      s.flatten.should == [[nil, :reverse, nil, :normal]]
     end
 
     it "can pop" do
       s = Ruco::StyleMap.new(2)
       s.add(:reverse, 0, 0..1)
       s.add(:reverse, 1, 1..2)
-      s.pop.flatten.should == [[nil, [:reverse],nil,[]]]
-      s.flatten.should == [[[:reverse],nil,[]]]
+      s.pop.flatten.should == [[nil, :reverse, nil, :normal]]
+      s.flatten.should == [[:reverse, nil, :normal]]
+    end
+  end
+
+  describe :left_pad! do
+    it "adds whitespace to left side" do
+      s = Ruco::StyleMap.new(2)
+      s.add(:reverse, 0, 0..1)
+      s.add(:reverse, 1, 1..2)
+      s.left_pad!(3)
+      s.flatten.should == [
+        [nil, nil, nil, :reverse, nil, :normal],
+        [nil, nil, nil, nil, :reverse, nil, :normal]
+      ]
+    end
+  end
+
+  describe :invert! do
+    it "inverts styles" do
+      s = Ruco::StyleMap.new(2)
+      s.add(:reverse, 0, 0..1)
+      s.add(:normal, 1, 1..2)
+      s.add(:red, 1, 4..5)
+      s.invert!
+      s.flatten.should == [
+        [:normal, nil, :normal],
+        [nil, :reverse, nil, nil, :red, nil, :normal]
+      ]
     end
   end
 
   describe :styled do
     it "can style an unstyled line" do
-      Ruco::StyleMap.styled("a", nil).should == [[[], "a"]]
+      Ruco::StyleMap.styled("a", nil).should == [[:normal, "a"]]
     end
 
-    it "can style an styled line" do
-      Ruco::StyleMap.styled("a", [[:reverse],nil]).should == [[[], ""], [[:reverse], "a"]]
+    it "can style a styled line" do
+      Ruco::StyleMap.styled("a", [:reverse ,nil]).should == [[:normal, ""], [:reverse, "a"]]
     end
 
     it "keeps unstyled parts" do
-      Ruco::StyleMap.styled("abc", [[:reverse],[]]).should == [[[], ""], [[:reverse], "a"],[[],'bc']]
+      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([]).should == Curses::A_NORMAL
+      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 )
+      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
+      Ruco::StyleMap.curses_style(:reverse).should == Curses::A_REVERSE
     end
 
     it "raises on unknown style" do
       lambda{
-        Ruco::StyleMap.curses_style([:foo])
+        Ruco::StyleMap.curses_style(:foo)
       }.should raise_error
     end
   end
-end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 123
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 50
-  version: 0.0.50
+  - 51
+  version: 0.0.51
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,25 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +01:00
+date: 2011-02-24 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: 
@@ -103,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 955347375
       segments: 
       - 0
       version: "0"
@@ -112,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