redcar 0.5.6dev → 0.6

data/plugins/line_tools/plugin.rb

@@ -0,0 +1,9 @@
+
+Plugin.define do
+  name    "line_tools"
+  version "0.1"
+  file    "lib", "line_tools"
+  object  "Redcar::LineTools"
+  dependencies "core", ">0",
+               "application", ">0"
+end

data/plugins/project/lib/project/commands.rb

@@ -256,6 +256,7 @@ module Redcar
           current = ancestor_node.children
         end
         tree.select(ancestor_node)
+        project.window.treebook.focus_tree(project.tree)
       end
     end
 

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

@@ -300,7 +300,7 @@ module Redcar
               item "Reveal in Project", Project::RevealInProjectCommand
             end
           end
-          sub_menu "Project" do
+          sub_menu "Project", :priority => 15 do
             group(:priority => :first) do
               item "Find File", Project::FindFileCommand
               item "Refresh Directory", Project::RefreshDirectoryCommand
@@ -331,6 +331,9 @@ module Redcar
             group(:priority => 30) do
               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) }
+              end
             end
           end
           if not node.nil?

data/plugins/project/spec/fixtures/myproject/README

@@ -1,2 +0,0 @@
-
-This is an example Ruby project.

data/plugins/project/spec/fixtures/myproject/lib/foo_lib.rb

@@ -1 +0,0 @@
-foo

data/plugins/redcar/redcar.rb

@@ -605,6 +605,22 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
+    class SortLinesCommand < Redcar::DocumentCommand
+
+      def execute
+        doc = tab.edit_view.document
+        cursor_ix = doc.cursor_offset
+        if doc.selection?
+          start_ix = doc.selection_range.begin
+          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
@@ -686,6 +702,14 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
+    class ToggleToolbar < Command
+
+      def execute
+        Redcar.app.toggle_show_toolbar
+        Redcar.app.refresh_toolbar!
+      end
+    end
+
     class SelectNewFont < Command
       def execute
         Redcar::EditView::SelectFontDialog.new.open
@@ -765,6 +789,7 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+Alt+U",   EditView::TitlizeTextCommand
         link "Ctrl+G",       EditView::OppositeCaseTextCommand
         link "Ctrl+_",       EditView::CamelSnakePascalRotateTextCommand
+        link "Ctrl+=",       EditView::AlignAssignmentCommand
 
         link "Cmd+T",           Project::FindFileCommand
         link "Cmd+Shift+Alt+O", MoveTabToOtherNotebookCommand
@@ -836,6 +861,7 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+Alt+U",   EditView::TitlizeTextCommand
         link "Ctrl+G",       EditView::OppositeCaseTextCommand
         link "Ctrl+_",       EditView::CamelSnakePascalRotateTextCommand
+        link "Ctrl+=",       EditView::AlignAssignmentCommand
 
         link "Ctrl+T",           Project::FindFileCommand
         link "Ctrl+Shift+Alt+O", MoveTabToOtherNotebookCommand
@@ -867,6 +893,21 @@ Redcar.environment: #{Redcar.environment}
       [linwin, osx]
     end
 
+    def self.toolbars
+      ToolBar::Builder.build do
+        item "New File", :command => NewCommand, :icon => :new, :barname => :core
+        item "Open File", :command => Project::FileOpenCommand, :icon => :open, :barname => :core
+        item "Open Directory", :command => Project::DirectoryOpenCommand, :icon => :open_dir, :barname => :core
+        item "Save File", :command => Project::FileSaveCommand, :icon => :save, :barname => :core
+        item "Save File As", :command => Project::FileSaveAsCommand, :icon => :save_as, :barname => :core
+        item "Undo", :command => UndoCommand, :icon => :undo, :barname => :core
+        item "Redo", :command => RedoCommand, :icon => :redo, :barname => :core
+        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
       Menu::Builder.build do
         sub_menu "File", :priority => :first do
@@ -903,6 +944,7 @@ Redcar.environment: #{Redcar.environment}
             item "Copy", CopyCommand
             item "Paste", PasteCommand
             item "Duplicate Region", DuplicateCommand
+            item "Sort Lines Region", SortLinesCommand
           end
 
           group(:priority => 25) do
@@ -965,6 +1007,7 @@ Redcar.environment: #{Redcar.environment}
              end
           end
           separator
+          item "Show Toolbar", :command => ToggleToolbar, :type => :check, :active => Redcar.app.show_toolbar?
           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?

data/plugins/repl/lib/repl.rb

@@ -1,14 +1,15 @@
 require 'repl/repl_mirror'
 require 'repl/ruby_mirror'
 require 'repl/clojure_mirror'
+require 'repl/groovy_mirror'
 
 module Redcar
   class REPL
     def self.sensitivities
       [
         Sensitivity.new(:open_repl_tab, Redcar.app, false, [:tab_focussed]) do |tab|
-          tab and 
-          tab.is_a?(EditTab) and 
+          tab and
+          tab.is_a?(EditTab) and
           tab.edit_view.document.mirror.is_a?(REPL::ReplMirror)
         end
       ]
@@ -19,38 +20,39 @@ module Redcar
         link "Cmd+Shift+M", REPL::RubyOpenREPL
         link "Cmd+M",       REPL::CommitREPL
       end
-      
+
       linwin = Keymap.build("main", [:linux, :windows]) do
         link "Ctrl+Shift+M", REPL::RubyOpenREPL
         link "Ctrl+M",       REPL::CommitREPL
       end
-      
+
       [linwin, osx]
     end
-    
+
     def self.menus
       Menu::Builder.build do
         sub_menu "Plugins" do
           sub_menu "REPL", :priority => 180 do
             item "Open Ruby REPL",    REPL::RubyOpenREPL
             item "Open Clojure REPL", REPL::ClojureOpenREPL
+            item "Open Groovy REPL", REPL::GroovyOpenREPL
             item "Execute", REPL::CommitREPL
             item "Clear History", REPL::ClearHistoryREPL
           end
         end
       end
     end
-    
+
     class OpenREPL < Command
-      
+
       def open_repl(mirror)
         tab = win.new_tab(Redcar::EditTab)
-        edit_view = tab.edit_view  
+        edit_view = tab.edit_view
         edit_view.document.mirror = mirror
         edit_view.cursor_offset = edit_view.document.length
         edit_view.grammar = mirror.grammar_name
         tab.focus
-        
+
         mirror.add_listener(:change) do
           edit_view.cursor_offset = edit_view.document.length
           edit_view.scroll_to_line(edit_view.document.line_count)
@@ -63,33 +65,39 @@ module Redcar
         open_repl(RubyMirror.new)
       end
     end
-    
+
     class ClojureOpenREPL < OpenREPL
       def execute
         open_repl(ClojureMirror.new)
       end
     end
-    
+
+    class GroovyOpenREPL < OpenREPL
+      def execute
+        open_repl(GroovyMirror.new)
+      end
+    end
+
     class ReplCommand < Command
       sensitize :open_repl_tab
     end
-    
+
     class CommitREPL < ReplCommand
-      
+
       def execute
         edit_view = win.focussed_notebook.focussed_tab.edit_view
         edit_view.document.save!
       end
     end
-    
+
     class ClearHistoryREPL < ReplCommand
-      
+
       def execute
         mirror = win.focussed_notebook.focussed_tab.edit_view.document.mirror
         mirror.clear_history
       end
     end
-    
+
   end
 end
 

data/plugins/repl/lib/repl/clojure_mirror.rb

@@ -4,9 +4,9 @@ module Redcar
     class ClojureMirror
       def self.load_clojure_dependencies
         unless @loaded
-          require File.dirname(__FILE__) + "/../../vendor/clojure.jar"
-          require File.dirname(__FILE__) + "/../../vendor/clojure-contrib.jar"
-          require File.dirname(__FILE__) + "/../../vendor/org-enclojure-repl-server.jar"
+          require File.join(Redcar.asset_dir, "clojure.jar")
+          require File.join(Redcar.asset_dir, "clojure-contrib.jar")
+          require File.join(Redcar.asset_dir, "org-enclojure-repl-server.jar")
           require File.dirname(__FILE__) + "/../../vendor/enclojure-wrapper.jar"
           
           import 'redcar.repl.Wrapper'

data/plugins/repl/lib/repl/groovy_mirror.rb

@@ -0,0 +1,84 @@
+
+require 'java'
+
+module Redcar
+  class REPL
+    class GroovyMirror
+      def self.load_groovy_dependencies
+        unless @loaded
+          require File.join(Redcar.asset_dir,"groovy-all")
+          import 'groovy.lang.GroovyShell'
+          import 'java.io.PrintWriter'
+          import 'java.io.StringWriter'
+          @loaded = true
+        end
+      end
+      include Redcar::REPL::ReplMirror
+
+      def initialize
+        GroovyMirror.load_groovy_dependencies
+        @prompt = "groovy>"
+        @history = "// Groovy REPL\n\n#{@prompt} "
+        @instance = Main.new
+      end
+
+      def title
+        "Groovy REPL"
+      end
+
+      def grammar_name
+        "Groovy REPL"
+      end
+
+      def read
+        @history
+      end
+
+      def clear_history
+        @history = @history.split("\n").last
+        notify_listeners(:change)
+      end
+
+      class Main
+        def initialize
+          @out = StringWriter.new
+          @shell = GroovyShell.new
+          @shell.setProperty('out',@out)
+        end
+
+        def inspect
+          "groovyREPL main"
+        end
+
+        def execute(cmd)
+          output = @shell.evaluate(cmd).to_s
+          output = "null" unless output and not output.strip.empty?
+          if @out and not @out.toString().strip.empty?
+            console = @out.toString() + "\n"
+          else
+            console = ""
+          end
+          buf = @out.getBuffer()
+          buf.delete(0,buf.length()) if buf.length() > 0
+          console + "===> #{output}"
+        end
+      end
+
+      def format_error(e)
+        backtrace = e.backtrace
+        "ERROR #{e.class}:\n #{e.message}\n        #{backtrace.join("\n        ")}"
+      end
+
+      def send_to_repl expr
+        @history += expr + "\n"
+        begin
+          @history += @instance.execute(expr)
+        rescue Object => e
+          @history += format_error(e)
+        end
+        @history += "\n" + @prompt + " "
+        notify_listeners(:change)
+      end
+    end
+  end
+end

data/plugins/repl/spec/repl/groovy_mirror_spec.rb

@@ -0,0 +1,55 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+class Redcar::REPL
+  describe GroovyMirror do
+    before(:all) do
+      @mirror = GroovyMirror.new
+      @changed_event = false
+      @mirror.add_listener(:change) { @changed_event = true }
+    end
+
+    def wait_for_prompt
+      while @mirror.read.nil? || @mirror.read[-8,8] != "groovy> "
+      end
+    end
+    
+    describe "before executing" do
+      it "should exist" do
+        @mirror.should be_exist
+      end
+      
+      it "should have a title" do
+        @mirror.title.should == "Groovy REPL"
+      end
+      
+      it "should not be changed" do
+        @mirror.should_not be_changed
+      end
+    end
+    
+    describe "after executing" do
+      it "should exist" do
+        @mirror.should be_exist
+      end
+      
+      it "should have a title" do
+        @mirror.title.should == "Groovy REPL"
+      end
+      
+      it "should not be changed" do
+        @mirror.should_not be_changed
+      end
+      
+      it "should have a prompt" do
+        wait_for_prompt
+        @mirror.read.should == (<<-Groovy).chomp
+// Groovy REPL
+
+groovy> 
+Groovy
+      end
+      
+    end
+          
+  end
+end

data/plugins/runnables/lib/runnables.rb

@@ -1,7 +1,3 @@
-
-require File.dirname(__FILE__) + "/../vendor/session/lib/session"
-Session.use_open4 = true
-
 require 'runnables/command_output_controller'
 require 'runnables/running_process_checker'
 require 'runnables/output_processor'
@@ -23,7 +19,7 @@ module Redcar
       end
       controller = CommandOutputController.new(path, command, title)
       if output == "none"
-        controller.run        
+        controller.run
       else
         if tab = previous_tab_for(command)
           tab.html_view.controller.run
@@ -35,7 +31,7 @@ module Redcar
           tab = Redcar.app.focussed_window.new_tab(HtmlTab)
           tab.html_view.controller = controller
           tab.focus
-        end        
+        end
       end
     end
     
@@ -56,7 +52,7 @@ module Redcar
 
     def self.menus
       Menu::Builder.build do
-        sub_menu "Project", :priority => 15 do
+        sub_menu "Project" do
           group(:priority => 15) {
           separator
             item "Runnables", Runnables::ShowRunnables
@@ -66,6 +62,13 @@ module Redcar
       end
     end
     
+    def self.toolbars
+      ToolBar::Builder.build do
+        item "Runnables", :command => Runnables::ShowRunnables, :icon => File.join(File.dirname(__FILE__),"/../icons/cog.png"), :barname => :runnables
+        item "Run Tab", :command => Runnables::RunEditTabCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "control.png"), :barname => :runnables
+      end
+    end
+    
     class TreeMirror
       include Redcar::Tree::Mirror
       
@@ -227,6 +230,7 @@ module Redcar
     end
     
     class ShowRunnables < Redcar::Command
+      sensitize :open_project
       def execute
         if tree = win.treebook.trees.detect {|tree| tree.tree_mirror.title == TREE_TITLE }
           tree.refresh
@@ -257,7 +261,7 @@ module Redcar
       end
       
       def execute
-        project = Project::Manager.in_window(win)        
+        project = Project::Manager.in_window(win)
         file_mappings.each do |file_mapping|
           regex = Regexp.new(file_mapping["regex"])
           if tab.edit_view.document.mirror.path =~ regex