redcar 0.11.0dev → 0.11

data/plugins/core/spec/core/shared_storage_spec.rb

@@ -0,0 +1,49 @@
+
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe Redcar::Plugin::SharedStorage do
+  
+  before do
+    remove_test_files
+  end
+  
+  after do
+    remove_test_files
+  end
+  
+  def remove_test_files
+    FileUtils.rm_rf(Redcar::Plugin::Storage.new('test_shared_storage').send(:path))
+  end
+  
+  it "should set the default when it is not already set and the value is an Array" do
+    storage = Redcar::Plugin::SharedStorage.new("test_shared_storage")
+    storage.set_or_update_default('a', ['b', 'c'])
+    storage['a'].should == ['b', 'c']
+    storage = Redcar::Plugin::SharedStorage.new("test_shared_storage")
+    storage['a'].should == ['b', 'c']
+  end
+  
+  it "should set the default when it is not already and the value is not an Array" do
+    storage = Redcar::Plugin::SharedStorage.new("test_shared_storage")
+    storage.set_or_update_default('a', 'b')
+    storage['a'].should == ['b']
+    storage = Redcar::Plugin::SharedStorage.new("test_shared_storage")
+    storage['a'].should == ['b']
+  end
+  
+  it "should update the default when it is already set and the value is an Array" do
+    storage = Redcar::Plugin::SharedStorage.new("test_shared_storage")
+    storage.set_or_update_default('a', 'b')
+    storage = Redcar::Plugin::SharedStorage.new("test_shared_storage")
+    storage.set_or_update_default('a', 'c')
+    storage['a'].should == ['b', 'c']
+  end
+  
+  it "should update the default when it is already set and the value is not an Array" do
+    storage = Redcar::Plugin::SharedStorage.new("test_shared_storage")
+    storage.set_or_update_default('a', 'b')
+    storage = Redcar::Plugin::SharedStorage.new("test_shared_storage")
+    storage.set_or_update_default('a', ['c', 'd'])
+    storage['a'].should == ['b', 'c', 'd']
+  end
+end

data/plugins/core/spec/core/storage_spec.rb

@@ -3,75 +3,25 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe Redcar::Plugin::Storage do
   
-  before do
-    remove_test_files
+  it "should be based on Redcar::Plugin::BaseStorage" do
+    Redcar::Plugin::Storage.ancestors.should include(Redcar::Plugin::BaseStorage)
   end
   
-  after do
-    remove_test_files
+  it "should have a default storage path" do
+    Redcar::Plugin::Storage.storage_dir.should == File.join(Redcar.user_dir, "storage")
   end
   
-  def remove_test_files
-    FileUtils.rm_rf(Redcar::Plugin::Storage.new('test_storage_saved').send(:path))
-    FileUtils.rm_rf(Redcar::Plugin::Storage.new('test_storage_saved2').send(:path))
+  it "should have a configurable storage path" do
+    old_storage_dir = Redcar::Plugin::Storage.storage_dir
+    Redcar::Plugin::Storage.storage_dir = File.dirname(__FILE__)
+    Redcar::Plugin::Storage.storage_dir.should == File.dirname(__FILE__)
+    Redcar::Plugin::Storage.storage_dir = old_storage_dir
   end
   
-  it "acts like a hash" do
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage[:some_key] = "some value"
-    storage[:some_key].should == "some value"
-    storage[:some_key] = "some other value"
-    storage[:some_key].should == "some other value"
+  it "should store files inside the directory specified by storage path" do
+    Redcar::Plugin::Storage.storage_dir = File.dirname(__FILE__)
+    storage = Redcar::Plugin::Storage.new('test_storage')
+    storage.send(:path).should == File.join(File.dirname(__FILE__), 'test_storage.yaml')
   end
-
-  it "saves to disk" do
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage[:some_key] = "some value"
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage[:some_key].should == "some value"
     
-    FileUtils.rm_rf(storage.send(:path))
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage[:some_key].should be_nil
-  end
-  
-  it "has a set default method" do
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage.set_default('a', 'b')    
-    storage['a'].should == 'b'
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage['a'].should == 'b'
-    storage['a'] = 'c'
-    storage['a'].should == 'c'
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage['a'].should == 'c'
-    storage['b'] = false
-    storage.set_default('b', true)
-    storage['b'].should == false
-  end
-  
-  it "should have the default work when that's the first method called" do
-    storage = Redcar::Plugin::Storage.new('test_storage_saved2')
-    FileUtils.touch(storage.send(:path))
-    lambda { storage.rollback }.should raise_error(RuntimeError)
-    FileUtils.rm(storage.send(:path))
-  end
-  
-  it "should reload when the storage file itself has been elsewise modified" do
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage['a'] = 'b'
-    storage['a'].should == 'b'
-    storage['a'].should == 'b'
-    sleep 1 # windows doesn't have finer granularity than this
-    File.open(storage.send(:path), 'w') do |f|
-      f.write "---
-                a: new"
-    end    
-    storage['a'].should == 'new'
-    storage['a'].should == 'new'
-    storage = Redcar::Plugin::Storage.new('test_storage_saved')
-    storage['a'].should == 'new'    
-  end
-  
-  
 end

data/plugins/declarations/lib/declarations.rb

@@ -11,7 +11,9 @@ module Redcar
       Menu::Builder.build do
         sub_menu "Project" do
           item "Go to declaration", :command => Declarations::GoToTagCommand, :priority => 30
-          item "Rebuild tags file", :command => Declarations::RebuildTagsCommand, :priority => 31
+          sub_menu "Refresh", :priority => 31 do
+            item "Declarations file", :command => Declarations::RebuildTagsCommand
+          end
         end
       end
     end

data/plugins/document_search/features/replace.feature

@@ -8,16 +8,18 @@ Feature: Replace in file
   Scenario: Open replace speedbar
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I open the find and replace speedbar
-    Then I should see the find and replace speedbar
+    And I open the find speedbar
+    Then I should see the find speedbar
 
   Scenario: Replace next occurrence on the same line
     When I replace the contents with "Foo\nBar Rab Rab\nBaz"
     And I move the cursor to 4
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "Rab" into the "Find" field in the speedbar
     And I type "RABBIT" into the "Replace" field in the speedbar
     And I press "Replace && Find" in the speedbar
+    Then the selected text should be "Rab"
+    When I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nBar RABBIT Rab\nBaz"
     And the selected text should be "Rab"
     And the selection range should be from 15 to 18
@@ -25,11 +27,12 @@ Feature: Replace in file
   Scenario: Replace next occurrence on the same line twice
     When I replace the contents with "Foo\nBar Rab Rab\nBaz"
     And I move the cursor to 4
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "Rab" into the "Find" field in the speedbar
     And I type "RAB" into the "Replace" field in the speedbar
     And I press "Replace && Find" in the speedbar
     And I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nBar RAB RAB\nBaz"
     And the selected text should be "RAB"
     And the selection range should be from 8 to 11
@@ -37,10 +40,11 @@ Feature: Replace in file
   Scenario: Replace next occurrence
     When I replace the contents with "Foo\nBar\nBaz\nBar\nQux"
     And I move the cursor to 0
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
     And I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nRab\nBaz\nBar\nQux"
     And the selected text should be "Bar"
     And the selection should be on line 3
@@ -48,29 +52,32 @@ Feature: Replace in file
   Scenario: Replace next occurrence twice
     When I replace the contents with "Foo\nBar\nBaz\nBar\nQux"
     And I move the cursor to 0
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
     And I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nRab\nBaz\nBar\nQux"
     When I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nRab\nBaz\nRab\nQux"
     And there should not be any text selected
 
   Scenario: Replace next occurrence wraps
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 8
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
     When I press "Replace && Find" in the speedbar
+    When I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nRab\nBaz"
     And there should not be any text selected
 
   Scenario: Replace all replaces one
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
     When I press "Replace All" in the speedbar
@@ -81,7 +88,7 @@ Feature: Replace in file
   Scenario: Replace all replaces two
     When I replace the contents with "Foo\nBar\nBaz\nBar\nQux"
     And I move the cursor to 0
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
     When I press "Replace All" in the speedbar
@@ -91,7 +98,7 @@ Feature: Replace in file
 
   Scenario: Replace all replaces two on the same line
     When I replace the contents with "abcabc"
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "bc" into the "Find" field in the speedbar
     And I type "xx" into the "Replace" field in the speedbar
     When I press "Replace All" in the speedbar
@@ -99,7 +106,7 @@ Feature: Replace in file
 
   Scenario: Replace all replaces overlapping occurences on the same line
     When I replace the contents with "deedeedeed"
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "deed" into the "Find" field in the speedbar
     And I type "misdeed" into the "Replace" field in the speedbar
     When I press "Replace All" in the speedbar
@@ -107,7 +114,7 @@ Feature: Replace in file
 
   Scenario: Replace all is a single undo action
     When I replace the contents with "abcabc"
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "bc" into the "Find" field in the speedbar
     And I type "xx" into the "Replace" field in the speedbar
     When I press "Replace All" in the speedbar
@@ -118,13 +125,14 @@ Feature: Replace in file
   Scenario: Replace next occurrence test bug
     When I replace the contents with "the\n* Speedbars have access to the properties of the widgets in them."
     And I move the cursor to 0
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "the" into the "Find" field in the speedbar
     And I type "THE" into the "Replace" field in the speedbar
     And I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "THE\n* Speedbars have access to the properties of the widgets in them."
     And the selection range should be from 31 to 34
-    And I press "Replace && Find" in the speedbar
+    When I press "Replace && Find" in the speedbar
     Then the contents should be "THE\n* Speedbars have access to THE properties of the widgets in them."
     And the selection range should be from 49 to 52
     And I press "Replace && Find" in the speedbar
@@ -138,22 +146,24 @@ Feature: Replace in file
   Scenario: Replace regex with back-references
     When I replace the contents with "Curry chicken"
     And I move the cursor to 0
-    And I open the find and replace speedbar
-    And I choose "Regex" in the "query_type" field in the speedbar
+    And I open the find speedbar
+    And I check "Regex" in the speedbar
     And I type "(\w+) chicken" into the "Find" field in the speedbar
     And I type "\1 beef" into the "Replace" field in the speedbar
     And I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Curry beef"
 
   Scenario: Replace should move past the current replacement if the query is a substring of the replacement
     When I replace the contents with "foo\nfoo\nfoo"
     And I move the cursor to 0
-    And I open the find and replace speedbar
+    And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
     And I type "foobar" into the "Replace" field in the speedbar
     And I press "Replace && Find" in the speedbar
     And I press "Replace && Find" in the speedbar
     And I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "foobar\nfoobar\nfoobar"
     And the selected text should be "foo"
     And the selection should be on line 0
@@ -161,9 +171,8 @@ Feature: Replace in file
   Scenario: The Search-and-Replace Speedbar should get initialized with the currently selected text
     When I replace the contents with "Foo\nBar\nFoo"
     And I select from 4 to 7
-    When I open the find and replace speedbar
+    When I open the find speedbar
     Then the "Find" field in the speedbar should have text "Bar"
     When I type "Foo" into the "Replace" field in the speedbar
     And I press "Replace && Find" in the speedbar
-    Then the contents should be "Foo\nFoo\nFoo"
-
+    Then the contents should be "Foo\nFoo\nFoo"

data/plugins/document_search/lib/document_search/find_speedbar.rb

@@ -90,7 +90,10 @@ module Redcar
             (@initial_query == FindSpeedbar.previous_replace))
           self.query.value = FindSpeedbar.previous_query
         else
-          self.query.value = @initial_query || FindSpeedbar.previous_query
+          if (@initial_query)
+            FindSpeedbar.previous_query = @initial_query
+          end
+          self.query.value = FindSpeedbar.previous_query
         end
         self.replace.value = FindSpeedbar.previous_replace || ""
         self.is_regex.value = FindSpeedbar.previous_options.is_regex

data/plugins/edit_view/features/indentation_commands.feature

@@ -5,7 +5,7 @@ Feature: Indentation commands
     And tabs are soft, 2 spaces
     And I run the command Redcar::Top::IncreaseIndentCommand
     Then the contents should be "  "
-    
+
   Scenario: Decrease indent, soft tabs, width 2
     When I open a new edit tab
     And tabs are soft, 2 spaces
@@ -18,7 +18,7 @@ Feature: Indentation commands
     And tabs are soft, 3 spaces
     And I run the command Redcar::Top::IncreaseIndentCommand
     Then the contents should be "   "
-    
+
   Scenario: Decrease indent, soft tabs, width 3
     When I open a new edit tab
     And tabs are soft, 3 spaces
@@ -31,18 +31,19 @@ Feature: Indentation commands
     And tabs are hard
     And I run the command Redcar::Top::IncreaseIndentCommand
     Then the contents should be "\t"
-    
+
   Scenario: Decrease indent, hard tabs, width 2
     When I open a new edit tab
     And tabs are hard
     And I replace the contents with "<c>\t\t"
     And I run the command Redcar::Top::DecreaseIndentCommand
     Then the contents should be "\t"
-    
+
   Scenario: auto-indent, soft tabs, width 2
+    Given the indentation rules are like Ruby's
     When I open a new edit tab
     And tabs are soft, 2 spaces
     And I replace the contents with "def f\n\t1\t\t\nend\t"
     And I select from 0 to 13
     And I run the command Redcar::AutoIndenter::IndentCommand
-    Then the contents should be "def f\n  1\nend"
+    Then the contents should be "def f\n  1\nend"

data/plugins/edit_view/features/step_definitions/notebook_steps.rb

@@ -16,19 +16,19 @@ end
 World(NotebookSwtHelper)
 
 When /^I make a new notebook$/ do
-  Redcar::Top::NewNotebookCommand.new.run
+  Redcar::Application::OpenNewNotebookCommand.new.run
 end
 
 When /^I move the tab to the other notebook$/ do
-  Redcar::Top::MoveTabToOtherNotebookCommand.new.run
+  Redcar::Application::MoveTabToOtherNotebookCommand.new.run
 end
 
 When /^I close the current notebook$/ do
-  Redcar::Top::CloseNotebookCommand.new.run
+  Redcar::Application::CloseNotebookCommand.new.run
 end
 
 When /^I switch notebooks$/ do
-  Redcar::Top::SwitchNotebookCommand.new.run
+  Redcar::Application::SwitchNotebookCommand.new.run
 end
 
 When /^I focus on the edit_view in the tab in notebook (\d)$/ do |index|

data/plugins/edit_view/features/step_definitions/tab_steps.rb

@@ -1,6 +1,6 @@
 
 Given /^there is an edit tab containing "([^\"]*)"$/ do |contents|
-  tab = Redcar::Top::NewCommand.new.run
+  tab = Redcar::Top::OpenNewEditTabCommand.new.run
   contents = eval(contents.inspect.gsub("\\\\", "\\"))
   cursor_offset = (contents =~ /<c>/)
   contents = contents.gsub("<c>", "")
@@ -11,28 +11,28 @@ Given /^there is an edit tab containing "([^\"]*)"$/ do |contents|
 end
 
 When /^I open a new edit tab$/ do
-  Redcar::Top::NewCommand.new.run
+  Redcar::Top::OpenNewEditTabCommand.new.run
 end
 
 When /^I close the focussed tab$/ do
-  Redcar::Top::CloseTabCommand.new.run
+  Redcar::Application::CloseTabCommand.new.run
 end
 
 When /I switch (up|down) a tab/ do |type|
   case type
   when "down"
-    Redcar::Top::SwitchTabDownCommand.new.run
+    Redcar::Application::SwitchTabDownCommand.new.run
   when "up"
-    Redcar::Top::SwitchTabUpCommand.new.run
+    Redcar::Application::SwitchTabUpCommand.new.run
   end
 end
 
 When /I move (up|down) a tab/ do |type|
   case type
   when "down"
-    Redcar::Top::MoveTabDownCommand.new.run
+    Redcar::Application::MoveTabDownCommand.new.run
   when "up"
-    Redcar::Top::MoveTabUpCommand.new.run
+    Redcar::Application::MoveTabUpCommand.new.run
   end
 end
 

data/plugins/edit_view/features/step_definitions/window_steps.rb

@@ -22,7 +22,7 @@ Then /^there should be (no|one|\d+) windows?$/ do |num|
 end
 
 When /I open a new window(?: with title "(.*)")?/ do |title|
-  Redcar::Top::NewWindowCommand.new(title).run
+  Redcar::Application::OpenNewWindowCommand.new(title).run
 end
 
 When /^I maximize the window size$/ do
@@ -40,7 +40,7 @@ When /I close the window(?: "(.*)")?( with a command| through the gui)?/ do |tit
     win = nil
   end
   if how =~ /command/
-    Redcar::Top::CloseWindowCommand.new(win).run
+    Redcar::Application::CloseWindowCommand.new(win).run
   else
     unless win
       display = Swt::Widgets::Display.get_current