redcar 0.7 → 0.8

data/plugins/repl/lib/repl.rb

@@ -5,42 +5,42 @@ 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.edit_view.document.mirror.is_a?(REPL::ReplMirror)
+    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
 
     def self.keymaps
       osx = Keymap.build("main", :osx) do
         link "Cmd+Shift+R", REPL::RubyOpenREPL
-        link "Cmd+R",       REPL::CommitREPL
+        link "Cmd+M",       REPL::CommitREPL
       end
 
       linwin = Keymap.build("main", [:linux, :windows]) do
         link "Ctrl+Shift+R", REPL::RubyOpenREPL
-        link "Ctrl+R",       REPL::CommitREPL
+        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
+    def self.sensitivities
+      [
+        Sensitivity.new(:open_repl_tab, Redcar.app, false, [:tab_focussed]) do |tab|
+          tab and
+          tab.is_a?(EditTab) and
+          tab.edit_view.document.mirror.is_a?(REPL::ReplMirror)
         end
-      end
+      ]
     end
 
     class OpenREPL < Command

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

@@ -1,45 +1,8 @@
 
 module Redcar
   class REPL
-    class ClojureMirror
-      def self.load_clojure_dependencies
-        unless @loaded
-          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'
-          @loaded = true
-        end
-      end
+    class ClojureMirror < ReplMirror
       
-      include Redcar::REPL::ReplMirror
-      
-      def initialize
-        ClojureMirror.load_clojure_dependencies
-        # required by ReplMirror
-        @prompt = "=>"
-        
-        @repl_wrapper = Wrapper.new 
-        @mutex = Mutex.new
-        @history = "# Clojure REPL\n"
-	
-        @thread = Thread.new do
-          loop do
-            str = @repl_wrapper.getResult
-            @mutex.synchronize do
-              @history += "\n" if @history != ""
-              @history += str
-            end
-            Redcar.update_gui do
-              notify_listeners(:change)
-            end
-          end
-        end
-	
-      end
-
       def title
         "Clojure REPL"
       end
@@ -48,30 +11,59 @@ module Redcar
         "Clojure REPL"
       end
       
-      # Get the complete history as a pretty formatted string.
-      #
-      # @return [String]
-      def read
-        @mutex.synchronize do
-          @history
-        end
+      def prompt
+        "user=>"
       end
-         
-      def clear_history
-        @mutex.synchronize do
-          @history = @history.split("\n").last
-        end
-        notify_listeners(:change)
+      
+      def evaluator
+        @evaluator ||= ClojureMirror::Evaluator.new(self)
       end
-
-      private
       
-      def send_to_repl expr
-        @mutex.synchronize do
-          @history += expr
+      def format_error(e)
+        "ERROR: #{e.message}\n\n#{e.backtrace.join("\n")}"
+      end
+
+      class Evaluator
+        attr_reader :wrapper
+        
+        def self.load_clojure_dependencies
+          unless @loaded
+            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'
+            @loaded = true
+          end
+        end
+
+        def initialize(mirror)
+          ClojureMirror::Evaluator.load_clojure_dependencies
+          @mirror = mirror
+          @wrapper ||= begin
+            wrapper = Wrapper.new 
+            
+            @thread = Thread.new do
+              loop do
+                output = wrapper.getResult
+                output =~ /^(.*)\nuser=> /
+                @result = $1
+              end
+            end
+            
+            wrapper
+          end
         end
-        @repl_wrapper.sendToRepl(expr)
-      end   
+        
+        def execute(expr)
+          wrapper.sendToRepl(expr)
+          true until @result
+          str = @result
+          @result = nil
+          str
+        end
+      end
     end
   end
 end

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

@@ -3,25 +3,7 @@ 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
-
+    class GroovyMirror < ReplMirror
       def title
         "Groovy REPL"
       end
@@ -29,18 +11,33 @@ module Redcar
       def grammar_name
         "Groovy REPL"
       end
+      
+      def prompt
+        "groovy>"
+      end      
 
-      def read
-        @history
+      def evaluator
+        @instance ||= GroovyMirror::Evaluator.new
       end
 
-      def clear_history
-        @history = @history.split("\n").last
-        notify_listeners(:change)
+      def format_error(e)
+        backtrace = e.backtrace
+        "ERROR #{e.class}:\n #{e.message}\n        #{backtrace.join("\n        ")}"
       end
 
-      class Main
+      class Evaluator
+        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
+        
         def initialize
+          GroovyMirror::Evaluator.load_groovy_dependencies
           @out = StringWriter.new
           @shell = GroovyShell.new
           @shell.setProperty('out',@out)
@@ -63,22 +60,6 @@ module Redcar
           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/lib/repl/repl_mirror.rb

@@ -1,22 +1,101 @@
 module Redcar
   class REPL
-    module ReplMirror
+    class ReplMirror
+      attr_reader :history
+      
+      # A ReplMirror is a type of Document::Mirror
       include Redcar::Document::Mirror
-  
+
+      def initialize
+        @history = initial_preamble
+        @mutex = Mutex.new
+      end
+      
+      # What to display when the REPL is opened. Defaults to the title followed
+      # by a prompt
+      #
+      # @return [String]
+      def initial_preamble
+        "# #{title}\n\n#{prompt} "
+      end
+      
+      # The name of the textmate grammar to apply to the repl history.
+      #
+      # @return [String]
+      def grammar_name
+        raise "implement the grammar_name method on your REPL"
+      end
+      
+      # The prompt to display when the REPL is ready to accept input.
+      # Default: ">>"
+      #
+      # @return [String]
+      def prompt
+        ">>"
+      end
+      
+      # This returns an object that implements:
+      #   execute(str:String): String
+      def evaluator
+        raise "implement evaluator on your REPL"
+      end
+      
+      # Format the language specific exception to be displayed in the Repl
+      # 
+      # @param [Exception] 
+      # @return [String]
+      def format_error(exception)
+        raise "implement format_error on your REPL"
+      end
+      
       # Execute a new statement. Accepts the entire pretty formatted history,
       # within which it looks for the last statement and executes it.
       #
+      # Do not override
+      #
       # @param [String] a string with at least one prompt and statement in it
       def commit(contents)
-        if contents.split("\n").last =~ /#{@prompt}\s+$/
-          command = ""
+        command = entered_expression(contents)
+        evaluate(command)
+      end
+      
+      # What did the user just enter?
+      #
+      # @return [String]
+      def entered_expression(contents)
+        if contents.split("\n").last =~ /#{prompt}\s+$/
+          ""
         else
-          command = contents.split(@prompt).last.strip
+          contents.split(prompt).last.strip
         end
-        send_to_repl command
+      end
+
+      # Evaluate an expression. Calls execute on the return value of evaluator
+      def evaluate(expr)
+        @history += expr + "\n"
+        begin
+          @history += "=> " + evaluator.execute(expr)
+        rescue Object => e
+          @history += "x> " + format_error(e)
+        end
+        @history += "\n" + prompt + " "
+        notify_listeners(:change)
+      end
+
+      # Get the complete history as a pretty formatted string.
+      #
+      # @return [String]
+      def read
+        @history
+      end
+      
+      def clear_history
+        @history = @history.split("\n").last
+        notify_listeners(:change)
       end
 
       # REPLs always exist because there is no external resource to represent.
+      # Therefore, this returns true.
       def exists?
         true
       end
@@ -25,14 +104,6 @@ module Redcar
       def changed?
         false
       end
-      
-      private
-      
-      # Language-specific method for evaluating statements
-      def send_to_repl expr
-        raise "not implemented"
-      end
-      
     end
   end
 end

data/plugins/repl/lib/repl/ruby_mirror.rb

@@ -1,17 +1,8 @@
 
 module Redcar
   class REPL
-    class RubyMirror
-      include Redcar::REPL::ReplMirror
+    class RubyMirror < ReplMirror
       
-      def initialize
-        # required by ReplMirror
-        @prompt = ">>"
-	
-        @history = "# Redcar REPL\n\n#{@prompt} "
-        @instance = Main.new
-      end
-
       def title
         "Ruby REPL"
       end
@@ -20,21 +11,21 @@ module Redcar
         "Ruby REPL"
       end
       
-      # Get the complete history as a pretty formatted string.
-      #
-      # @return [String]
-      def read
-        @history
+      def prompt
+        ">>"
       end
       
-      def clear_history
-        @history = @history.split("\n").last
-        notify_listeners(:change)
+      def format_error(e)
+        backtrace = e.backtrace.reject{|l| l =~ /ruby_mirror/}
+        backtrace.unshift("(repl):1")
+        "#{e.class}: #{e.message}\n        #{backtrace.join("\n        ")}"
+      end
+      
+      def evaluator
+        @evaluator ||= RubyMirror::Evaluator.new
       end
-
-      private
       
-      class Main
+      class Evaluator
         attr_reader :output
         
         def initialize
@@ -50,24 +41,6 @@ module Redcar
           eval(command, @binding).inspect
         end
       end
-      
-      def format_error(e)
-        backtrace = e.backtrace.reject{|l| l =~ /ruby_mirror/}
-        backtrace.unshift("(repl):1")
-        "#{e.class}: #{e.message}\n        #{backtrace.join("\n        ")}"
-      end
-      
-      def send_to_repl expr
-        @history += expr + "\n"
-        begin
-          @history += "=> " + @instance.execute(expr)
-        rescue Object => e
-          @history += "x> " + format_error(e)
-        end
-        @history += "\n" + @prompt + " "
-        notify_listeners(:change)
-      end
-            
     end
   end
 end