redcar 0.3.7.1 → 0.3.8

data/plugins/redcar/plugin.rb

@@ -8,7 +8,9 @@ Plugin.define do
                "application",       ">0",
                "project",           ">0",
                "Auto Completer",    ">0",
-               "auto_indenter",    ">0",
+               "auto_indenter",     ">0",
+               "document_search",   ">0",
+               "runnables",         ">0",
                "HTML View",         ">=0.3.2",
                "Plugin Manager UI", ">=0.3.2"
 end

data/plugins/redcar/redcar.rb

@@ -17,13 +17,37 @@ module Redcar
     end
   end
   
+  def self.update_gui
+    ApplicationSWT.sync_exec do
+      safely do
+        yield
+      end
+    end
+  end
+  
   module Top
     class QuitCommand < Command
       
       def execute
+        check_for_modified_tabs_and_quit
+      end
+      
+      private
+
+      def check_for_modified_tabs_and_quit
         EditView::ModifiedTabsChecker.new(
           Redcar.app.all_tabs.select {|t| t.is_a?(EditTab)},
           "Save all before quitting?",
+          :none     => lambda { check_for_running_processes_and_quit },
+          :continue => lambda { check_for_running_processes_and_quit },
+          :cancel   => nil
+        ).check
+      end        
+      
+      def check_for_running_processes_and_quit
+        Runnables::RunningProcessChecker.new(
+          Redcar.app.all_tabs.select {|t| t.is_a?(HtmlTab)},
+          "Kill all and quit?",
           :none     => lambda { Redcar.app.quit },
           :continue => lambda { Redcar.app.quit },
           :cancel   => nil
@@ -90,6 +114,16 @@ module Redcar
         EditView::ModifiedTabsChecker.new(
           win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(EditTab)}, 
           "Save all before closing the window?",
+          :none     => lambda { check_for_running_processes_and_close_window },
+          :continue => lambda { check_for_running_processes_and_close_window },
+          :cancel   => nil
+        ).check
+      end
+      
+      def check_for_running_processes_and_close_window
+        Runnables::RunningProcessChecker.new(
+          win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(HtmlTab)}, 
+          "Kill them and close the window?",
           :none     => lambda { win.close },
           :continue => lambda { win.close },
           :cancel   => nil
@@ -156,6 +190,14 @@ module Redcar
       end
     end
     
+    class CloseTreeCommand < Command
+      def execute
+        treebook = Redcar.app.focussed_window.treebook
+        tree = treebook.focussed_tree
+        treebook.remove_tree(tree)
+      end
+    end
+    
     class AboutCommand < Command
       def execute
         new_tab = Top::NewCommand.new.run          
@@ -219,6 +261,22 @@ module Redcar
           else
             close_tab
           end
+        elsif tab.is_a?(HtmlTab)
+          if tab.html_view.controller and message = tab.html_view.controller.ask_before_closing
+            result = Application::Dialog.message_box(
+              message,
+              :buttons => :yes_no_cancel
+            )
+            case result
+            when :yes
+              close_tab
+            when :no
+              close_tab
+            when :cancel
+            end
+          else
+            close_tab
+          end
         else
           close_tab
         end
@@ -251,6 +309,20 @@ module Redcar
       end
     end
     
+    class MoveTabUpCommand < Command
+      
+      def execute
+        win.focussed_notebook.move_up
+      end
+    end
+    
+    class MoveTabDownCommand < Command
+      
+      def execute
+        win.focussed_notebook.move_down
+      end
+    end
+    
     class UndoCommand < EditTabCommand
       sensitize :undoable
       
@@ -307,7 +379,7 @@ module Redcar
         if line_ix == doc.line_count - 1
           doc.cursor_offset = doc.length
         else
-          doc.cursor_offset = doc.offset_at_line(line_ix + 1) - 1
+          doc.cursor_offset = doc.offset_at_line(line_ix + 1) - doc.delim.length
         end
         doc.ensure_visible(doc.cursor_offset)
       end
@@ -393,7 +465,7 @@ module Redcar
     class SelectAllCommand < Redcar::EditTabCommand
     
       def execute
-        doc.set_selection_range(doc.length, 0)
+        doc.select_all
       end
     end
     
@@ -405,6 +477,14 @@ module Redcar
       end
     end
     
+    class SelectWordCommand < Redcar::EditTabCommand
+
+      def execute
+        range = doc.current_word_range
+        doc.set_selection_range(range.first, range.last)
+      end
+    end
+    
     class CutCommand < Redcar::DocumentCommand
     
       def execute
@@ -544,115 +624,6 @@ module Redcar
       end
     end
     
-    class SearchForwardCommand < Redcar::EditTabCommand
-      
-      class SearchSpeedbar < Redcar::Speedbar
-        class << self
-          attr_accessor :previous_query
-          attr_accessor :previous_is_regex
-          attr_accessor :previous_match_case
-        end
-        
-        def after_draw
-          self.query.value = SearchSpeedbar.previous_query || ""
-          self.is_regex.value = SearchSpeedbar.previous_is_regex
-          self.match_case.value = SearchSpeedbar.previous_match_case
-          self.query.edit_view.document.select_all
-        end
-      
-        label :label, "Search:"
-        textbox :query        
-        
-        toggle :is_regex, 'Regex', nil, false do |v|
-          # v is true or false
-          SearchSpeedbar.previous_is_regex = v          
-        end
-        
-        toggle :match_case, 'Match case', nil, false do |v|
-          SearchSpeedbar.previous_match_case = v          
-        end      
-        
-        button :search, "Search", "Return" do
-          SearchSpeedbar.previous_query = query.value
-          SearchSpeedbar.previous_match_case = match_case.value
-          SearchSpeedbar.previous_is_regex = is_regex.value
-          success = SearchSpeedbar.repeat_query
-        end
-        
-        def self.repeat_query
-          current_query = @previous_query
-          if !@previous_is_regex
-            current_query = Regexp.escape(current_query)
-          end
-          FindNextRegex.new(Regexp.new(current_query, !@previous_match_case), true).run
-        end
-      end
-      
-      def execute
-        @speedbar = SearchSpeedbar.new
-        win.open_speedbar(@speedbar)
-      end
-      
-    end
-    
-    class RepeatPreviousSearchForwardCommand < Redcar::EditTabCommand      
-      def execute
-        SearchForwardCommand::SearchSpeedbar.repeat_query
-      end
-    end
-    
-    class FindNextRegex < Redcar::EditTabCommand
-      def initialize(re, wrap=nil)
-        @re = re
-        @wrap = wrap
-      end
-  
-      def to_s
-        "<#{self.class}: @re:#{@re.inspect} wrap:#{!!@wrap}>"
-      end
-  
-      def execute
-        # first search the remainder of the current line
-        curr_line = doc.get_line(doc.cursor_line)
-        cursor_line_offset = doc.cursor_offset - doc.offset_at_line(doc.cursor_line)
-        curr_line = curr_line[cursor_line_offset..-1]
-        if curr_line =~ @re
-          line_start = doc.offset_at_line(doc.cursor_line)
-          startoff = line_start + $`.length + cursor_line_offset
-          endoff   = startoff + $&.length
-          doc.set_selection_range(endoff, startoff)
-        elsif doc.cursor_line < doc.line_count - 1
-          # next search the rest of the lines
-          found_line_offset = nil
-          found_line_num = nil
-          found_length = nil
-          line_nums = ((doc.cursor_line() + 1)..(doc.line_count() - 1)).to_a # the rest of the document
-          if @wrap
-            line_nums += (0..doc.cursor_line()).to_a
-          end
-          for line_num in line_nums do
-            curr_line = doc.get_line(line_num)
-            if new_offset = (curr_line.to_s =~ @re)
-              found_line_offset = new_offset
-              found_line_num = line_num
-              found_length = $&.length
-              break
-            end
-          end
-          if found_line_num
-            line_start = doc.offset_at_line(found_line_num)
-            startoff = line_start + found_line_offset
-            endoff   = startoff + found_length
-            doc.scroll_to_line(found_line_num)
-            doc.set_selection_range(endoff, startoff)
-            true
-          else
-           false
-          end
-        end
-      end
-    end
-    
     class ToggleBlockSelectionCommand < Redcar::EditTabCommand
       
       def execute
@@ -722,6 +693,7 @@ module Redcar
         link "Cmd+Shift+O", Project::DirectoryOpenCommand
         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
@@ -743,9 +715,10 @@ module Redcar
         link "Cmd+]",       IncreaseIndentCommand
         link "Cmd+Shift+I", AutoIndenter::IndentCommand
         link "Cmd+L",       GotoLineCommand
-        link "Cmd+F",       SearchForwardCommand
-        link "Cmd+G",       RepeatPreviousSearchForwardCommand
+        link "Cmd+F",       DocumentSearch::SearchForwardCommand
+        link "Cmd+Shift+F",           DocumentSearch::RepeatPreviousSearchForwardCommand
         link "Cmd+A",       SelectAllCommand
+        link "Ctrl+W",      SelectWordCommand
         link "Cmd+B",       ToggleBlockSelectionCommand
         #link "Escape", AutoCompleter::AutoCompleteCommand
         link "Ctrl+Escape",  AutoCompleter::MenuAutoCompleterCommand
@@ -755,6 +728,9 @@ module Redcar
         link "Cmd+Alt+O",       SwitchNotebookCommand
         link "Cmd+Shift+[",     SwitchTabDownCommand
         link "Cmd+Shift+]",     SwitchTabUpCommand
+        link "Ctrl+Shift+[",    MoveTabDownCommand
+        link "Ctrl+Shift+]",    MoveTabUpCommand
+        link "Ctrl+R",          Runnables::RunEditTabCommand
 
         link "Ctrl+Shift+P",    PrintScopeCommand
         
@@ -778,6 +754,7 @@ module Redcar
         link "Ctrl+Shift+O", Project::DirectoryOpenCommand
         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
@@ -799,22 +776,26 @@ module Redcar
         link "Ctrl+]",       IncreaseIndentCommand
         link "Ctrl+Shift+[", AutoIndenter::IndentCommand
         link "Ctrl+L",       GotoLineCommand
-        link "Ctrl+F",       SearchForwardCommand
-        link "F3",           RepeatPreviousSearchForwardCommand
+        link "Ctrl+F",       DocumentSearch::SearchForwardCommand
+        link "F3",           DocumentSearch::RepeatPreviousSearchForwardCommand
         link "Ctrl+A",       SelectAllCommand
+        link "Ctrl+Alt+W",   SelectWordCommand
         link "Ctrl+B",       ToggleBlockSelectionCommand
         link "Ctrl+Space",       AutoCompleter::AutoCompleteCommand
         link "Ctrl+Shift+Space", AutoCompleter::MenuAutoCompleterCommand
         
         link "Ctrl+T",           Project::FindFileCommand
         link "Ctrl+Shift+Alt+O", MoveTabToOtherNotebookCommand
+        link "Ctrl+R",           Runnables::RunEditTabCommand
         
         link "Ctrl+Shift+P",    PrintScopeCommand
 
         link "Ctrl+Alt+O",       SwitchNotebookCommand
         
-        link "Ctrl+Page Up",       SwitchTabDownCommand
-        link "Ctrl+Page Down",     SwitchTabUpCommand
+        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 "Ctrl+Alt+S", Snippets::OpenSnippetExplorer
@@ -846,8 +827,10 @@ module Redcar
           item "Save As", Project::FileSaveAsCommand
           separator
           item "Close Tab", CloseTabCommand
+          item "Close Tree", CloseTreeCommand
           item "Close Window", CloseWindowCommand
           item "Close Directory", Project::DirectoryCloseCommand
+          item "Reveal in Project", Project::RevealInProjectCommand
           separator
           item "Quit", QuitCommand
         end
@@ -872,12 +855,13 @@ module Redcar
           item "Indent",          AutoIndenter::IndentCommand
           separator
           item "Goto Line", GotoLineCommand
-          item "Regex Search",    SearchForwardCommand
-          item "Repeat Last Search", RepeatPreviousSearchForwardCommand
+          item "Regex Search",    DocumentSearch::SearchForwardCommand
+          item "Repeat Last Search", DocumentSearch::RepeatPreviousSearchForwardCommand
           separator
           sub_menu "Select" do
             item "All", SelectAllCommand
             item "Line", SelectLineCommand
+            item "Current Word", SelectWordCommand
           end
           item "Toggle Block Selection", ToggleBlockSelectionCommand
           item "Auto Complete",          AutoCompleter::AutoCompleteCommand
@@ -886,8 +870,9 @@ module Redcar
         sub_menu "Project" do
           item "Find File", Project::FindFileCommand
           item "Refresh Directory", Project::RefreshDirectoryCommand
-          #separator
-          #item "Runnables", Runnables::ShowRunnables
+          separator
+          item "Runnables", Runnables::ShowRunnables
+          item "Run Tab",   Runnables::RunEditTabCommand
         end
         sub_menu "Debug" do
           item "Task Manager", TaskManager::OpenCommand
@@ -910,6 +895,8 @@ module Redcar
           separator
           item "Previous Tab", SwitchTabDownCommand
           item "Next Tab", SwitchTabUpCommand
+          item "Move Tab Left", MoveTabDownCommand
+          item "Move Tab Right", MoveTabUpCommand
           sub_menu "Switch Tab" do
              (1..9).each do |num|
                item "Tab #{num}", Top.const_get("SelectTab#{num}Command")

data/plugins/redcar_debug/lib/redcar_debug.rb

@@ -66,6 +66,8 @@ module Redcar
       end
         
       class Controller
+        include Redcar::HtmlController
+        
         def title
           "History"
         end

data/plugins/runnables/lib/runnables.rb

@@ -1,15 +1,37 @@
 
+require File.dirname(__FILE__) + "/../vendor/session-2.4.0/lib/session"
+Session.use_open4 = true
+
+require 'runnables/command_output_controller'
+require 'runnables/running_process_checker'
+
 module Redcar
   class Runnables
+    TREE_TITLE = "Runnables"
+    
+    def self.run_process(command)
+      tab = Redcar.app.focussed_window.new_tab(HtmlTab)
+      controller = CommandOutputController.new(command)
+      tab.html_view.controller = controller
+      tab.focus
+    end
     
     class TreeMirror
       include Redcar::Tree::Mirror
       
       def initialize(project)
-        runnables = project.config_file(:runnables)
-        if runnables
-          @top = runnables.map do |name, info|
-            Runnable.new(name, info)
+        runnable_file_paths = project.config_files("runnables/*.json")
+        
+        runnables = []
+        runnable_file_paths.each do |path|
+          json = File.read(path)
+          this_runnables = JSON(json)["commands"]
+          runnables += this_runnables || []
+        end
+
+        if runnables.any?
+          @top = runnables.map do |runnable|
+            Runnable.new(runnable["name"], runnable)
           end
         else
           @top = [HelpItem.new]
@@ -17,7 +39,7 @@ module Redcar
       end
       
       def title
-        "Runnables"
+        TREE_TITLE
       end
       
       def top
@@ -46,25 +68,23 @@ module Redcar
       end
       
       def leaf?
-        @info[:command]
+        @info["command"]
       end
       
       def icon
         if leaf?
           File.dirname(__FILE__) + "/../icons/cog.png"
+        else
+          :directory
         end
       end
       
       def children
-        return [] if leaf?
-        
-        @info.map do |name, info|
-          Runnable.new(name, info)
-        end
+        []
       end
       
       def command
-        @info[:command]
+        @info["command"]
       end
     end
     
@@ -76,24 +96,61 @@ module Redcar
       end
       
       def activated(tree, node)
-        command = node.command
-        output = `#{command}`
-        tab = Redcar.app.focussed_window.new_tab(EditTab)
-        tab.edit_view.document.text = output
-        tab.title = node.text
-        tab.focus
+        case node
+        when Runnable
+          Runnables.run_process(node.command)
+        when HelpItem
+          tab = Redcar.app.focussed_window.new_tab(HtmlTab)
+          tab.go_to_location("http://wiki.github.com/danlucraft/redcar/users-guide-runnables")
+          tab.title = "Runnables Help"
+          tab.focus
+        end
       end
     end
     
     class ShowRunnables < Redcar::Command
       def execute
+        if tree = win.treebook.trees.detect {|tree| tree.tree_mirror.title == TREE_TITLE }
+          win.treebook.focus_tree(tree)
+        else
+          project = Project::Manager.in_window(win)
+          tree = Tree.new(
+              TreeMirror.new(project),
+              TreeController.new(project)
+            )
+          win.treebook.add_tree(tree)
+        end
+      end
+    end
+    
+    class RunEditTabCommand < Redcar::EditTabCommand
+      def file_mappings
         project = Project::Manager.in_window(win)
-        tree = Tree.new(
-            TreeMirror.new(project),
-            TreeController.new(project)
-          )
-        win.treebook.add_tree(tree)
+        runnable_file_paths = project.config_files("runnables/*.json")
+        
+        file_runners = []
+        runnable_file_paths.each do |path|
+          json = File.read(path)
+          this_file_runners = JSON(json)["file_runners"]
+          file_runners += this_file_runners || []
+        end
+        file_runners
+      end
+      
+      def execute
+        file_mappings.each do |file_mapping|
+          regex = Regexp.new(file_mapping["regex"])
+          if tab.edit_view.document.mirror.path =~ regex
+            command_schema = file_mapping["command"]
+            command = command_schema.gsub("__PATH__", tab.edit_view.document.mirror.path)
+            puts command
+            Runnables.run_process(command)
+          end
+        end
       end
     end
   end
 end
+
+
+