ruco 0.0.53 → 0.0.54

data/Readme.md

@@ -81,9 +81,9 @@ TIPS
 
 TODO
 =====
- - check writeable status every x seconds (e.g. in background) -> faster while typing
+ - 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 ?'
- - hightlight current work when reopening search (so typing replaces it)
+ - 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

data/VERSION

@@ -1 +1 @@
-0.0.53
+0.0.54

data/lib/ruco/command_bar.rb

@@ -65,7 +65,11 @@ module Ruco
     def cached_form_if(cache, question)
       if cache
         new_form = yield
-        new_form.insert(@forms_cache[question].value) if @forms_cache[question]
+        if @forms_cache[question]
+          new_form.insert(@forms_cache[question].value)
+          new_form.move(:to, 0,0)
+          new_form.selecting{ move(:to_eol) }
+        end
         @forms_cache[question] = new_form
       else
         yield

data/lib/ruco/editor.rb

@@ -3,7 +3,7 @@ module Ruco
     attr_reader :file
     attr_reader :text_area
     private :text_area
-    delegate :view, :style_map, :cursor,
+    delegate :view, :style_map, :cursor, :position,
       :insert, :indent, :unindent, :delete, :delete_line,
       :redo, :undo,
       :selecting, :selection, :text_in_selection, :reset,

data/lib/ruco/status_bar.rb

@@ -6,11 +6,8 @@ module Ruco
     end
 
     def view
-      "Ruco #{Ruco::VERSION} -- #{@editor.file}#{change_indicator}#{writable_indicator}"
-    end
-
-    def format
-      Curses::A_REVERSE
+      position = @editor.position
+      spread "Ruco #{Ruco::VERSION} -- #{@editor.file}#{change_indicator}#{writable_indicator}", "#{position.line + 1}:#{position.column + 1}"
     end
 
     def change_indicator
@@ -18,10 +15,17 @@ module Ruco
     end
 
     def writable_indicator
-      @writeable ||= begin
+      @writable ||= begin
         writable = (not File.exist?(@editor.file) or system("test -w #{@editor.file}"))
         writable ? ' ' : '!'
       end
     end
+
+    private
+
+    def spread(left, right)
+      empty = [@options[:columns] - left.size - right.size, 0].max
+      "#{left}#{' ' * empty}#{right}"
+    end
   end
-end
+end

data/lib/ruco/text_area.rb

@@ -123,12 +123,12 @@ module Ruco
       @window.columns = columns
     end
 
-    protected
-
     def position
       Position.new(line, column)
     end
 
+    protected
+
     def position_for_index(index)
       jump = content.slice(0, index).to_s.naive_split("\n")
       [jump.size - 1, jump.last.size]

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.53"
+  s.version = "0.0.54"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-05-06}
+  s.date = %q{2011-05-08}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]

data/spec/ruco/application_spec.rb

@@ -30,9 +30,12 @@ describe Ruco::Application do
     keys.each{|k| app.key k }
   end
 
+  def status(line=1)
+    "Ruco #{Ruco::VERSION} -- spec/temp.txt  #{line}:1\n"
+  end
+
   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" }
 
   it "renders status + editor + command" do
@@ -46,7 +49,7 @@ describe Ruco::Application do
     app.key(:enter)
     app.key('2')
     app.key(:enter)
-    app.view.should == "#{status.sub('.txt ','.txt*')}2\n\n\n#{command}"
+    app.view.should == "#{status(3).sub('.txt ','.txt*')}2\n\n\n#{command}"
   end
 
   it "does not enter key-codes" do
@@ -59,7 +62,7 @@ describe Ruco::Application do
     app.key(:"Ctrl+g") # go to line
     app.key('2') # 2
     app.key(:enter)
-    app.view.should == "#{status}123\n456\n789\n#{command}"
+    app.view.should == "#{status(2)}123\n456\n789\n#{command}"
     app.cursor.should == [2,0] # 0 offset + 1 for statusbar
   end
 

data/spec/ruco/command_bar_spec.rb

@@ -75,6 +75,15 @@ describe Ruco::CommandBar do
       bar.view.should == "Find: abc"
     end
 
+    it "selects last value on cache-hit so I can type for new value" do
+      bar.ask('Find: ', :cache => true){}
+      bar.insert('abc')
+      bar.insert("\n")
+      bar.ask('Find: ', :cache => true){}
+      bar.cursor.column.should == 9
+      bar.text_in_selection.should == 'abc'
+    end
+
     it "gets reset when starting a new question" do
       bar.ask('Find: '){}
       bar.insert('123')

data/spec/ruco/status_bar_spec.rb

@@ -32,4 +32,8 @@ describe Ruco::StatusBar do
     editor.stub!(:file).and_return '/etc/sudoers'
     bar.view.should include('!')
   end
-end
+
+  it "shows line and column and right side" do
+    bar.view.should =~ /1:1$/
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 115
   prerelease: 
   segments: 
   - 0
   - 0
-  - 53
-  version: 0.0.53
+  - 54
+  version: 0.0.54
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +02:00
+date: 2011-05-08 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency