ruco 0.0.30 → 0.0.31

data/Readme.md

@@ -7,7 +7,7 @@ Features:
  - Tab -> indent / Shift+Tab -> unindent (tab == 2 space)
  - keeps indentation (+ paste-detection e.g. via Cmd+v)
  - change (*) + writable (!) indicators
- - find / go to line / delete line
+ - find / go to line / delete line / search & replace
  - configuration via `~/.ruco.rb`
  - cut, copy and paste -> Ctrl+x/c/v
 
@@ -57,13 +57,14 @@ TIPS
 
 TODO
 =====
+ - add selection colors to forms in command_bar
  - session storage (stay at same line/column when reopening)
  - smart staying at end of line/column when changing line
  - warnings / messages
  - syntax highlighting
  - raise when binding to a unsupported key
  - search options regex + case-sensitive
- - search & replace
+ - 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 seperate project

data/VERSION

@@ -1 +1 @@
-0.0.30
+0.0.31

data/lib/ruco/application.rb

@@ -102,6 +102,13 @@ module Ruco
       end
     end
 
+    def loop_ask(question, options={}, &block)
+      ask(question, options) do |result|
+        finished = (block.call(result) == :finished)
+        loop_ask(question, options, &block) unless finished
+      end
+    end
+
     def configure(&block)
       instance_exec(&block)
     end
@@ -165,6 +172,23 @@ module Ruco
       action :find do
         ask("Find: ", :cache => true){|result| editor.find(result) }
       end
+
+      action :find_and_replace do
+        ask("Find: ", :cache => true) do |term|
+          if editor.find(term)
+            ask("Replace with: ", :cache => true) do |replace|
+              loop_ask("Replace=Enter Skip=s Cancel=Esc") do |ok|
+                if ok == '' # enter
+                  editor.insert(replace)
+                elsif ok != 's'
+                  stop = true
+                end
+                :finished if stop or not editor.find(term)
+              end
+            end
+          end
+        end
+      end
     end
 
     def setup_keys
@@ -174,6 +198,7 @@ module Ruco
       bind :"Ctrl+q", :quit
       bind :"Ctrl+g", :go_to_line
       bind :"Ctrl+f", :find
+      bind :"Ctrl+r", :find_and_replace
       bind :"Ctrl+a", :select_all
       bind :"Ctrl+d", :delete_line
       bind :"Ctrl+x", :cut

data/lib/ruco/command_bar.rb

@@ -1,7 +1,7 @@
 module Ruco
   class CommandBar
     attr_accessor :cursor_line, :form
-    delegate :move, :delete, :insert, :to => :form
+    delegate :move, :delete, :insert, :selecting, :selection, :text_in_selection, :to => :form
 
     SHORTCUTS = [
       '^W Exit',
@@ -51,7 +51,9 @@ module Ruco
 
     def cached_form_if(cache, question)
       if cache
-        @forms_cache[question] ||= yield
+        new_form = yield
+        new_form.insert(@forms_cache[question].value) if @forms_cache[question]
+        @forms_cache[question] = new_form
       else
         yield
       end

data/lib/ruco/editor.rb

@@ -4,7 +4,7 @@ module Ruco
     attr_reader :text_area
     private :text_area
     delegate :view, :color_mask, :cursor,
-      :selecting, :selection, :text_in_selection,
+      :selecting, :selection, :text_in_selection, :reset,
       :move, :resize,
       :to => :text_area
 
@@ -23,14 +23,14 @@ module Ruco
     end
 
     def find(text)
+      move(:relative, 0,0) # reset selection
       return unless start = text_area.content.index(text, text_area.index_for_position+1)
       finish = start + text.size
       move(:to_index, finish)
       selecting{ move(:to_index, start) }
+      true
     end
 
-    def reset;end
-
     def insert(text)
       text_area.insert(text)
       @modified = true

data/lib/ruco/form.rb

@@ -1,6 +1,6 @@
 module Ruco
   class Form
-    delegate :move, :delete, :to => :text_field
+    delegate :move, :delete, :value, :selecting, :selection, :text_in_selection, :to => :text_field
 
     def initialize(label, options, &submit)
       @options = options

data/lib/ruco/text_area.rb

@@ -88,6 +88,10 @@ module Ruco
       content.slice(start, finish-start)
     end
 
+    def reset
+      @selection = nil
+    end
+
     def insert(text)
       delete_content_in_selection if @selection
 

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.30"
+  s.version = "0.0.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
@@ -52,7 +52,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",
@@ -69,6 +69,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

@@ -15,6 +15,10 @@ describe Ruco::Application do
     view.naive_split("\n")[1..-2].join("\n")
   end
 
+  def type(*keys)
+    keys.each{|k| app.key k }
+  end
+
   let(:app){ Ruco::Application.new(@file, :lines => 5, :columns => 10) }
   let(:status){ "Ruco #{Ruco::VERSION} -- spec/temp.txt  \n" }
   let(:command){ "^W Exit" }
@@ -101,6 +105,60 @@ describe Ruco::Application do
     end
   end
 
+  describe 'Find and replace' do
+    it "stops when nothing is found" do
+      write 'abc'
+      type :"Ctrl+r", 'x', :enter
+      app.view.should_not include("Replace with:")
+    end
+
+    it "can find and replace multiple times" do
+      write 'xabac'
+      type :"Ctrl+r", 'a', :enter
+      app.view.should include("Replace with:")
+      type 'd', :enter
+      app.view.should include("Replace")
+      type :enter # replace first
+      app.view.should include("Replace")
+      type :enter # replace second -> finished
+      app.view.should_not include("Replace")
+      editor_part(app.view).should == "xdbdc\n\n"
+    end
+
+    it "can find and skip replace multiple times" do
+      write 'xabac'
+      type :"Ctrl+r", 'a', :enter
+      app.view.should include("Replace with:")
+      type 'd', :enter
+      app.view.should include("Replace")
+      type 's', :enter # skip
+      app.view.should include("Replace")
+      type 's', :enter # skip
+      app.view.should_not include("Replace")
+      editor_part(app.view).should == "xabac\n\n"
+    end
+
+    it "breaks if neither s nor enter is entered" do
+      write 'xabac'
+      type :"Ctrl+r", 'a', :enter
+      app.view.should include("Replace with:")
+      type "d", :enter
+      app.view.should include("Replace")
+      type 'x', :enter
+      app.view.should_not include("Replace")
+      editor_part(app.view).should == "xabac\n\n"
+    end
+
+    it "reuses find" do
+      write 'xabac'
+      type :"Ctrl+f", 'a', :enter
+      type :"Ctrl+r"
+      app.view.should include("Find: a")
+      type :enter
+      app.view.should include("Replace with:")
+    end
+  end
+
   describe :bind do
     it "can execute bound stuff" do
       test = 0

data/spec/ruco/command_bar_spec.rb

@@ -44,6 +44,15 @@ describe Ruco::CommandBar do
       bar.cursor.column.should == 9
     end
 
+    it "does not keep block when cached" do
+      x = 0
+      bar.ask('Find: ', :cache => true){ x = 1 }
+      bar.insert("\n")
+      bar.ask('Find: ', :cache => true){ x = 2 }
+      bar.insert("\n")
+      x.should == 2
+    end
+
     it "reset the question when cached" do
       bar.ask('Find: ', :cache => true){}
       bar.insert('abc')

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 30
-  version: 0.0.30
+  - 31
+  version: 0.0.31
 platform: ruby
 authors: 
 - Michael Grosser
@@ -19,21 +18,20 @@ date: 2011-01-27 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: 
@@ -92,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 732794355
       segments: 
       - 0
       version: "0"
@@ -101,14 +99,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