ruco 0.2.7 → 0.2.8

data/Readme.md

@@ -154,6 +154,7 @@ Authors
 
 ### [Contributors](http://github.com/grosser/ruco/contributors)
  - [AJ Palkovic](https://github.com/ajpalkovic)
+ - [David Sachitano](https://github.com/dsachitano)
 
 
 [Michael Grosser](http://grosser.it)<br/>

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/ruco/application.rb

@@ -176,7 +176,18 @@ module Ruco
       end
 
       action :find do
-        ask("Find: ", :cache => true){|result| editor.find(result) }
+        ask("Find: ", :cache => true) do |result|
+          next if editor.find(result)
+
+          if editor.content.include?(result)
+            ask("No matches found -- Enter=First match ESC=Stop") do
+              editor.move(:to, 0,0)
+              editor.find(result)
+            end
+          else
+            ask("No matches found in entire file", :auto_enter => true){}
+          end
+        end
       end
 
       action :find_and_replace do

data/lib/ruco/editor.rb

@@ -37,10 +37,14 @@ module Ruco
 
     def find(text)
       move(:relative, 0,0) # reset selection
-      return unless start = text_area.content.index(text, text_area.index_for_position+1)
+      start = text_area.content.index(text, text_area.index_for_position+1)
+      return unless start
+
+      # select the found word
       finish = start + text.size
       move(:to_index, finish)
       selecting{ move(:to_index, start) }
+
       true
     end
 
@@ -66,6 +70,10 @@ module Ruco
       session_store.set(@file, text_area.state.slice(:position, :screen_position))
     end
 
+    def content
+      text_area.content.freeze # no modifications allowed
+    end
+
     private
 
     def restore_session

data/ruco.gemspec

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

data/spec/ruco/application_spec.rb

@@ -356,6 +356,58 @@ describe Ruco::Application do
     end
   end
 
+  describe 'find' do
+    def command_bar
+      app.view.split("\n").last
+    end
+
+    it "finds" do
+      write('text foo')
+      type :'Ctrl+f', 'foo', :enter
+      app.cursor.should == [1, 5]
+    end
+
+    it "marks the found word" do
+      write('text foo')
+      type :'Ctrl+f', 'foo', :enter, 'a'
+      editor_part(app.view).should == "text a\n\n"
+    end
+
+    it "shows a menu when nothing was found and there were previous matches" do
+      write('text bar bar foo')
+      type :'Ctrl+f', 'bar', :enter
+      type :'Ctrl+f', 'bar', :enter
+      type :'Ctrl+f', 'bar', :enter
+      command_bar.should include("No matches found")
+    end
+
+    it "returns to first match if user confirms after no more match is found" do
+      write('text foo foo')
+      type :'Ctrl+f', 'foo', :enter
+      app.cursor.should == [1, 5]
+      type :'Ctrl+f', 'foo', :enter
+      app.cursor.should == [1, 9]
+      type :'Ctrl+f', 'foo', :enter, :enter
+      app.cursor.should == [1, 5]
+    end
+
+    it "notifies the user when no matches are found in the entire file" do
+      write('text foo')
+      type :'Ctrl+f', 'bar', :enter
+      command_bar.should include("No matches found in entire file")
+      type :enter
+      command_bar.should_not include("No matches found in entire file")
+    end
+
+    it "dismisses the nothing found warning on a single key-press" do
+      write('text foo')
+      type :'Ctrl+f', 'bar', :enter
+      command_bar.should include("No matches found in entire file")
+      type 'a'
+      command_bar.should_not include("No matches found in entire file")
+    end
+  end
+
   describe :save do
     it "just saves" do
       write('')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 -07:00
+date: 2011-11-03 00:00:00 -07:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency