redcar 0.4.1 → 0.5

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

@@ -25,7 +25,7 @@ module Redcar
         puts e.backtrace
         Application::Dialog.message_box("Error connecting: #{e.message}", :type => :error)
       end
-      
+
       def self.get_password
         result = Redcar::Application::Dialog.password_input("Remote Connection", "Enter password")
         result[:value] if result
@@ -37,7 +37,7 @@ module Redcar
       # @param [String] path  the path of the directory to view
       def self.open_remote_project(adapter, path)
         win = Redcar.app.focussed_window
-        win = Redcar.app.new_window if !win or Manager.in_window(win) 
+        win = Redcar.app.new_window if !win or Manager.in_window(win)
         project = Project.new(path, adapter)
         project.open(win) if project.ready?
       end
@@ -49,22 +49,22 @@ module Redcar
       rescue SocketError
         raise "Cannot connect to #{host}. Error: #{$!.message}."
       end
-      
+
       def self.open_projects
         Project.window_projects.values
       end
-      
+
       # Returns the project in the given window
       # @param [Window] window
       # @return Project or nil
       def self.in_window(window)
         Project.window_projects[window]
       end
-      
+
       def self.windows_without_projects
         Redcar.app.windows.reject {|w| in_window(w) }
       end
-      
+
       # this will restore open files unless other files or dirs were passed
       # as command line parameters
       def self.start(args)
@@ -77,7 +77,7 @@ module Redcar
         init_window_closed_hooks
         init_drb_listener
       end
-      
+
       def self.init_window_closed_hooks
         Redcar.app.add_listener(:window_about_to_close) do |win|
           project = in_window(win)
@@ -85,28 +85,28 @@ module Redcar
           self.save_file_list(win)
         end
       end
-      
+
       def self.init_drb_listener
         return if ARGV.include?("--multiple-instance")
         @drb_service = DrbService.new
       end
-      
+
       def self.storage
-        @storage ||= Plugin::Storage.new('project_plugin')
+        @storage = Plugin::Storage.new('project_plugin')
       end
-      
+
       def self.filter_path
         if Redcar.app.focussed_notebook_tab
           if mirror = EditView.focussed_document_mirror and mirror.is_a?(FileMirror)
             dir = File.dirname(mirror.path)
             return dir
           end
-        end      
+        end
         storage['last_dir'] || File.expand_path(Dir.pwd)
       end
-    
+
       def self.sensitivities
-        [ @open_project_sensitivity = 
+        [ @open_project_sensitivity =
             Sensitivity.new(:open_project, Redcar.app, false, [:focussed_window]) do
               if win = Redcar.app.focussed_window
                 win.treebook.trees.detect {|t| t.tree_mirror.is_a?(DirMirror) }
@@ -114,7 +114,7 @@ module Redcar
             end
         ]
       end
-      
+
       # Finds an EditTab with a mirror for the given path.
       #
       # @param [String] path  the path of the file being edited
@@ -122,14 +122,14 @@ module Redcar
       def self.find_open_file_tab(path)
         path = File.expand_path(path)
         all_tabs = Redcar.app.windows.map {|win| win.notebooks}.flatten.map {|nb| nb.tabs }.flatten
-        all_tabs.find do |t| 
-          t.is_a?(Redcar::EditTab) and 
-          t.edit_view.document.mirror and 
-          t.edit_view.document.mirror.is_a?(FileMirror) and 
-          File.expand_path(t.edit_view.document.mirror.path) == path 
+        all_tabs.find do |t|
+          t.is_a?(Redcar::EditTab) and
+          t.edit_view.document.mirror and
+          t.edit_view.document.mirror.is_a?(FileMirror) and
+          File.expand_path(t.edit_view.document.mirror.path) == path
         end
       end
-      
+
       # Opens a new EditTab with a FileMirror for the given path.
       #
       # @path  [String] path the path of the file to be edited
@@ -141,11 +141,11 @@ module Redcar
         tab.edit_view.reset_undo
         tab.focus
       end
-      
+
       def self.find_projects_containing_path(path)
         open_projects.select {|project| project.contains_path?(path) }
       end
-      
+
       def self.open_file(path, adapter=Adapters::Local.new)
         if tab = find_open_file_tab(path)
           tab.focus
@@ -159,7 +159,7 @@ module Redcar
         open_file_in_window(path, window, adapter)
         window.focus
       end
-      
+
       def self.open_tab_with_content(text)
         win = Redcar.app.focussed_window || Redcar.app.new_window
         tab = win.new_tab(Redcar::EditTab)
@@ -167,26 +167,26 @@ module Redcar
         tab.edit_view.reset_undo
         tab.focus
       end
-      
+
       # Opens a new Tree with a DirMirror and DirController for the given
       # path, in a new window.
       #
       # @param [String] path  the path of the directory to view
       def self.open_project_for_path(path)
         win = Redcar.app.focussed_window
-        win = Redcar.app.new_window if !win or Manager.in_window(win) 
+        win = Redcar.app.new_window if !win or Manager.in_window(win)
         project = Project.new(path).tap do |p|
           p.open(win) if p.ready?
         end
       end
-      
+
       # The currently focussed Project, or nil if none.
       #
       # @return [Project]
       def self.focussed_project
         in_window(Redcar.app.focussed_window)
       end
-      
+
       # saves away a list of the currently open files in
       # @param [win]
       def self.save_file_list(win)
@@ -197,9 +197,9 @@ module Redcar
             file_list << tab.document.path
           end
         end
-        storage['files_open_last_session'] = file_list      
+        storage['files_open_last_session'] = file_list
       end
-      
+
       # handles files and/or dirs passed as command line arguments
       def self.handle_startup_arguments(args)
         found_path_args = false
@@ -221,7 +221,7 @@ module Redcar
         end
         found_path_args
       end
-      
+
       def self.open_untitled_path(path)
         begin
           if File.file?(path) and contents = File.read(path)
@@ -233,8 +233,8 @@ module Redcar
           puts e.backtrace
         end
       end
-      
-      # Attaches a new listener to tab focus change events, so we can 
+
+      # Attaches a new listener to tab focus change events, so we can
       # keep the current_files list.
       def self.init_current_files_hooks
         Redcar.app.add_listener(:tab_focussed) do |tab|
@@ -246,24 +246,24 @@ module Redcar
         end
         attach_app_listeners
       end
-      
+
       def self.attach_app_listeners
         Redcar.app.add_listener(:lost_focus) do
           Manager.open_projects.each {|project| project.lost_application_focus }
         end
-        
+
         Redcar.app.add_listener(:window_focussed) do |win|
           Manager.in_window(win).andand.gained_focus
         end
       end
-      
+
       # restores the directory/files in the last open window
       def self.restore_last_session
         if path = storage['last_open_dir']
           s = Time.now
           open_project_for_path(path)
         end
-        
+
         if files = storage['files_open_last_session']
           files.each do |path|
             open_file(path)
@@ -277,7 +277,7 @@ module Redcar
           project.refresh_modified_file(path)
         end
       end
-      
+
       def self.menus
         Menu::Builder.build do
           sub_menu "File" do
@@ -289,12 +289,12 @@ module Redcar
               lazy_sub_menu "Open Recent" do
                 Project::RecentDirectories.generate_menu(self)
               end
-              
+
               separator
               item "Save", Project::FileSaveCommand
               item "Save As", Project::FileSaveAsCommand
             end
-            
+
             group(:priority => 11) do
               item "Close Directory", Project::DirectoryCloseCommand
               item "Reveal in Project", Project::RevealInProjectCommand
@@ -308,15 +308,31 @@ module Redcar
           end
         end
       end
-      
+
       # Uses our own context menu hook to provide context menu entries
       # @return [Menu]
       def self.project_context_menus(tree, node, controller)
+        if node
+          if node.directory?
+            enclosing_dir = node.path
+          else
+            enclosing_dir = node.directory
+          end
+        else
+          enclosing_dir = tree.tree_mirror.path
+        end
         Menu::Builder.build do
           group(:priority => :first) do
             item("New File")        { controller.new_file(tree, node) }
             item("New Directory")   { controller.new_dir(tree, node)  }
           end
+          separator
+          sub_menu "Open Directory" do
+            group(:priority => 30) do
+              item("in File Browser") { Project::OpenDirectoryInExplorerCommand.new(enclosing_dir).run }
+              item("in Command Line") { Project::OpenDirectoryInCommandLineCommand.new(enclosing_dir).run }
+            end
+          end
           if not node.nil?
             group(:priority => 15) do
               separator
@@ -330,6 +346,8 @@ module Redcar
               end
               item("Delete")          { controller.delete(tree, node)   }
             end
+
+
           end
           group(:priority => 75) do
             separator
@@ -347,7 +365,7 @@ module Redcar
           end
         end
       end
-          
+
       class << self
         attr_reader :open_project_sensitivity
       end

data/plugins/project/lib/project.rb

@@ -8,6 +8,8 @@ unless defined?(DRb)
   require 'drb/drb'
 end
 
+require 'openssl'
+
 require "project/adapters/remote_protocols/protocol"
 require "project/adapters/remote_protocols/sftp"
 require "project/adapters/remote_protocols/ftp"

data/plugins/project/plugin.rb

@@ -7,5 +7,6 @@ Plugin.define do
   dependencies "edit_view", ">0",
                "HTML View", ">0",
                "connection_manager", ">0",
-               "application", ">=1.1"
+               "application", ">=1.1",
+               "tree", ">=0"
 end

data/plugins/project/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load
+Redcar.load_unthreaded
 
 def write_dir_contents(dirname, files)
   FileUtils.mkdir_p(dirname)

data/plugins/redcar/redcar.rb

@@ -5,17 +5,18 @@ module Redcar
       yield
     rescue => e
       message = "Error in: " + (text || e.message)
+      $stderr.puts message
+      $stderr.puts e.class.to_s + ": " + e.message
+      $stderr.puts e.backtrace
+      return if Redcar.no_gui_mode?
       Application::Dialog.message_box(
         message,
         :type => :error, :buttons => :ok)
-      puts message
-      puts e.class.to_s + ": " + e.message
-      puts e.backtrace
     end
   end
 
   def self.update_gui
-    ApplicationSWT.sync_exec do
+    Swt.sync_exec do
       safely do
         yield
       end
@@ -224,11 +225,12 @@ module Redcar
     class AboutCommand < Command
       def execute
         new_tab = Top::NewCommand.new.run
-        new_tab.document.text = "About: Redcar\nVersion: #{Redcar::VERSION}\n" +
-          "Ruby Version: #{RUBY_VERSION}\n" +
-          "Jruby version: #{JRUBY_VERSION}\n" +
-          "Redcar.environment: #{Redcar.environment}\n" +
-          "http://redcareditor.com"
+        new_tab.document.text = <<-TXT
+About: Redcar\nVersion: #{Redcar::VERSION}
+Ruby Version: #{RUBY_VERSION}
+Jruby version: #{JRUBY_VERSION}
+Redcar.environment: #{Redcar.environment}
+        TXT
         new_tab.title= 'About'
         new_tab.edit_view.reset_undo
         new_tab.document.set_modified(false)
@@ -553,29 +555,31 @@ module Redcar
         cursor_line  = doc.cursor_line
         cursor_line_offset = doc.cursor_line_offset
         diff = 0
-        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.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)
-              )
+                )
+              end
             end
-          end
-          doc.insert(
+            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.cursor_offset = doc.offset_at_line(line_ix) + line_offset + text.length
+          end
         end
       end
     end
@@ -693,13 +697,13 @@ module Redcar
         Redcar::EditView::SelectThemeDialog.new.open
       end
     end
-    
+
     class ShowTheme < Command
       def execute
-        
+
       end
     end
-    
+
     class SelectFontSize < Command
       def execute
         result = Application::Dialog.input("Font Size", "Please enter new font size", Redcar::EditView.font_size.to_s) do |text|
@@ -747,8 +751,9 @@ module Redcar
         link "Cmd+Shift+I", AutoIndenter::IndentCommand
         link "Cmd+L",       GotoLineCommand
         link "Cmd+F",       DocumentSearch::SearchForwardCommand
-        link "Cmd+Shift+F", DocumentSearch::RepeatPreviousSearchForwardCommand
+        #link "Cmd+Shift+F", DocumentSearch::RepeatPreviousSearchForwardCommand
         link "Cmd+Ctrl+F",  DocumentSearch::SearchAndReplaceCommand
+        link "Cmd+Shift+F", Redcar::FindInProject::OpenSearch
         link "Cmd+A",       SelectAllCommand
         link "Ctrl+W",      SelectWordCommand
         link "Cmd+B",       ToggleBlockSelectionCommand
@@ -771,7 +776,7 @@ module Redcar
         link "Cmd+Alt+I",       ToggleInvisibles
         link "Ctrl+R",          Runnables::RunEditTabCommand
         link "Cmd+I",           OutlineView::OpenOutlineViewCommand
-        
+
         link "Ctrl+Shift+P",    PrintScopeCommand
 
         link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
@@ -819,6 +824,7 @@ module Redcar
         link "Ctrl+L",       GotoLineCommand
         link "Ctrl+F",       DocumentSearch::SearchForwardCommand
         link "F3",           DocumentSearch::RepeatPreviousSearchForwardCommand
+        link "Ctrl+Shift+F", Redcar::FindInProject::OpenSearch
         link "Ctrl+A",       SelectAllCommand
         link "Ctrl+Alt+W",   SelectWordCommand
         link "Ctrl+B",       ToggleBlockSelectionCommand
@@ -847,7 +853,7 @@ module Redcar
         link "Ctrl+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
         link "Ctrl+Alt+I",       ToggleInvisibles
         link "Ctrl+I",           OutlineView::OpenOutlineViewCommand
-        
+
         link "Ctrl+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :linux)
 
@@ -959,15 +965,15 @@ module Redcar
              end
           end
           separator
-          item "Toggle Invisibles", :command => ToggleInvisibles, :type => :check, :active => EditView.show_invisibles?
-          item "Toggle Line Numbers", :command => ToggleLineNumbers, :type => :check, :active => EditView.show_line_numbers?
-          item "Toggle Annotations", :command => ToggleAnnotations, :type => :check, :active => EditView.show_annotations?
+          item "Show Invisibles", :command => ToggleInvisibles, :type => :check, :active => EditView.show_invisibles?
+          item "Show Line Numbers", :command => ToggleLineNumbers, :type => :check, :active => EditView.show_line_numbers?
+          item "Show Annotations", :command => ToggleAnnotations, :type => :check, :active => EditView.show_annotations?
         end
         sub_menu "Bundles", :priority => 45 do
           group(:priority => :first) do
             item "Find Snippet", Snippets::OpenSnippetExplorer
             item "Installed Bundles", Textmate::InstalledBundles
-            item "View Bundles in Tree", Textmate::ShowSnippetTree
+            item "Browse Snippets", Textmate::ShowSnippetTree
           end
           group(:priority => 15) do
             separator
@@ -1011,20 +1017,35 @@ module Redcar
 
     def self.start(args=[])
       puts "loading plugins took #{Time.now - PROCESS_START_TIME}"
-      Application.start
-      ApplicationSWT.start
-      EditViewSWT.start
-      s = Time.now
-      Redcar.gui = ApplicationSWT.gui
-      Redcar.app.controller = ApplicationSWT.new(Redcar.app)
-      Redcar.app.refresh_menu!
-      Redcar.app.load_sensitivities
-      puts "initializing gui took #{Time.now - s}s"
-      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
+      Redcar.update_gui do
+        Application.start
+        ApplicationSWT.start
+        Swt.splash_screen.inc(1) if Swt.splash_screen
+        EditViewSWT.start
+        Swt.splash_screen.inc(7) if Swt.splash_screen
+        s = Time.now
+        if Redcar.gui
+          Redcar.app.controller = ApplicationSWT.new(Redcar.app)
+        end
+        Redcar.app.refresh_menu!
+        Redcar.app.load_sensitivities
+        puts "initializing gui took #{Time.now - s}s"
+      end
+      Redcar.update_gui do
+        Swt.splash_screen.inc(2) if Swt.splash_screen
+        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
+      end
+      Redcar.update_gui do
+        Swt.splash_screen.close if Swt.splash_screen
+      end
       puts "start time: #{Time.now - $redcar_process_start_time}"
+      if args.include?("--compute-textmate-cache-and-quit")
+        Redcar::Textmate.all_bundles
+        exit
+      end
     end
   end
 end

data/plugins/repl/spec/repl/clojure_mirror_spec.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
 class Redcar::REPL
   describe ClojureMirror do
     before(:all) do

data/plugins/repl/spec/repl/ruby_mirror_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 class Redcar::REPL
   describe RubyMirror do

data/plugins/repl/spec/spec_helper.rb

@@ -2,4 +2,4 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load
+Redcar.load_unthreaded

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

@@ -13,7 +13,7 @@ end
 def reset_runnable_fixtures
   # Not sure why this is needed, perhaps next test is starting before full deletion?
   FileUtils.rm_rf runnable_fixtures
-  FileUtils.mkdir runnable_fixtures
+  FileUtils.mkdir_p runnable_fixtures
   FileUtils.mkdir_p File.dirname(runnable_config)
   
   File.open("#{runnable_fixtures}/runnable_app.rb", 'w') do |f|
@@ -26,20 +26,20 @@ def reset_runnable_fixtures
         "commands":[
           {
             "name":        "An app",
-            "command":     "ruby runnable_app.rb",
+            "command":     "jruby runnable_app.rb",
             "description": "Runs the app",
             "type":        "task/ruby"
             },
           {
             "name":        "A silent app",
-            "command":     "ruby runnable_app.rb",
+            "command":     "jruby runnable_app.rb",
             "description": "Runs the app silently",
             "type":        "task/ruby",
             "output":      "none"
           },
           {
             "name":        "A windowed app",
-            "command":     "ruby runnable_app.rb",
+            "command":     "jruby runnable_app.rb",
             "description": "Runs the app in a window",
             "type":        "task/ruby",
             "output":      "window"
@@ -47,9 +47,9 @@ def reset_runnable_fixtures
         ],
         "file_runners":[
           {
-            "regex":   ".*\\.rb",
+            "regex":   ".*\\\\.rb",
             "name":    "Run as ruby",
-            "command": "ruby __PATH__",
+            "command": "jruby \\"__PATH__\\"",
             "type":    "app/ruby"
           }
         ]
@@ -64,4 +64,4 @@ end
 
 After do
   FileUtils.rm_rf runnable_fixtures
-end
+end

data/plugins/runnables/lib/runnables/command_output_controller.rb

@@ -55,17 +55,17 @@ module Redcar
         @processor.process(text)
       end
       
-      def run_windows
-        @thread = Thread.new do
+      def output_thread(type, output)
+        Thread.new(output) do
+          instance_variable_set("@#{type}_thread_started", true)
           begin
-            start_output_block
-            output = `cd #{@path} & #{@cmd} 2>&1`
-            append_output <<-HTML
-            <div class="stdout">
-            #{process(output)}
-            </div>
-            HTML
-            end_output_block
+            while line = output.gets
+              append_output <<-HTML
+                <div class="#{type}">
+                  #{process(line)}
+                </div>
+              HTML
+            end
           rescue => e
             puts e.class
             puts e.message
@@ -74,6 +74,27 @@ module Redcar
         end
       end
       
+      def run_windows
+        Thread.new do
+          # TODO: Find browser's onload rather than sleeping
+          sleep 1
+          start_output_block
+          cmd = "cd \"#{@path.gsub('/', '\\')}\" & #{@cmd}"
+          Redcar.logger.info "Running: #{cmd}"
+          
+          # JRuby-specific
+          pid, input, output, error = IO.popen4(cmd)
+          @stdout_thread = output_thread(:stdout, output)
+          @stderr_thread = output_thread(:stderr, error)
+          
+          Thread.new do
+            sleep 0.1 until @stdout_thread_started && @stderr_thread_started &&
+                            !@stdout_thread.alive? && !@stderr_thread.alive?
+            end_output_block
+          end
+        end
+      end
+      
       def format_time(time)
         time.strftime("%I:%M:%S %p").downcase
       end

data/plugins/runnables/spec/spec_helper.rb

@@ -2,4 +2,4 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load
+Redcar.load_unthreaded