redcar 0.7 → 0.8

data/plugins/project/lib/project/drb_service.rb

@@ -9,26 +9,10 @@ module Redcar
           puts 'warning--not starting listener (perhaps theres another Redcar already open?)' + e + ' ' + address
         end
       end
-    
-      def open_item_untitled(path)
+
+      def open_item_drb(full_path, untitled = false)
         begin
-          puts 'drb opening untitled ' + full_path if $VERBOSE
-          if File.file?(path)
-            Swt.sync_exec do
-              Project::Manager.open_untitled_path(path)
-              Redcar.app.focussed_window.controller.bring_to_front
-            end
-          end
-          'ok'
-        rescue Exception => e
-          puts 'drb got exception:' + e.class + " " + e.message, e.backtrace
-          raise e
-        end 
-      end
-      
-      def open_item_drb(full_path)
-        begin
-          puts 'drb opening ' + full_path if $VERBOSE
+          puts %{drb opening #{"untitled" if untitled} #{full_path}} if $VERBOSE
           if File.directory? full_path
             Swt.sync_exec do
               if Redcar.app.windows.length == 0 and Application.storage['last_open_dir'] == full_path
@@ -60,7 +44,11 @@ module Redcar
               if Redcar.app.windows.length == 0
                 Project::Manager.restore_last_session
               end
-              Project::Manager.open_file(full_path)
+              if untitled
+                Project::Manager.open_untitled_path(full_path)
+              else
+                Project::Manager.open_file(full_path)
+              end
               Redcar.app.focussed_window.controller.bring_to_front
             end
             'ok'            
@@ -68,7 +56,33 @@ module Redcar
         rescue Exception => e
           puts 'drb got exception:' + e.class + " " + e.message, e.backtrace
           raise e
-        end 
+        end
+      end
+
+      def open_file_and_wait(file, untitled = false)
+        semaphore = Mutex.new
+        handler = nil
+        tab = nil
+        Swt.sync_exec do
+          semaphore.lock
+          Project::Manager.restore_last_session if Redcar.app.windows.empty?
+          if untitled
+            Project::Manager.open_untitled_path(file)
+          else
+            Project::Manager.open_file(file)
+          end
+          window = Redcar.app.focussed_window
+          window.controller.bring_to_front
+          tab = window.focussed_notebook_tab
+          handler = tab.add_listener(:close) { semaphore.unlock }
+        end
+        Thread.new(tab, handler) do
+          semaphore.synchronize { tab.remove_listener(handler) }
+        end.join # Wait until the tab's close event was fired
+        'ok'
+      rescue Exception => e
+        puts 'drb got exception:' + e.class + " " + e.message, e.backtrace
+        raise e
       end
       
     end

data/plugins/project/lib/project/file_list.rb

@@ -41,7 +41,13 @@ module Redcar
         paths.collect!{|d| d.dup}
         while file = paths.shift
           begin
-            stat = File.lstat(file)
+            if File.symlink? file
+              real_file = File.expand_path(File.join("..", File.readlink(file)), file)
+              real_file = File.expand_path(File.join("..", File.readlink(real_file)), real_file) while File.symlink? real_file
+              stat = File.lstat(real_file)
+            else
+              stat = File.lstat(file)
+            end
             unless file =~ /\.git|\.yardoc|\.svn/
               unless stat.directory?
                 files[file.dup] = stat.mtime

data/plugins/project/lib/project/manager.rb

@@ -143,7 +143,9 @@ module Redcar
       end
 
       def self.find_projects_containing_path(path)
-        open_projects.select {|project| project.contains_path?(path) }
+        open_projects.select {|p|
+          p.contains_path?(path)
+        }.sort_by {|p| path.split(//).length-p.path.split(//).length}
       end
 
       def self.open_file(path, adapter=Adapters::Local.new)
@@ -180,6 +182,18 @@ module Redcar
         end
       end
 
+      # Opens a subproject in a new window
+      # @param [String] project_path  the project path to fork
+      # @param [String] path  the path of the directory to view
+      def self.open_subproject(project_path,path)
+        win = Redcar.app.focussed_window
+        win = Redcar.app.new_window if !win or Manager.in_window(win)
+        project = Redcar::Project::SubProject.new(project_path,path).tap do |p|
+          p.open(win) if p.ready?
+          win.title = "Subproject: #{File.basename(path)} in #{File.basename(project_path)}"
+        end
+      end
+
       # The currently focussed Project, or nil if none.
       #
       # @return [Project]
@@ -222,6 +236,17 @@ module Redcar
         found_path_args
       end
 
+      def self.update_tab_for_path(path,new_path=nil)
+        if tab = Manager.find_open_file_tab(path)
+          if new_path
+            mirror = Project::FileMirror.new(new_path)
+            tab.edit_view.document.mirror = mirror
+          else
+            tab.update_for_file_changes
+          end
+        end
+      end
+
       def self.open_untitled_path(path)
         begin
           if File.file?(path) and contents = File.read(path)
@@ -297,7 +322,6 @@ module Redcar
 
             group(:priority => 11) do
               item "Close Directory", Project::DirectoryCloseCommand
-              item "Reveal in Project", Project::RevealInProjectCommand
             end
           end
           sub_menu "Project", :priority => 15 do
@@ -332,7 +356,8 @@ module Redcar
               item("in File Browser") { Project::OpenDirectoryInExplorerCommand.new(enclosing_dir).run }
               item("in Command Line") { Project::OpenDirectoryInCommandLineCommand.new(enclosing_dir).run }
               unless enclosing_dir == tree.tree_mirror.path
-                item("as new Project")  { Manager.open_project_for_path(enclosing_dir) }
+                item("as new Project") { Manager.open_project_for_path(enclosing_dir) }
+                item("as Subproject")  { Manager.open_subproject(tree.tree_mirror.path,enclosing_dir) }
               end
             end
           end

data/plugins/project/lib/project/sub_project.rb

@@ -0,0 +1,17 @@
+
+module Redcar
+  class Project
+    class SubProject < Project
+
+      def initialize(project_path, path, adapter=Adapters::Local.new)
+        super(path,adapter)
+        @project=project_path
+      end
+
+      def config_files(glob)
+        file_glob = File.join("#{@project}/.redcar", glob)
+        super + Dir[file_glob]
+      end
+    end
+  end
+end

data/plugins/project/lib/project/support/recycle.js

@@ -0,0 +1,2 @@
+var Path = WScript.Arguments(0);
+WScript.CreateObject("Shell.Application").Namespace(0).ParseName(Path).InvokeVerb("delete");

data/plugins/project/lib/project/support/trash.rb

@@ -0,0 +1,72 @@
+module Redcar
+  class Project
+    module Trash
+      WINDOWS_SUPPORT_JS = File.expand_path("../recycle.js", __FILE__)
+
+      class << self
+        def recycle(file)
+          file = File.expand_path(file)
+          case Redcar.platform
+          when :windows then windows(file)
+          when :osx then osx(file)
+          when :linux then linux(file)
+          end
+        end
+
+        def osx(file)
+          system %{ osascript -e "tell application \\"Finder\\"
+                      move (POSIX file \\"#{file}\\") to the trash
+                    end tell" }
+        end
+
+        def windows(file)
+          system %{ cscript //nologo #{WINDOWS_SUPPORT_JS} "#{file}" }
+        end
+
+        # Move paths to FreeDesktop Trash can
+        # See <http://www.ramendik.ru/docs/trashspec.html>
+        def linux(file)
+          trashdir = File.expand_path("#{(ENV['XDG_DATA_HOME'] || '~/.local/share')}/Trash")
+          FileUtils.mkdir_p("#{trashdir}/files")
+          FileUtils.mkdir_p("#{trashdir}/info")
+
+          # Create unique filename
+          deleted_path = "#{trashdir}/files/#{File.basename(file)}"
+          while File.exist?(deleted_path)
+            deleted_path = "#{trashdir}/files/#{File.basename(file)}-#{Time.now.to_i}"
+          end
+
+          # Write trashinfo
+          trashinfo = "#{trashdir}/info/#{File.basename(deleted_path)}.trashinfo"
+          File.open(trashinfo, 'w') do |f|
+            f << "[Trash Info]\n"
+            f << "Path=#{file}\n"
+            f << "DeletionDate=#{DateTime.now.strftime('%Y%m%dT%H:%M:%S')}\n"
+          end
+
+          begin
+            FileUtils.mv(file, deleted_path)
+          rescue SystemCallError
+            # We cannot move - this usually happens if the file is on another partition
+            # The proper way to go would be to check for a partition-topdir .Trash directory
+            # We do not support this right now - the spec allows us to copy-and-remove in this case
+            if File.directory? file
+              # FileUtils.cp_r copies src-dir always _into_ dest-dir
+              # But we want src-dir's contents to be the contents of dest-dir
+              FileUtils.mkdir_p deleted_path
+              FileUtils.cp_r("#{file}/.", deleted_path)
+            else
+              FileUtils.cp(file, deleted_path)
+            end
+            FileUtils.rm_rf(file)
+          end
+
+          return true
+        rescue SystemCallError
+          FileUtils.rm(trashinfo) if File.exist? trashinfo
+          return false
+        end
+      end
+    end
+  end
+end

data/plugins/project/spec/fixtures/multi-byte-files/a/341/204/200/341/205/247/341/206/274/341/204/205/341/205/251/foo

@@ -0,0 +1 @@
+nonsense words

data/plugins/project/spec/fixtures/multi-byte-files//341/204/220/341/205/246/341/204/211/341/205/263/341/204/220/341/205/263.py

@@ -0,0 +1 @@
+foofsoo

data/plugins/project/spec/project/file_list_spec.rb

@@ -30,6 +30,10 @@ describe FileList do
       @file_list.all_files.include?(relative_path("README")).should be_true
       @file_list.all_files.include?(relative_path("lib", "foo_lib.rb")).should be_true
     end
+
+    it "should return a list of files in a symlinked directory" do
+      @file_list.all_files.include?(relative_path("lib_symlink", "foo_lib.rb")).should be_true
+    end
   end
   
   describe "update information" do

data/plugins/redcar/features/goto_line_command.feature

@@ -0,0 +1,20 @@
+
+@speedbar
+Feature: Goto line command
+
+  Background:
+    Given I open a new edit tab
+
+  Scenario: Open goto line speedbar
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command Redcar::Top::GotoLineCommand
+    Then the Redcar::Top::GotoLineCommand::Speedbar speedbar should be open
+
+  Scenario: Search for a word should select next occurrence
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command Redcar::Top::GotoLineCommand
+    And I type "2" into the "line" field in the speedbar
+    And I press "Go" in the speedbar
+    Then the cursor should be on line 1

data/plugins/redcar/redcar.rb

@@ -82,7 +82,12 @@ module Redcar
     class NewCommand < Command
 
       def execute
-        tab = win.new_tab(Redcar::EditTab)
+        unless win.nil?
+          tab = win.new_tab(Redcar::EditTab)
+        else
+          window = Redcar.app.new_window
+          tab = window.new_tab(Redcar::EditTab)
+        end
         tab.title = "untitled"
         tab.focus
         tab
@@ -216,9 +221,31 @@ module Redcar
 
     class CloseTreeCommand < Command
       def execute
-        treebook = Redcar.app.focussed_window.treebook
-        tree = treebook.focussed_tree
-        treebook.remove_tree(tree)
+        win = Redcar.app.focussed_window
+        if win and treebook = win.treebook
+          if tree = treebook.focussed_tree
+            if tree.tree_mirror.is_a?(Project::DirMirror)
+              Redcar::Application::Dialog.message_box(
+              "Use the \"Close Directory\" command to close this project"
+              )
+            else
+              treebook.remove_tree(tree)
+            end
+          end
+        end
+      end
+    end
+
+    class ToggleTreesCommand < Command
+      def execute
+        win = Redcar.app.focussed_window
+        if win and treebook = win.treebook
+          if win.trees_visible?
+            win.set_trees_visible(false)
+          else
+            win.set_trees_visible(true)
+          end
+        end
       end
     end
 
@@ -407,8 +434,22 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
-    class MoveBottomCommand < DocumentCommand
+    class MoveNextLineCommand < DocumentCommand
+      def execute
+        doc = tab.edit_view.document
+        line_ix = doc.line_at_offset(doc.cursor_offset)
+        if line_ix == doc.line_count - 1
+          doc.cursor_offset = doc.length
+        else
+          doc.cursor_offset = doc.offset_at_line(line_ix + 1) - doc.delim.length
+        end
+        doc.ensure_visible(doc.cursor_offset)
+        doc.insert(doc.cursor_offset, "\n")
+
+      end
+    end
 
+    class MoveBottomCommand < DocumentCommand
       def execute
         doc.cursor_offset = doc.length
         doc.ensure_visible(doc.length)
@@ -550,30 +591,34 @@ Redcar.environment: #{Redcar.environment}
         cursor_line  = doc.cursor_line
         cursor_line_offset = doc.cursor_line_offset
         diff = 0
-        doc.controllers(AutoIndenter::DocumentController).first.disable do
-          doc.selection_ranges.each do |range|
-            doc.delete(range.begin - diff, range.count)
-            diff += range.count
-          end
-          texts = Redcar.app.clipboard.last.dup
-          texts.each_with_index do |text, i|
-            line_ix = start_line + i
-            if line_ix == doc.line_count
-              doc.insert(doc.length, "\n" + " "*line_offset)
-            else
-              line = doc.get_line(line_ix).chomp
-              if line.length < line_offset
-                doc.insert(
-                doc.offset_at_inner_end_of_line(line_ix),
-                " "*(line_offset - line.length)
-                )
+        doc.controllers(AutoPairer::DocumentController).first.disable do
+          doc.controllers(AutoIndenter::DocumentController).first.disable do
+            doc.controllers(AutoCompleter::DocumentController).first.start_modification
+            doc.selection_ranges.each do |range|
+              doc.delete(range.begin - diff, range.count)
+              diff += range.count
+            end
+            texts = Redcar.app.clipboard.last.dup
+            texts.each_with_index do |text, i|
+              line_ix = start_line + i
+              if line_ix == doc.line_count
+                doc.insert(doc.length, "\n" + " "*line_offset)
+              else
+                line = doc.get_line(line_ix).chomp
+                if line.length < line_offset
+                  doc.insert(
+                  doc.offset_at_inner_end_of_line(line_ix),
+                  " "*(line_offset - line.length)
+                  )
+                end
               end
+              doc.insert(
+              doc.offset_at_line(line_ix) + line_offset,
+              text
+              )
+              doc.cursor_offset = doc.offset_at_line(line_ix) + line_offset + text.length
             end
-            doc.insert(
-            doc.offset_at_line(line_ix) + line_offset,
-            text
-            )
-            doc.cursor_offset = doc.offset_at_line(line_ix) + line_offset + text.length
+            doc.controllers(AutoCompleter::DocumentController).first.end_modification
           end
         end
       end
@@ -607,15 +652,15 @@ Redcar.environment: #{Redcar.environment}
         cursor_ix = doc.cursor_offset
         if doc.selection?
           start_ix = doc.selection_range.begin
-          text = doc.selected_text                              
-    
+          text = doc.selected_text
+
           sorted_text = text.split("\n").sort().join("\n")
           doc.replace_selection(sorted_text)
           doc.cursor_offset = cursor_ix
         end
       end
     end
-    
+
     class DialogExample < Redcar::Command
       def execute
       	builder = Menu::Builder.new do
@@ -641,23 +686,22 @@ Redcar.environment: #{Redcar.environment}
 
         button :go, "Go", "Return" do
           new_line_ix = line.value.to_i - 1
-          if new_line_ix < doc.line_count and new_line_ix >= 0
-            doc.cursor_offset = doc.offset_at_line(new_line_ix)
-            doc.scroll_to_line(new_line_ix)
-            win.close_speedbar
+          if new_line_ix < @doc.line_count and new_line_ix >= 0
+            @doc.cursor_offset = @doc.offset_at_line(new_line_ix)
+            @doc.scroll_to_line(new_line_ix)
+            @win.close_speedbar
           end
         end
 
-        def initialize(command)
+        def initialize(command, win)
           @command = command
+          @doc     = command.doc
+          @win     = win
         end
-
-        def doc; @command.doc; end
-        def win; @command.send(:win); end
       end
 
       def execute
-        @speedbar = GotoLineCommand::Speedbar.new(self)
+        @speedbar = GotoLineCommand::Speedbar.new(self, win)
         win.open_speedbar(@speedbar)
       end
     end
@@ -681,6 +725,12 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
+    class ToggleFullscreen < Command
+      def execute
+        Redcar.app.focussed_window.fullscreen = !Redcar.app.focussed_window.fullscreen
+      end
+    end
+
     class ToggleInvisibles < Redcar::EditTabCommand
       def execute
         EditView.show_invisibles = !EditView.show_invisibles?
@@ -743,11 +793,12 @@ Redcar.environment: #{Redcar.environment}
         #link "Cmd+Ctrl+O",  Project::OpenRemoteCommand
         link "Cmd+S",       Project::FileSaveCommand
         link "Cmd+Shift+S", Project::FileSaveAsCommand
-        link "Cmd+Ctrl+R",  Project::RevealInProjectCommand
         link "Cmd+W",       CloseTabCommand
         link "Cmd+Shift+W", CloseWindowCommand
         link "Cmd+Q",       QuitCommand
 
+        #link "Cmd+Return",   MoveNextLineCommand
+
         link "Cmd+Shift+E", EditView::InfoSpeedbarCommand
         link "Cmd+Z",       UndoCommand
         link "Cmd+Shift+Z", RedoCommand
@@ -766,6 +817,7 @@ Redcar.environment: #{Redcar.environment}
         link "Cmd+Shift+I", AutoIndenter::IndentCommand
         link "Cmd+L",       GotoLineCommand
         link "Cmd+F",       DocumentSearch::SearchForwardCommand
+        link "Cmd+H",       DocumentSearch::SearchAndReplaceCommand
         #link "Cmd+Shift+F", DocumentSearch::RepeatPreviousSearchForwardCommand
         link "Cmd+Ctrl+F",  DocumentSearch::SearchAndReplaceCommand
         link "Cmd+Shift+F", Redcar::FindInProject::OpenSearch
@@ -789,11 +841,13 @@ Redcar.environment: #{Redcar.environment}
         link "Cmd+Shift+]",     SwitchTabUpCommand
         link "Ctrl+Shift+[",    MoveTabDownCommand
         link "Ctrl+Shift+]",    MoveTabUpCommand
+        link "F11",             ToggleFullscreen
         link "Cmd+Alt+I",       ToggleInvisibles
         link "Ctrl+R",          Runnables::RunEditTabCommand
         link "Cmd+I",           OutlineView::OpenOutlineViewCommand
 
         link "Ctrl+Shift+P",    PrintScopeCommand
+        link "Cmd+Shift+H",     ToggleTreesCommand
 
         link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
 
@@ -816,11 +870,12 @@ Redcar.environment: #{Redcar.environment}
         #link "Alt+Shift+O",  Project::OpenRemoteCommand
         link "Ctrl+S",       Project::FileSaveCommand
         link "Ctrl+Shift+S", Project::FileSaveAsCommand
-        link "Ctrl+Shift+R", Project::RevealInProjectCommand
         link "Ctrl+W",       CloseTabCommand
         link "Ctrl+Shift+W", CloseWindowCommand
         link "Ctrl+Q",       QuitCommand
 
+        link "Ctrl+Enter",   MoveNextLineCommand
+
         link "Ctrl+Shift+E", EditView::InfoSpeedbarCommand
         link "Ctrl+Z",       UndoCommand
         link "Ctrl+Y",       RedoCommand
@@ -839,6 +894,7 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+Shift+[", AutoIndenter::IndentCommand
         link "Ctrl+L",       GotoLineCommand
         link "Ctrl+F",       DocumentSearch::SearchForwardCommand
+        link "Ctrl+H",       DocumentSearch::SearchAndReplaceCommand
         link "F3",           DocumentSearch::RepeatPreviousSearchForwardCommand
         link "Ctrl+Shift+F", Redcar::FindInProject::OpenSearch
         link "Ctrl+A",       SelectAllCommand
@@ -862,16 +918,18 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+Shift+P",    PrintScopeCommand
 
         link "Ctrl+Alt+O",       SwitchNotebookCommand
-
+        link "Ctrl+Shift+H",     ToggleTreesCommand
         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+R",     PluginManagerUi::ReloadLastReloadedCommand
+        link "F11",              ToggleFullscreen
         link "Ctrl+Alt+I",       ToggleInvisibles
         link "Ctrl+I",           OutlineView::OpenOutlineViewCommand
 
         link "Ctrl+Alt+S", Snippets::OpenSnippetExplorer
+
         #Textmate.attach_keybindings(self, :linux)
 
         # map SelectTab<number>Command
@@ -896,10 +954,9 @@ Redcar.environment: #{Redcar.environment}
         item "New Notebook", :command => NewNotebookCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "book--plus.png"), :barname => :edit
         item "Close Notebook", :command => CloseNotebookCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "book--minus.png"), :barname => :edit
       end
-
     end
 
-    def self.menus
+    def self.menus(window)
       Menu::Builder.build do
         sub_menu "File", :priority => :first do
           group(:priority => :first) do
@@ -949,7 +1006,7 @@ Redcar.environment: #{Redcar.environment}
               item "Toggle Block Selection", ToggleBlockSelectionCommand
             end
           end
-          
+
           group(:priority => 40) do
             sub_menu "Document Navigation" do
               item "Goto Line", GotoLineCommand
@@ -982,6 +1039,8 @@ Redcar.environment: #{Redcar.environment}
             item "Font Size", SelectFontSize
             item "Theme", SelectTheme
           end
+          item "Toggle Tree Visibility", :command => ToggleTreesCommand
+          item "Toggle Fullscreen", :command => ToggleFullscreen, :type => :check, :active => window ? window.fullscreen : false
           separator
           item "New Notebook", NewNotebookCommand
           item "Close Notebook", CloseNotebookCommand
@@ -1015,7 +1074,7 @@ Redcar.environment: #{Redcar.environment}
           end
         end
         sub_menu "Help", :priority => :last do
-          group(:priority => :first) do
+          group(:priority => :last) do
             item "About", AboutCommand
             item "New In This Version", ChangelogCommand
           end
@@ -1070,7 +1129,8 @@ Redcar.environment: #{Redcar.environment}
         s = Time.now
         Redcar::Project::Manager.start(args)
         puts "project start took #{Time.now - s}s"
-        Redcar.app.make_sure_at_least_one_window_open
+        win = Redcar.app.make_sure_at_least_one_window_open
+        win.close if win and args.include?("--no-window")
       end
       Redcar.update_gui do
         Swt.splash_screen.close if Swt.splash_screen