redcar 0.10 → 0.11.0dev

data/plugins/project_search/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "project_search"
+  version "1.0"
+  file    "lib", "project_search"
+  object  "ProjectSearch"
+  dependencies "project", ">0"
+end

data/plugins/project_search/spec/fixtures/project/foo.txt

@@ -0,0 +1,43 @@
+Foo Bar Baz
+foo bar baz
+Corge Corge Corge
+
+111
+222
+333
+444
+555
+666
+777
+888
+999
+000
+,,,
+aaa
+bbb xxx
+ccc xxx
+ddd
+eee xxx
+fff
+ggg
+hhh xxx
+iii
+jjj
+kkk
+lll xxx
+mmm
+nnn
+ooo
+ppp
+qqq xxx
+rrr
+sss
+ttt
+uuu
+vvv
+www xxx
+yyy
+zzz
+...
+
+Christmas

data/plugins/project_search/spec/fixtures/project/qux.rb

@@ -0,0 +1,3 @@
+qux.quux
+
+Christmas

data/plugins/project_search/spec/project_search/binary_data_detector_spec.rb

@@ -0,0 +1,24 @@
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe ProjectSearch::BinaryDataDetector do
+  
+  it "should detect plain text files" do
+    txt1 = File.read(project_search_fixture_dir + "/foo.txt")
+    txt2 = File.read(project_search_fixture_dir + "/qux.rb")
+    
+    ProjectSearch::BinaryDataDetector.textual?(txt1).should be_true
+    ProjectSearch::BinaryDataDetector.textual?(txt2).should be_true
+    
+    ProjectSearch::BinaryDataDetector.binary?(txt1).should be_false
+    ProjectSearch::BinaryDataDetector.binary?(txt2).should be_false
+  end
+  
+  it "should detect binary files" do
+    bin = File.read(project_search_fixture_dir + "/binary_file.bin")
+    
+    ProjectSearch::BinaryDataDetector.textual?(bin).should be_false
+    
+    ProjectSearch::BinaryDataDetector.binary?(bin).should be_true
+  end
+end

data/plugins/project_search/spec/project_search/word_search_spec.rb

@@ -0,0 +1,157 @@
+
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe ProjectSearch::WordSearch do
+  after do
+    FileUtils.rm_rf(project_search_fixture_dir + "/.redcar")
+    ProjectSearch.indexes.clear
+  end
+  
+  describe "options of the search" do
+    it "should have a query_string method" do
+      make_search("testset").query_string.should == "testset"
+    end
+    
+    it "should construct a regex to match the query string" do
+      make_search("asdf", false).regex.should == /asdf/i
+      make_search("asdf", true).regex.should == /asdf/
+    end
+    
+    it "should respond whether matching case or not" do
+      make_search("asdf", nil).match_case?.should == false
+      make_search("asdf", 123).match_case?.should == true
+    end
+  end
+  
+  def fixture_project
+    @fixture_project ||= Redcar::Project.new(project_search_fixture_dir)
+  end
+  
+  def make_search(query, match_case=true, context=0)
+    ProjectSearch::WordSearch.new(fixture_project, query, match_case, context)
+  end
+  
+  describe "finding hits" do
+    it "should find one occurrence" do
+      results = make_search("Foo").results
+      results.length.should == 1
+      result = results.first
+      result.should be_an_instance_of(ProjectSearch::Hit)
+      result.file.should == project_search_fixture_dir + "/foo.txt"
+      result.line_num.should == 0
+      result.line("<b>", "</b>").should == "<b>Foo</b> Bar Baz"
+    end
+    
+    it "should ignore binary files" do
+      results = make_search("HoHo").results
+      results.length.should == 0
+    end
+    
+    it "should find every occurrence" do
+      results = make_search("xxx").results
+      results.length.should == 7
+      results.map {|r| r.line_num}.should == [16, 17, 19, 22, 26, 31, 37]
+    end
+    
+    it "should ignore case if asked" do
+      results = make_search("Foo", false).results
+      results.length.should == 2
+      results.map {|r| r.line_num}.should == [0, 1]
+      results[0].file.should =~ /foo.txt$/
+      results[1].file.should =~ /foo.txt$/
+    end
+  end
+    
+  describe "hits" do
+    it "should enwrap every occurrence" do
+      results = make_search("Corge").results
+      results.length.should == 1
+      result = results.first
+      result.should be_an_instance_of(ProjectSearch::Hit)
+      result.file.should == project_search_fixture_dir + "/foo.txt"
+      result.line_num.should == 2
+      result.line("<b>", "</b>").should == "<b>Corge</b> <b>Corge</b> <b>Corge</b>"
+    end
+  end
+  
+  describe "pre context" do
+    it "should return pre context" do
+      results = make_search("333", true, 2).results
+      results.length.should == 1
+      result = results.first
+      result.pre_context.should == ["111", "222"]
+    end
+    
+    it "should return no pre context for first line" do
+      results = make_search("Foo", true, 2).results
+      results.length.should == 1
+      result = results.first
+      result.pre_context.should == []
+    end
+    
+    it "should return short pre context for second line" do
+      results = make_search("foo", true, 2).results
+      results.length.should == 1
+      result = results.first
+      result.pre_context.should == ["Foo Bar Baz"]
+    end
+    
+    it "should return pre context for hits right after one another" do
+      results = make_search("xxx", true, 2).results
+      results[0].pre_context.should == [",,,", "aaa"]
+      results[1].pre_context.should == ["aaa", "bbb xxx"]
+    end
+  end
+  
+  describe "post context" do
+    it "should return post context" do
+      results = make_search("333", true, 2).results
+      results.length.should == 1
+      result = results.first
+      result.post_context.should == ["444", "555"]
+    end
+    
+    it "should return post context for hits right after one another" do
+      results = make_search("xxx", true, 2).results
+      results[0].post_context.should == ["ccc xxx", "ddd"]
+      results[1].post_context.should == ["ddd", "eee xxx"]
+    end
+  end
+  
+  describe "when there are changes to the file system" do
+    it "should not return results for deleted files" do
+      test_file = File.expand_path(project_search_fixture_dir + "/jscar.txt")
+      File.open(test_file, "w") do |fout|
+        fout.puts "aa testword bb"
+      end
+      
+      # indexing should have happened by now
+      search = make_search("testword")
+      search.results.map {|r| File.expand_path(r.file)}.should include(test_file)
+      
+      FileUtils.rm_rf(test_file)
+      
+      # should still work but should not include the result
+      search = make_search("testword")
+      search.results.map {|r| File.expand_path(r.file)}.should_not include(test_file)
+    end
+  end
+  
+  describe "streaming search results" do
+    it "should stream by file" do
+      search = make_search("Christmas")
+      results_by_file = []
+      search.on_file_results do |file_hits|
+        results_by_file << file_hits
+      end
+      search.results
+      results_by_file.length.should == 2
+      results_by_file.map {|r| r.first.file.split("/").last}.sort.should == ["foo.txt", "qux.rb"].sort
+    end
+  end
+end
+  
+  
+
+
+

data/plugins/project_search/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+$:.push File.expand_path(File.dirname(__FILE__) + '../../../lib')
+
+require 'redcar'
+Redcar.environment = :test
+Redcar.load_unthreaded
+
+class ImmediateTaskQueue
+  class Future
+    def initialize(value)
+      @value = value
+    end
+    
+    def get
+      @value
+    end
+  end
+  
+  def submit(task)
+    Future.new(task.execute)
+  end
+end
+
+Redcar::Resource.compute_synchronously = true
+
+def project_search_fixture_dir
+  File.dirname(__FILE__) + "/fixtures/project"
+end

data/plugins/redcar/redcar.rb

@@ -74,11 +74,16 @@ module Redcar
         Runnables::RunningProcessChecker.new(
           Redcar.app.all_tabs.select {|t| t.is_a?(HtmlTab)},
           "Kill all and quit?",
-          :none     => lambda { Redcar.app.quit },
-          :continue => lambda { Redcar.app.quit },
+          :none     => lambda { quit },
+          :continue => lambda { quit },
           :cancel   => nil
         ).check
       end
+      
+      def quit
+        Project::Manager.open_projects.each {|pr| pr.close }
+        Redcar.app.quit
+      end
     end
 
     class NewCommand < Command
@@ -1011,40 +1016,41 @@ Redcar.environment: #{Redcar.environment}
         link "Cmd+O",       Project::FileOpenCommand
         link "Cmd+U",       Project::FileReloadCommand
         link "Cmd+Shift+O", Project::DirectoryOpenCommand
+        link "Cmd+Alt+Ctrl+P",   Project::FindRecentCommand
         #link "Cmd+Ctrl+O",  Project::OpenRemoteCommand
         link "Cmd+S",       Project::FileSaveCommand
         link "Cmd+Shift+S", Project::FileSaveAsCommand
         link "Cmd+W",       CloseTabCommand
         link "Cmd+Shift+W", CloseWindowCommand
-        link "Alt+Shift+W",   CloseTreeCommand
+        link "Alt+Shift+W", CloseTreeCommand
         link "Cmd+Q",       QuitCommand
 
         #link "Cmd+Return",   MoveNextLineCommand
 
         link "Ctrl+Shift+E", EditView::InfoSpeedbarCommand
-        link "Cmd+Z",       UndoCommand
-        link "Cmd+Shift+Z", RedoCommand
-        link "Cmd+X",       CutCommand
-        link "Cmd+C",       CopyCommand
-        link "Cmd+V",       PasteCommand
-        link "Cmd+D",       DuplicateCommand
-
-        link "Home",        MoveTopCommand
-        link "Ctrl+A",      MoveHomeCommand
-        link "Ctrl+E",      MoveEndCommand
-        link "End",         MoveBottomCommand
-
-        link "Cmd+[",       DecreaseIndentCommand
-        link "Cmd+]",       IncreaseIndentCommand
-        link "Cmd+Shift+I", AutoIndenter::IndentCommand
-        link "Cmd+L",       GotoLineCommand
-        link "Cmd+A",       SelectAllCommand
-        link "Ctrl+W",      SelectWordCommand
-        link "Ctrl+L",      SelectLineCommand
-        link "Cmd+B",       ToggleBlockSelectionCommand
-        link "Escape",      AutoCompleter::AutoCompleteCommand
-        link "Ctrl+Escape", AutoCompleter::MenuAutoCompleterCommand
-        link "Ctrl+Space",   AutoCompleter::AutoCompleteCommand
+        link "Cmd+Z",        UndoCommand
+        link "Cmd+Shift+Z",  RedoCommand
+        link "Cmd+X",        CutCommand
+        link "Cmd+C",        CopyCommand
+        link "Cmd+V",        PasteCommand
+        link "Cmd+D",        DuplicateCommand
+
+        link "Home",   MoveTopCommand
+        link "Ctrl+A", MoveHomeCommand
+        link "Ctrl+E", MoveEndCommand
+        link "End",    MoveBottomCommand
+
+        link "Cmd+[",            DecreaseIndentCommand
+        link "Cmd+]",            IncreaseIndentCommand
+        link "Cmd+Shift+I",      AutoIndenter::IndentCommand
+        link "Cmd+L",            GotoLineCommand
+        link "Cmd+A",            SelectAllCommand
+        link "Ctrl+W",           SelectWordCommand
+        link "Ctrl+L",           SelectLineCommand
+        link "Cmd+B",            ToggleBlockSelectionCommand
+        link "Escape",           AutoCompleter::AutoCompleteCommand
+        link "Ctrl+Escape",      AutoCompleter::MenuAutoCompleterCommand
+        link "Ctrl+Space",       AutoCompleter::AutoCompleteCommand
         link "Ctrl+Shift+Space", AutoCompleter::MenuAutoCompleterCommand
 
         link "Ctrl+U",       EditView::UpcaseTextCommand
@@ -1055,7 +1061,6 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+=",       EditView::AlignAssignmentCommand
         link "Ctrl+Shift+^", SortLinesCommand
 
-        link "Cmd+Shift+F",     Redcar::FindInProject::OpenSearch
         link "Cmd+T",           Project::FindFileCommand
         link "Cmd+Shift+Alt+O", MoveTabToOtherNotebookCommand
         link "Cmd+Alt+O",       SwitchNotebookCommand
@@ -1078,8 +1083,8 @@ Redcar.environment: #{Redcar.environment}
         link "Cmd++",           IncreaseFontSize
         link "Cmd+-",           DecreaseFontSize
 
-        link "Ctrl+Shift+P",    PrintScopeCommand
-        link "Cmd+Shift+H",     ToggleTreesCommand
+        link "Ctrl+Shift+P", PrintScopeCommand
+        link "Cmd+Shift+H",  ToggleTreesCommand
 
         # link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
 
@@ -1099,6 +1104,7 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+Alt+N",   NewWindowCommand
         link "Ctrl+O",       Project::FileOpenCommand
         link "Ctrl+Shift+O", Project::DirectoryOpenCommand
+        link "Ctrl+Alt+Shift+P",   Project::FindRecentCommand
         #link "Alt+Shift+O",  Project::OpenRemoteCommand
         link "Ctrl+S",       Project::FileSaveCommand
         link "Ctrl+Shift+S", Project::FileSaveAsCommand
@@ -1117,61 +1123,61 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+V",       PasteCommand
         link "Ctrl+D",       DuplicateCommand
 
-        link "Ctrl+Home",    MoveTopCommand
-        link "Home",         MoveHomeCommand
-        link "Ctrl+Alt+A",   MoveHomeCommand
-        link "End",          MoveEndCommand
-        link "Ctrl+Alt+E",   MoveEndCommand
-        link "Ctrl+End",     MoveBottomCommand
-
-        link "Ctrl+[",       DecreaseIndentCommand
-        link "Ctrl+]",       IncreaseIndentCommand
-        link "Ctrl+Shift+[", AutoIndenter::IndentCommand
-        link "Ctrl+L",       GotoLineCommand
-        link "Ctrl+A", SelectAllCommand
-        link "Ctrl+Alt+W",   SelectWordCommand
-        link "Ctrl+Alt+L",   SelectLineCommand
-        link "Ctrl+B",       ToggleBlockSelectionCommand
-        link "Escape",       AutoCompleter::AutoCompleteCommand
-        link "Ctrl+Escape",  AutoCompleter::MenuAutoCompleterCommand
-        link "Ctrl+Space",   AutoCompleter::AutoCompleteCommand
+        link "Ctrl+Home",  MoveTopCommand
+        link "Home",       MoveHomeCommand
+        link "Ctrl+Alt+A", MoveHomeCommand
+        link "End",        MoveEndCommand
+        link "Ctrl+Alt+E", MoveEndCommand
+        link "Ctrl+End",   MoveBottomCommand
+
+        link "Ctrl+[",           DecreaseIndentCommand
+        link "Ctrl+]",           IncreaseIndentCommand
+        link "Ctrl+Shift+[",     AutoIndenter::IndentCommand
+        link "Ctrl+L",           GotoLineCommand
+        link "Ctrl+A",           SelectAllCommand
+        link "Ctrl+Alt+W",       SelectWordCommand
+        link "Ctrl+Alt+L",       SelectLineCommand
+        link "Ctrl+B",           ToggleBlockSelectionCommand
+        link "Escape",           AutoCompleter::AutoCompleteCommand
+        link "Ctrl+Escape",      AutoCompleter::MenuAutoCompleterCommand
+        link "Ctrl+Space",       AutoCompleter::AutoCompleteCommand
+        
         link "Ctrl+Shift+Space", AutoCompleter::MenuAutoCompleterCommand
 
-        link "Ctrl+U",       EditView::UpcaseTextCommand
-        link "Ctrl+Shift+U", EditView::DowncaseTextCommand
-        link "Ctrl+Alt+U",   EditView::TitlizeTextCommand
-        link "Ctrl+Alt+Shift+U",   EditView::OppositeCaseTextCommand
-        link "Ctrl+_",       EditView::CamelSnakePascalRotateTextCommand
-        link "Ctrl+=",       EditView::AlignAssignmentCommand
-        link "Ctrl+Shift+^", SortLinesCommand
+        link "Ctrl+U",           EditView::UpcaseTextCommand
+        link "Ctrl+Shift+U",     EditView::DowncaseTextCommand
+        link "Ctrl+Alt+U",       EditView::TitlizeTextCommand
+        link "Ctrl+Alt+Shift+U", EditView::OppositeCaseTextCommand
+        link "Ctrl+_",           EditView::CamelSnakePascalRotateTextCommand
+        link "Ctrl+=",           EditView::AlignAssignmentCommand
+        link "Ctrl+Shift+^",     SortLinesCommand
 
-        link "Ctrl+Shift+F",     Redcar::FindInProject::OpenSearch
         link "Ctrl+T",           Project::FindFileCommand
         link "Ctrl+Shift+Alt+O", MoveTabToOtherNotebookCommand
 
-        link "Ctrl+Shift+P",    PrintScopeCommand
+        link "Ctrl+Shift+P", PrintScopeCommand
 
-        link "Ctrl+Alt+O",       SwitchNotebookCommand
-        link "Ctrl+Shift+H",     ToggleTreesCommand
-        link "Alt+Page Up",         SwitchTreeUpCommand
-        link "Alt+Page Down",       SwitchTreeDownCommand
+        link "Ctrl+Alt+O",           SwitchNotebookCommand
+        link "Ctrl+Shift+H",         ToggleTreesCommand
+        link "Alt+Page Up",          SwitchTreeUpCommand
+        link "Alt+Page Down",        SwitchTreeDownCommand
         link "Ctrl+Page Up",         SwitchTabDownCommand
         link "Ctrl+Page Down",       SwitchTabUpCommand
         link "Ctrl+Shift+Page Up",   MoveTabDownCommand
         link "Ctrl+Shift+Page Down", MoveTabUpCommand
         link "Ctrl+Shift+T",         OpenTreeFinderCommand
-        link "Alt+Shift+J",      IncreaseTreebookWidthCommand
-        link "Alt+Shift+H",      DecreaseTreebookWidthCommand
-        link "Ctrl+Shift+>",     EnlargeFirstNotebookCommand
-        link "Ctrl+Shift+<",     EnlargeSecondNotebookCommand
-        link "Ctrl+Shift+L",     ResetNotebookWidthsCommand
-        link "Ctrl+Shift+:",     RotateNotebooksCommand
-        link "Alt+Shift+N",      CloseNotebookCommand
+        link "Alt+Shift+J",          IncreaseTreebookWidthCommand
+        link "Alt+Shift+H",          DecreaseTreebookWidthCommand
+        link "Ctrl+Shift+>",         EnlargeFirstNotebookCommand
+        link "Ctrl+Shift+<",         EnlargeSecondNotebookCommand
+        link "Ctrl+Shift+L",         ResetNotebookWidthsCommand
+        link "Ctrl+Shift+:",         RotateNotebooksCommand
+        link "Alt+Shift+N",          CloseNotebookCommand
         # link "Ctrl+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
-        link "F11",              ToggleFullscreen
-        link "Ctrl+Alt+I",       ToggleInvisibles
-        link "Ctrl++",           IncreaseFontSize
-        link "Ctrl+-",           DecreaseFontSize
+        link "F11",                  ToggleFullscreen
+        link "Ctrl+Alt+I",           ToggleInvisibles
+        link "Ctrl++",               IncreaseFontSize
+        link "Ctrl+-",               DecreaseFontSize
 
         link "Ctrl+Alt+S", Snippets::OpenSnippetExplorer