redcar 0.7 → 0.8

data/plugins/open_default_app/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "open_default_app"
+  version "0.1"
+  file    "lib", "open_default_app.rb"
+  object  "Redcar::OpenDefaultApp"
+  dependencies "redcar", ">0"
+end

data/plugins/plugin_manager_ui/lib/plugin_manager_ui.rb

@@ -12,14 +12,28 @@ module Redcar
         sub_menu "Plugins", :priority => 40 do
           group(:priority => :first) {
             item "Plugin Manager", PluginManagerUi::OpenCommand
-            item "Reload Again", PluginManagerUi::ReloadLastReloadedCommand
-            item("Edit Preferences") { Project::Manager.open_project_for_path(Redcar::Plugin::Storage.storage_dir) }
+            item "Reload Plugins", PluginManagerUi::ReloadLastReloadedCommand
             separator
           }
         end
+        if Redcar.platform == :linux or Redcar.platform == :windows
+          sub_menu "Edit" do
+            group(:priority => :last) do
+              separator
+              item "Preferences", PluginManagerUi::OpenPreferencesCommand
+            end
+          end
+        end
       end
     end
-    
+
+    class OpenPreferencesCommand < Redcar::Command
+      def execute
+        project = Project::Manager.open_project_for_path(Redcar::Plugin::Storage.storage_dir)
+        project.window.title = "Plugin Preferences"
+      end
+    end
+
     class ReloadLastReloadedCommand < Redcar::Command
       
       def execute

data/plugins/project/features/find_file.feature

@@ -26,9 +26,10 @@ Feature: Find file
     When I run the command Redcar::Project::FindFileCommand
     And I set the filter to "foo"
     And I wait "0.4" seconds
-    Then the filter dialog should have 2 entries
+    Then the filter dialog should have 3 entries
     And I should see "foo_lib.rb (myproject/lib)" at 0 the filter dialog
-    And I should see "foo_spec.rb (myproject/spec)" at 1 the filter dialog
+    And I should see "foo_lib.rb (myproject/lib_symlink)" at 1 the filter dialog
+    And I should see "foo_spec.rb (myproject/spec)" at 2 the filter dialog
     
   Scenario: One matching file with arbitrary letters
     When I run the command Redcar::Project::FindFileCommand

data/plugins/project/features/highlight_focussed_tab.feature

@@ -0,0 +1,8 @@
+Feature: Highlight the File of the focussed tab in tree
+
+  Scenario: Opening a file should reveal it 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 there should be one edit tab
+    And "highlight_focussed_tab.feature" should be selected in the project tree

data/plugins/project/features/move_and_rename_files.feature

@@ -0,0 +1,25 @@
+# Feature: Moving and renaming files
+
+#   Background:
+#     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
+#     When I open a directory
+#
+#   Scenario: Renaming a file which is currently open
+#     Given I will choose "plugins/project/spec/fixtures/myproject/test1/a.txt" from the "open_file" dialog
+#     When I open a file
+#     Given I will choose "summer.txt" as the rename text
+#     When I rename the "a.txt" node in the tree
+#     Then my active tab should be "summer.txt"
+#
+#   Scenario: Bulk renaming files which are currently open
+#     Given I will choose "plugins/project/spec/fixtures/myproject/test1/a.txt" from the "open_file" dialog
+#     When I open a file
+#     Given I will choose "plugins/project/spec/fixtures/myproject/test1/b.txt" from the "open_file" dialog
+#     When I open a file
+#     And I bulk rename the "a.txt,b.txt" nodes in the tree replacing "" with "Test"
+#     Then my active tab should be "Testb.txt"
+#     When I close the focussed tab
+#     Then my active tab should be "Testa.txt"
+
+# There isn't a good way to simulate file rename text entry at this moment
+

data/plugins/project/features/open_and_save_files.feature

@@ -14,7 +14,7 @@ Feature: Open and save files
     And I open a file
     Then there should be 2 edit tabs
     And I should see "Wintersmith" in the edit tab
-  
+
   Scenario: Save a file
     Given I have opened "plugins/project/spec/fixtures/winter.txt"
     When I replace the contents with "Hi!"
@@ -29,3 +29,12 @@ 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 file in nearest ancestor project window
+    Given I will choose "plugins/project/spec" from the "open_directory" dialog
+    When I open a directory
+    Given I will choose "plugins/project/spec/fixtures" from the "open_directory" dialog
+    When I open a directory
+    Given I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog
+    When I open a file
+    Then the window "fixtures" should have 1 tab
+

data/plugins/project/features/open_directory_tree.feature

@@ -11,7 +11,7 @@ Feature: Open directory tree
     Given I will choose "plugins" from the "open_directory" dialog
     When I open a directory
     Then I should see "core,application,tree" in the tree
-  
+
   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
@@ -32,4 +32,34 @@ Feature: Open directory tree
     Then the tree width should be the default
     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
+    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 toggle tree visibility
+    Then the tree width should be 0
+    When I manually widen the treebook 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
+    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
+
+# RSpec matchers have trouble with the multibyte string
+#  Scenario: Multibyte files and directories
+#    Given I will choose "plugins/project/spec/fixtures/multi-byte-files" from the "open_directory" dialog
+#    When I open a directory
+#    Then the window should have title "multi-byte-files"
+#    Then I should see "a경로,테스트.py" in the tree

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

@@ -15,4 +15,21 @@ When /^I move the myproject fixture away$/ do
   FileUtils.mv("plugins/project/spec/fixtures/myproject",
                "plugins/project/spec/fixtures/myproject.bak")
   @put_myproject_fixture_back = true
+end
+
+When /^I open a "([^"]*)" as a subproject of the current directory$/ do |arg1|
+  path = Redcar::Project::Manager.focussed_project.path
+  Redcar::Project::Manager.open_subproject(path,path + arg1)
+end
+
+Then /^"([^"]*)" in the project configuration files$/ do |arg1|
+  project = Redcar::Project::Manager.focussed_project
+  project.config_files(arg1).each do |file|
+    File.exist?(file).should == true
+  end
+end
+
+When /^"([^"]*)" goes missing$/ do |arg1|
+  FileUtils.rm(arg1)
+  File.exists?(arg1).should == false
 end

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

@@ -0,0 +1,3 @@
+Then /^"([^\"]*)" should be selected in the project tree$/ do |filename|
+  Redcar.app.focussed_window.treebook.focussed_tree.selection.first.text == filename
+end

data/plugins/project/features/sub_project.feature

@@ -0,0 +1,14 @@
+Feature: Opening subprojects with shared configuration files
+
+  Background:
+    Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
+    When I open a directory
+
+  Scenario: Opening a subproject
+    When I open a "/test1" as a subproject of the current directory
+    Then I should see "a.txt,b.txt,c.txt" in the tree
+    And "test_config" in the project configuration files
+
+  Scenario: Title of window reflects open subproject
+    When I open a "/test1" as a subproject of the current directory
+    Then the window should have title "Subproject: test1 in myproject"

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

@@ -1,4 +1,7 @@
-RequireSupportFiles File.dirname(__FILE__) + "/../../../edit_view/features/"
+
+def fixtures_path
+  File.expand_path(File.dirname(__FILE__) + "/../../spec/fixtures")
+end
 
 def reset_project_fixtures
   if @put_myproject_fixture_back
@@ -6,9 +9,24 @@ def reset_project_fixtures
     FileUtils.mv("plugins/project/spec/fixtures/myproject.bak",
                  "plugins/project/spec/fixtures/myproject")
   end
-  fixtures_path = File.expand_path(File.dirname(__FILE__) + "/../../spec/fixtures")
   File.open(fixtures_path + "/winter.txt", "w") {|f| f.print "Wintersmith" }
   FileUtils.rm_rf(fixtures_path + "/winter2.txt")
+  make_subproject_fixtures
+end
+
+def make_subproject_fixtures
+  FileUtils.mkdir_p(fixtures_path + "/myproject/test1")
+  FileUtils.mkdir_p(fixtures_path + "/myproject/test2")
+  FileUtils.mkdir_p(fixtures_path + "/myproject/.redcar")
+  File.open(fixtures_path + "/myproject/.redcar/test_config", "w") {|f| f.print "this is a config file" }
+  File.open(fixtures_path + "/myproject/test1/a.txt", "w") {|f| f.print "this is a project file" }
+  File.open(fixtures_path + "/myproject/test1/b.txt", "w") {|f| f.print "this is a project file" }
+  File.open(fixtures_path + "/myproject/test1/c.txt", "w") {|f| f.print "this is a project file" }
+end
+
+def delete_subproject_fixtures
+  FileUtils.rm_rf(fixtures_path + "/myproject/test1")
+  FileUtils.rm_rf(fixtures_path + "/myproject/test2")
 end
 
 Before do
@@ -17,4 +35,5 @@ end
 
 After do
   reset_project_fixtures
-end
+  delete_subproject_fixtures
+end

data/plugins/project/features/watch_for_modified_files.feature

@@ -1,11 +1,11 @@
 Feature: Watch for modified files
   If an open file has changed on disc since the last time the user looked at it,
   then reload the contents. Alert the user if they have made modifications.
-  
+
   Background:
     Given I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog
     When I open a file
-  
+
   Scenario: Without modifications
     Then there should be one edit tab
     And I should see "Wintersmith" in the edit tab
@@ -25,7 +25,7 @@ Feature: Watch for modified files
     Given I will choose "yes" from the "message_box" dialog
     And I close the focussed tab
     Then I should see "Summer" in the edit tab
-  
+
   Scenario: With modifications, keeping modified version
     Then there should be one edit tab
     And I should see "Wintersmith" in the edit tab
@@ -36,7 +36,7 @@ Feature: Watch for modified files
     Given I will choose "no" from the "message_box" dialog
     And I close the focussed tab
     Then I should see "Newton" in the edit tab
-  
+
   Scenario: With modifications, keeping modified version, twice
     Then there should be one edit tab
     And I should see "Wintersmith" in the edit tab
@@ -50,7 +50,7 @@ Feature: Watch for modified files
     When I open a new edit tab
     Then I should not see a "message_box" dialog for the rest of the feature
     And I close the focussed tab
-  
+
   Scenario: Keep in the same position in the file when reloading
     Given I close the focussed tab
     And I put a lot of lines into the file "plugins/project/spec/fixtures/winter.txt"
@@ -62,7 +62,7 @@ Feature: Watch for modified files
     And I put a lot of lines into the file "plugins/project/spec/fixtures/winter.txt"
     And I close the focussed tab
     Then the cursor should be on line 100
-    
+
   Scenario: Move to the top if the line you were on is no longer there
     Given I close the focussed tab
     And I put a lot of lines into the file "plugins/project/spec/fixtures/winter.txt"
@@ -74,6 +74,29 @@ Feature: Watch for modified files
     And I put "Summer" into the file "plugins/project/spec/fixtures/winter.txt"
     And I close the focussed tab
     Then the cursor should be on line 0
-    
-  
-  
+
+  Scenario: The file being mirrored by the current unmodified tab is externally deleted
+    Then there should be one edit tab
+    And I should see "Wintersmith" in the edit tab
+    When I open a new window with title "new"
+    When I wait "2" seconds
+    And "plugins/project/spec/fixtures/winter.txt" goes missing
+    And I close the window "new" through the gui
+    And I focus the window "Redcar" through the gui
+    Then there should be one edit tab
+    And my active tab should have an "exclamation" icon
+
+  Scenario: The file being mirrored by the current modified tab is externally deleted
+    Then there should be one edit tab
+    And I should see "Wintersmith" in the edit tab
+    When I replace the contents with "Jenny Green Eyes"
+    And I open a new window with title "new"
+    And I wait "2" seconds
+    And "plugins/project/spec/fixtures/winter.txt" goes missing
+    And I close the window "new" through the gui
+    And I focus the window "Redcar" through the gui
+    Then my active tab should have an "exclamation" icon
+    When I save the tab
+    Then my active tab should have an "file" icon
+
+

data/plugins/project/lib/project.rb

@@ -17,6 +17,8 @@ require "project/adapters/remote_protocols/ftp"
 require "project/adapters/local"
 require "project/adapters/remote"
 
+require "project/support/trash"
+
 require "project/commands"
 require "project/dir_mirror"
 require "project/dir_controller"
@@ -26,20 +28,23 @@ require "project/file_mirror"
 require "project/find_file_dialog"
 require "project/manager"
 require "project/recent_directories"
+require "project/sub_project"
 
 module Redcar
   class Project
     RECENT_FILES_LENGTH = 20
-  
+
     def self.window_projects
       @window_projects ||= {}
     end
-    
+
     attr_reader :window, :tree, :path, :adapter
+    attr_accessor :listeners
 
     def initialize(path, adapter=Adapters::Local.new)
       @adapter = adapter
       @path   = File.expand_path(path)
+      @listeners ||= {}
       dir_mirror = Project::DirMirror.new(@path, adapter)
       if dir_mirror.exists?
         @tree   = Tree.new(dir_mirror, Project::DirController.new)
@@ -49,11 +54,11 @@ module Redcar
         raise "#{path} doesn't seem to exist"
       end
     end
-    
+
     def remote?
       adapter.is_a?(Adapters::Remote)
     end
-    
+
     def ready?
       @tree && @path
     end
@@ -61,13 +66,14 @@ module Redcar
     def inspect
       "<Project #{path}>"
     end
-    
+
     def open(win)
       @window = win
       if current_project = Project.window_projects[window]
         current_project.close
       end
       window.treebook.add_tree(@tree)
+      attach_listeners
       window.title = File.basename(@tree.tree_mirror.path)
       Manager.open_project_sensitivity.recompute
       Redcar.plugin_manager.objects_implementing(:project_loaded).each do |i|
@@ -77,7 +83,7 @@ module Redcar
       Manager.storage['last_open_dir'] = path
       Project.window_projects[window] = self
     end
-    
+
     def close
       window.treebook.remove_tree(@tree)
       Project.window_projects.delete(window)
@@ -86,26 +92,52 @@ module Redcar
       Redcar.plugin_manager.objects_implementing(:project_closed).each do |i|
         i.project_closed(self)
       end
+      listeners = {}
+    end
+
+    def attach_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))
+      if notebooks = window.notebooks
+        notebooks.each do |nb|
+          notebook_added(nb)
+        end
+      end
+    end
+
+    def notebook_focussed(notebook)
+      RevealInProjectCommand.new.run if notebook.focussed_tab && tree
+    end
+
+    def notebook_added(notebook)
+      @listeners.merge!(notebook => notebook.add_listener(:tab_focussed) do |tab|
+        RevealInProjectCommand.new.run if tree
+      end)
+    end
+
+    def notebook_closed(notebook)
+      @listeners.delete(notebook)
     end
-    
-    # Refresh the DirMirror Tree for the given Window, if 
+
+    # Refresh the DirMirror Tree for the given Window, if
     # there is one.
     def refresh
       @tree.refresh
       file_list_resource.compute unless remote?
     end
-    
+
     def contains_path?(path)
       File.expand_path(path) =~ /^#{Regexp.escape(@path)}($|\/|\\)/
     end
-    
+
     # A list of files previously opened in this session for this project
     #
     # @return [Array<String>] an array of paths
     def recent_files
       @recent_files ||= []
     end
-    
+
     def add_to_recent_files(new_file)
       new_file = File.expand_path(new_file)
       if recent_files.include?(new_file)
@@ -116,54 +148,54 @@ module Redcar
         recent_files.shift
       end
     end
-    
+
     def file_list
       raise "can't access a file list for a remote project" if remote?
       @file_list ||= FileList.new(path)
     end
-    
+
     def file_list_resource
       @resource ||= Resource.new("refresh file list for #{@path}") do
         file_list.update
         send_refresh_to_plugins
       end
     end
-    
+
     def refresh_modified_file(path)
       file_list.update(path)
       @tree.refresh
       send_refresh_to_plugins
     end
-      
+
     def all_files
       file_list.all_files
     end
-    
+
     def send_refresh_to_plugins
       Redcar.plugin_manager.objects_implementing(:project_refresh_task_type).each do |object|
         Redcar.app.task_queue.submit(object.project_refresh_task_type.new(self))
       end
     end
-    
+
     def lost_application_focus
       @lost_application_focus = true
     end
-    
+
     def gained_focus
       refresh
       @lost_application_focus = nil
     end
-    
+
     def config_dir
       dir = File.join(path, ".redcar")
       FileUtils.mkdir_p(dir)
       dir
     end
-    
+
     def home_dir
       @path
     end
-    
+
     def config_files(glob)
       file_glob = File.join("{#{config_dir},#{Redcar.user_dir}}", glob)
       Dir[file_glob]