redcar 0.8.1 → 0.9.0

data/plugins/outline_view/spec/fixtures/some_project/trailing_space.rb

@@ -0,0 +1,5 @@
+class TrailingSpace
+
+  def trailing_space      
+  end
+end

data/plugins/outline_view_swt/lib/outline_view_swt.rb

@@ -1,23 +1,22 @@
 module Redcar
   class OutlineViewSWT < Redcar::ApplicationSWT::FilterListDialogController
     include Redcar::Controller
-    
-    ICON_PATH = File.expand_path(File.dirname(__FILE__) + "/icons")
-    
+
     ICONS = {
-      :method => File.join(ICON_PATH, "method.png"),
-      :class => File.join(ICON_PATH, "class.png"),
-      :attribute => File.join(ICON_PATH, "attribute.png"),
-      :alias => File.join(ICON_PATH, "alias.png"),
-      :assignment => File.join(ICON_PATH, "assignment.png"),
-      :interface => File.join(ICON_PATH, "interface.png"),
+      :method => ApplicationSWT::Icon.swt_image(:node_insert),
+      :class => ApplicationSWT::Icon.swt_image(:open_source_flipped),
+      :attribute => ApplicationSWT::Icon.swt_image(:status),
+      :alias => ApplicationSWT::Icon.swt_image(:arrow_branch),
+      :assignment => ApplicationSWT::Icon.swt_image(:arrow),
+      :interface => ApplicationSWT::Icon.swt_image(:information),
+      :closure => ApplicationSWT::Icon.swt_image(:node_magnifier),
       :none => nil
     }
-    
+
     class OutlineViewDialogSWT < Redcar::ApplicationSWT::FilterListDialogController::FilterListDialog
       attr_reader :list, :text
       attr_accessor :controller
-      
+
       def createDialogArea(parent)
         composite = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
         layout = Swt::Layout::RowLayout.new(Swt::SWT::VERTICAL)
@@ -34,7 +33,7 @@ module Redcar
         @list.set_selection(0)
       end
     end
-    
+
     def initialize(model)
       @model = model
       @dialog = OutlineViewDialogSWT.new(Redcar.app.focussed_window.controller.shell)
@@ -46,7 +45,7 @@ module Redcar
       attach_model_listeners
       @associations = {}
     end
-    
+
     def update_list_sync
       if @dialog
         s = Time.now
@@ -56,13 +55,13 @@ module Redcar
         text_focus
       end
     end
-    
+
     def selected
       @model.selected(@associations[@dialog.list.get_selection.first])
     end
-    
+
     private
-    
+
     def populate_table(hash = {})
       @dialog.list.removeAll; @associations.clear
       hash.each do |match, props|
@@ -70,9 +69,8 @@ module Redcar
         item = Swt::Widgets::TableItem.new(@dialog.list, Swt::SWT::NONE)
         @associations[item] = match
         item.text = props[:name]
-        icon = ICONS[props[:kind].to_sym] if props[:kind]
-        if icon
-          image = Swt::Graphics::Image.new(ApplicationSWT.display, icon)
+        image = ICONS[props[:kind].to_sym] if props[:kind]
+        if image
           item.image = image
         end
       end

data/plugins/pair_highlighter/lib/pair_highlighter/document_controller.rb

@@ -75,14 +75,11 @@ module Redcar
       end
       
       def find_pair(step, offset, search_char, current_char)
-        if offset == 0
-          return nil
-        end
         state = 1;
         quotes = false
         doublequotes = false
         
-        while offset > 0 and offset < document.length - 1
+        while offset >= 0 and offset < document.length
           offset = offset + step;
           @newchar = styledText.getTextRange(offset, 1)
           if @newchar == search_char and !quotes and !doublequotes

data/plugins/plugin_manager_ui/lib/plugin_manager_ui.rb

@@ -12,7 +12,8 @@ module Redcar
         sub_menu "Plugins", :priority => 40 do
           group(:priority => :first) {
             item "Plugin Manager", PluginManagerUi::OpenCommand
-            item "Reload Plugins", PluginManagerUi::ReloadLastReloadedCommand
+            item "Reload Plugins", PluginManagerUi::ReloadPluginsCommand
+            item "Reload Last Reloaded", PluginManagerUi::ReloadLastReloadedCommand
             separator
           }
         end
@@ -42,7 +43,14 @@ module Redcar
         end
       end
     end
-    
+
+    class ReloadPluginsCommand < Redcar::Command
+      def execute
+        Redcar.add_plugin_sources(Redcar.plugin_manager)
+	Redcar.plugin_manager.load_maximal
+      end
+    end
+
     class OpenCommand < Redcar::Command
       class Controller
         include Redcar::HtmlController
@@ -58,6 +66,7 @@ module Redcar
         
         def reload_plugin(name)
           plugin = Redcar.plugin_manager.loaded_plugins.detect {|pl| pl.name == name }
+          plugin ||= Redcar.plugin_manager.unloaded_plugins.detect {|pl| pl.name == name }
           plugin.load
           Redcar.app.refresh_menu!
           PluginManagerUi.last_reloaded = plugin
@@ -96,7 +105,7 @@ module Redcar
       
       def execute
         controller = Controller.new
-        tab = win.new_tab(HtmlTab)
+        tab = win.new_tab(ConfigTab)
         tab.html_view.controller = controller
         tab.focus
       end

data/plugins/project/features/close_directory_tree.feature

@@ -0,0 +1,27 @@
+Feature: Close directory tree
+
+  Scenario: Close and re-open directory stays in the same window
+    Given I will choose "." from the "open_directory" dialog
+    When I open a directory
+    Then there should be 1 windows
+    When I close the directory
+    When I open a directory
+    Then there should be 1 windows
+
+  Scenario: Close directory via close icon
+    Given I will choose "." from the "open_directory" dialog
+    When I open a directory
+    And I click the close button
+    Then the tree width should be the minimum size
+    And the window should have title "Redcar"
+    When I open a directory
+    Then there should be 1 windows
+
+  Scenario: Close directory via "Close Tree" menu item
+    Given I will choose "." from the "open_directory" dialog
+    When I open a directory
+    And I close the tree
+    Then the tree width should be the minimum size
+    And the window should have title "Redcar"
+    When I open a directory
+    Then there should be 1 windows

data/plugins/project/features/highlight_focussed_tab.feature

@@ -5,4 +5,48 @@ Feature: Highlight the File of the focussed tab in tree
     And I open a directory
     And I have opened "plugins/project/features/highlight_focussed_tab.feature"
     Then there should be one edit tab
-    And "highlight_focussed_tab.feature" should be selected in the project tree
+    Then "highlight_focussed_tab.feature" should be selected in the project tree
+
+  Scenario: Switching between tabs should highlight them in the tree
+    Given I will choose "." from the "open_directory" dialog
+    And I open a directory
+    And I have opened "plugins/project/features/highlight_focussed_tab.feature"
+    Then "highlight_focussed_tab.feature" should be selected in the project tree
+    And I have opened "plugins/project/features/find_file.feature"
+    And I have opened "plugins/project/features/move_and_rename_files.feature"
+    Then there should be 3 edit tabs
+    And "move_and_rename_files.feature" should be selected in the project tree
+    And I switch up a tab
+    Then "find_file.feature" should be selected in the project tree
+    And I switch up a tab
+    Then "highlight_focussed_tab.feature" should be selected in the project tree
+
+  Scenario: Project revelation should work across several notebooks
+    Given I will choose "." from the "open_directory" dialog
+    And I open a directory
+    And I have opened "plugins/project/features/highlight_focussed_tab.feature"
+    And I have opened "plugins/project/features/find_file.feature"
+    And I have opened "plugins/project/features/move_and_rename_files.feature"
+    And I have opened "plugins/project/features/sub_project.feature"
+    And I make a new notebook
+    And I move the tab to the other notebook
+    And I move the tab to the other notebook
+    And I switch notebooks
+    Then "sub_project.feature" should be selected in the project tree
+    And I switch up a tab
+    Then "move_and_rename_files.feature" should be selected in the project tree
+    And I switch notebooks
+    Then "find_file.feature" should be selected in the project tree
+
+  Scenario: Project revelation doesn't get triggered on REPLs
+    Given I will choose "." from the "open_directory" dialog
+    And I open a directory
+    And I have opened "plugins/project/features/highlight_focussed_tab.feature"
+    Then there should be one edit tab
+    Then "highlight_focussed_tab.feature" should be selected in the project tree
+    And I open a "ruby" repl
+    Then "highlight_focussed_tab.feature" should be selected in the project tree
+    And I open a "clojure" repl
+    Then "highlight_focussed_tab.feature" should be selected in the project tree
+    And I open a "groovy" repl
+    Then "highlight_focussed_tab.feature" should be selected in the project tree

data/plugins/project/features/open_and_save_files.feature

@@ -6,6 +6,18 @@ Feature: Open and save files
     Then there should be one edit tab
     And I should see "Wintersmith" in the edit tab
 
+  Scenario: Open a file using another Redcar invocation
+    Given I open "plugins/project/spec/fixtures/winter.txt" using the redcar command
+    Then there should be one edit tab
+    And my active tab should be "winter.txt"
+    And I should see "Wintersmith" in the edit tab
+
+  Scenario: Open a new file using a Pipe
+    Given I pipe "hi" into redcar
+    Then there should be one edit tab
+    And my active tab should be "untitled"
+    And I should see "hi" in the edit tab
+
   Scenario: Opening an already open file focusses the edit tab
     Given I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog
     When I open a file
@@ -29,6 +41,27 @@ Feature: Open and save files
     Then the file "plugins/project/spec/fixtures/winter2.txt" should contain "Wintersmith"
     And I should see "Wintersmith" in the edit tab
 
+  Scenario: Open a file using another Redcar invocation and waiting for the tab to be closed
+    Given I open "plugins/project/spec/fixtures/winter.txt" using the redcar command with "-w"
+    And I wait "2" seconds
+    Then there should be one edit tab
+    And my active tab should be "winter.txt"
+    And I should see "Wintersmith" in the edit tab
+    And the redcar command should not have returned
+    Given I close the focussed tab
+    Then the redcar command should have returned
+
+  Scenario: Open a new file using a Pipe and waiting for the tab to be closed
+    Given I pipe "hi" into redcar with "-w"
+    And I wait "2" seconds
+    Then there should be one edit tab
+    And my active tab should be "untitled"
+    And I should see "hi" in the edit tab
+    And the redcar command should not have returned
+    Given I will choose "no" from the "message_box" dialog
+    And I close the focussed tab
+    Then the redcar command should have returned
+
   Scenario: Open file in nearest ancestor project window
     Given I will choose "plugins/project/spec" from the "open_directory" dialog
     When I open a directory

data/plugins/project/features/open_directory_tree.feature

@@ -5,6 +5,10 @@ Feature: Open directory tree
     When I open a directory
     Then I should see "bin,lib,plugins" in the tree
 
+  Scenario: Open a directory using another Redcar invocation
+    Given I open "plugins/project/spec/fixtures/myproject" using the redcar command
+    Then the window should have title "myproject"
+
   Scenario: Open directory then another directory
     Given I will choose "." from the "open_directory" dialog
     When I open a directory
@@ -12,6 +16,13 @@ Feature: Open directory tree
     When I open a directory
     Then I should see "core,application,tree" in the tree
 
+  Scenario: Open a directory and then the same using another Redcar invocation
+    Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
+    When I open a directory
+    And I open "plugins/project/spec/fixtures/myproject" using the redcar command
+    Then there should be 1 windows
+    And the window should have title "myproject"
+
   Scenario: Title of window reflects open project
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
     When I open a directory
@@ -33,29 +44,44 @@ Feature: Open directory tree
     When I restore the window size
     Then the tree width should be the default
 
-  Scenario: Toggle Tree Visibility hides the treebook if the sash is visible, else it opens it
+  Scenario: Toggle Tree Visibility hides the treebook if the tab title is visible, else it opens it
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
     When I open a directory
-    Then the tree width should be the default
-    When I toggle tree visibility
-    Then the tree width should be 0
-    When I manually widen the treebook to show the sash
+    And I set the treebook width to the default
     And I toggle tree visibility
-    Then the tree width should be 0
-    When I manually widen the treebook only a few pixels
+    Then the tree width should be the minimum size
+    When I set the treebook width to only a few pixels
     And I toggle tree visibility
     Then the tree width should be the default
 
   Scenario: Treebook becomes visible if hidden and another tree is opened
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
     When I open a directory
-    Then the tree width should be the default
-    When I toggle tree visibility
-    Then the tree width should be 0
+    And I set the treebook width to the default
+    And I toggle tree visibility
+    Then the tree width should be the minimum size
     When I open the runnables tree
     Then the tree width should be the default
     And I toggle tree visibility
-    Then the tree width should be 0
+    Then the tree width should be the minimum size
+    
+  Scenario: Treebooks should keep open to their previous open width
+    Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
+    When I open a directory
+    When I set the treebook width to the default
+    And I set the treebook width to 50 pixels
+    And I toggle tree visibility
+    Then the tree width should be the minimum size
+    When I toggle tree visibility
+    Then the tree width should be 50 pixels
+    When I set the treebook width to 250 pixels
+    And I toggle tree visibility
+    And I toggle tree visibility
+    Then the tree width should be 250 pixels
+    When I toggle tree visibility
+    And I set the treebook width to 35 pixels
+    And I toggle tree visibility
+    Then the tree width should be the minimum size
 
 # RSpec matchers have trouble with the multibyte string
 #  Scenario: Multibyte files and directories

data/plugins/project/features/step_definitions/directory_steps.rb

@@ -4,7 +4,7 @@ When /I open a directory/ do
 end
 
 When /I close the directory/ do
-  Redcar::Project::DirectoryCloseCommand.new.run
+  Redcar::Project::Manager.focussed_project.close
 end
 
 When /^I refresh the directory tree$/ do

data/plugins/project/features/step_definitions/drb_steps.rb

@@ -0,0 +1,40 @@
+require 'timeout'
+require 'drb'
+
+def drb
+  DRbObject.new(nil, "druby://127.0.0.1:#{Redcar::DRB_PORT}")
+end
+
+def tempfile(text)
+  f = Tempfile.open("drb_testing")
+  f << text
+  f.close
+  f.path
+end
+
+Given /^I open "([^"]*)" using the redcar command$/ do |path|
+  drb_answer = drb.open_item_drb(File.expand_path(path))
+  drb_answer.should == "ok"
+end
+
+Given /^I open "([^"]*)" using the redcar command with "-w"$/ do |path|
+  DrbShelloutHelper.drb_system_thread = Thread.new(path) do
+    drb_answer = drb.open_item_drb(File.expand_path(path), false, true)
+  end
+end
+
+Given /^I pipe "([^"]*)" into redcar with "-w"$/ do |text|
+  DrbShelloutHelper.drb_system_thread = Thread.new(text) do
+    drb_answer = drb.open_item_drb(tempfile(text), true, true)
+  end
+end
+
+Given /^I pipe "([^"]*)" into redcar$/ do |text|
+  drb_answer = drb.open_item_drb(tempfile(text), true)
+  drb_answer.should == "ok"
+end
+
+Then /^the redcar command should (not )?have returned$/ do |returned|
+  (!!DrbShelloutHelper.drb_system_thread.status).should be !!returned # status is false for returned thread
+end
+

data/plugins/project/features/support/env.rb

@@ -1,4 +1,20 @@
 
+module DrbShelloutHelper
+  def self.drb_system_thread
+    $drb_system_thread
+  end
+
+  def self.drb_system_thread= value
+    $drb_system_thread = value
+  end
+
+  def self.kill_thread
+    if !($drb_system_thread.nil?) and $drb_system_thread.status
+      $drb_system_thread.kill
+    end
+  end
+end
+
 def fixtures_path
   File.expand_path(File.dirname(__FILE__) + "/../../spec/fixtures")
 end
@@ -36,4 +52,5 @@ end
 After do
   reset_project_fixtures
   delete_subproject_fixtures
+  DrbShelloutHelper.kill_thread
 end

data/plugins/project/lib/project.rb

@@ -22,6 +22,7 @@ require "project/support/trash"
 require "project/commands"
 require "project/dir_mirror"
 require "project/dir_controller"
+require "project/project_tree_controller"
 require "project/drb_service"
 require "project/file_list"
 require "project/file_mirror"
@@ -96,9 +97,14 @@ module Redcar
     end
 
     def attach_listeners
+      attach_notebook_listeners
+      window.treebook.add_listener(:tree_removed, &method(:tree_removed))
+    end
+
+    def attach_notebook_listeners
       window.add_listener(:notebook_focussed, &method(:notebook_focussed))
-      window.add_listener(:notebook_closed, &method(:notebook_closed))
-      window.add_listener(:notebook_added, &method(:notebook_added))
+      window.add_listener(:notebook_removed, &method(:notebook_closed))
+      window.add_listener(:new_notebook, &method(:notebook_added))
       if notebooks = window.notebooks
         notebooks.each do |nb|
           notebook_added(nb)
@@ -120,6 +126,10 @@ module Redcar
       @listeners.delete(notebook)
     end
 
+    def tree_removed(tree)
+      close if tree == @tree
+    end
+
     # Refresh the DirMirror Tree for the given Window, if
     # there is one.
     def refresh