redcar 0.3.2dev → 0.3.3

data/plugins/redcar/spec/redcar/redcar_spec.rb

@@ -0,0 +1,70 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+class DocString
+
+  def initialize(string)
+   @string = string
+   @cursor_offset = 0
+  end
+  
+  attr_accessor :cursor_offset
+  
+  def cursor_line
+    1
+  end  
+  
+  def cursor_offset
+    0
+  end  
+  
+  def set_selection_range(start, _end)
+   # ignore
+  end
+  
+  def scroll_to_line(n)
+  end
+  
+  def get_line(x)
+     out = @string.split("\n")[x]
+     out
+  end
+  
+  def line_count
+    @string.split("\n").length
+  end
+   
+  def offset_at_line(x)
+   @string.split("\n")[0..x].join("\n").length  
+  end
+  
+end
+
+module Redcar::Top
+ describe FindNextRegex do
+
+  def setup(regex, wrap = false)
+    @a = FindNextRegex.new regex, wrap
+   
+    def @a.doc
+     DocString.new("a\nb\nc")
+    end
+  end
+  
+  it "should be able to search forward and fail" do
+    setup /abc/
+    @a.execute.should be_false
+  end  
+  
+  it "should be able to search forward successfully" do
+    setup /c/
+    @a.execute.should be_true  
+  end
+  
+  it "should be able to wrap search" do
+    setup /a/, true
+    @a.execute.should be_true  
+  end
+   
+ end
+ 
+end

data/plugins/redcar/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+
+require 'redcar'
+Redcar.load

data/plugins/repl/lib/repl.rb

@@ -1,4 +1,3 @@
-
 require 'repl/internal_mirror'
 
 module Redcar
@@ -12,6 +11,20 @@ module Redcar
         end
       ]
     end
+
+    def self.keymaps
+      osx = Keymap.build("main", :osx) do
+        link "Cmd+Shift+M", REPL::OpenInternalREPL
+        link "Cmd+M",       REPL::CommitREPL
+      end
+      
+      linwin = Keymap.build("main", [:linux, :windows]) do
+        link "Ctrl+Shift+M", REPL::OpenInternalREPL
+        link "Ctrl+M",       REPL::CommitREPL
+      end
+      
+      [linwin, osx]
+    end
     
     def self.menus
       Menu::Builder.build do
@@ -25,9 +38,6 @@ module Redcar
     end
     
     class OpenInternalREPL < Command
-      key :linux   => "Ctrl+Shift+M",
-          :osx     => "Cmd+Shift+M",
-          :windows => "Ctrl+Shift+M"
       
       def execute
         tab = win.new_tab(Redcar::EditTab)
@@ -43,9 +53,6 @@ module Redcar
     end
     
     class CommitREPL < ReplCommand
-      key :linux   => "Ctrl+M",
-          :osx     => "Cmd+M",
-          :windows => "Ctrl+M"
       
       def execute
         edit_view = win.focussed_notebook.focussed_tab.edit_view

data/plugins/repl/lib/repl/internal_mirror.rb

@@ -4,10 +4,16 @@ module Redcar
     class InternalMirror
       include Redcar::Document::Mirror
       
+      POINTERS = {
+        :output => "",
+        :result => "=> ",
+        :error  => "x> "
+      }
+      
       attr_reader :history, :results
       
       def initialize
-        @history, @results, @instance = [], [], Main.new
+        @history, @instance = [], Main.new
       end
 
       def title
@@ -20,12 +26,17 @@ module Redcar
       # @return [String]
       def read
         str = message
-        @history.zip(@results) do |command, result|
-          output, is_error = *result
-          str << prompt + command + "\n"
-          str << (is_error ? error_pointer : output_pointer)
-          output.scan(/.{1,80}/).each do |output_line|
-            str << output_line + "\n"
+        
+        @history.each do |entry|
+          command = entry.first
+          results = entry.last
+          str << prompt.to_s + command.to_s + "\n"
+          results.each do |result|
+            output, entry_type = *result
+            str << POINTERS[entry_type]
+            output.scan(/.{1,80}/).each do |output_line|
+              str << output_line + "\n"
+            end
           end
         end
         str << prompt
@@ -36,14 +47,19 @@ module Redcar
       #
       # @param [String] a string with at least one prompt and statement in it
       def commit(contents)
-        command = contents.split(prompt).last
-        @history << command
+        if contents.split("\n").last =~ />>\s+$/
+          command = ""
+        else
+          command = contents.split(prompt).last
+        end
+        @history << [command, []]
         begin
-          result, is_error = @instance.execute(command).inspect, false
+          result, entry_type = @instance.execute(command).inspect, :result
         rescue Object => e
-          result, is_error = format_error(e), true
+          result, entry_type = format_error(e), :error
         end
-        @results << [result, is_error]
+        @history.last[1] << [@instance.output, :output] if @instance.output
+        @history.last[1] << [result, entry_type]
         notify_listeners(:change)
       end
 
@@ -68,14 +84,6 @@ module Redcar
         ">> "
       end
       
-      def output_pointer
-        "=> "
-      end
-      
-      def error_pointer
-        "x> "
-      end
-      
       def format_error(e)
         backtrace = e.backtrace.reject{|l| l =~ /internal_mirror/}
         backtrace.unshift("(repl):1")
@@ -83,16 +91,29 @@ module Redcar
       end
       
       class Main
+        attr_reader :output
+        
         def initialize
           @binding = binding
+          @output = nil
         end
 
         def inspect
           "main"
         end
-
+        
         def execute(command)
-          eval(command, @binding)
+          orig_stdout = $stdout
+          stdout_handler = StringIO.new
+          $stdout = stdout_handler
+
+          result = eval(command, @binding)
+
+          $stdout.rewind
+          @output = $stdout.read
+
+          $stdout = orig_stdout
+          result
         end
       end
     end

data/plugins/repl/spec/repl/internal_mirror_spec.rb

@@ -36,6 +36,7 @@ RUBY
 >> $internal_repl_test = 909
 RUBY
       @mirror.commit(text.chomp)
+      text.chomp
     end
     
     def result_test_text2
@@ -49,7 +50,21 @@ RUBY
 >> 
 RUBY
     end
+    
+    
+    def commit_no_input
+     text = <<-RUBY
+# Redcar REPL
 
+>> 
+RUBY
+      @mirror.commit(text)
+    end
+    
+    def prompt     
+       "# Redcar REPL\n\n"
+    end
+    
     describe "with no history" do
       it "should exist" do
         @mirror.should be_exist
@@ -76,7 +91,18 @@ RUBY
           commit_test_text1
           $internal_repl_test.should == 707
         end
-
+        
+        it "should allow committing nothing as the first command" do
+          commit_no_input
+          @mirror.read.should == "# Redcar REPL\n\n>> \n=> nil\n>> "
+        end
+        
+        it "should allow committing nothing as an xth command" do
+          committed = commit_test_text2
+          @mirror.commit committed + "\n>> "
+          @mirror.read.should == "# Redcar REPL\n\n>> $internal_repl_test = 909\n=> 909\n>> \n=> nil\n>> "      
+        end
+        
         it "should emit changed event when text is executed" do
           commit_test_text1
           @changed_event.should be_true
@@ -88,7 +114,7 @@ RUBY
         end
         
         it "should display errors" do
-          @mirror.commit(">> nil.foo")
+          @mirror.commit(prompt + ">> nil.foo")
           @mirror.read.should == (<<-RUBY).chomp
 # Redcar REPL
 
@@ -130,14 +156,15 @@ RUBY
     
     describe "when executing" do
       it "should execute inside a main object" do
-        @mirror.commit(">> self")
-        @mirror.results.last.should == ["main", false]
+        @mirror.commit(prompt + ">> self")
+        @mirror.history.last.should == ["self", [["", :output], ["main", :result]] ]
       end
       
       it "should persist local variables" do
-        @mirror.commit(">> a = 13")
-        @mirror.commit(">> a")
-        @mirror.results.last.should == ["13", false]
+        sent = prompt + ">> a = 13"
+        @mirror.commit(sent)
+        @mirror.commit(sent + "\n>> a")
+        @mirror.history.last.should == ["a", [["", :output], ["13", :result]] ]
       end
     end
   end

data/plugins/repl/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
-Redcar.boot
 Redcar.load

data/plugins/tree/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
-Redcar.boot
 Redcar.load

data/plugins/tree_view_swt/lib/tree_view_swt.rb

@@ -15,7 +15,7 @@ module Redcar
         @viewer.add_open_listener(OpenListener.new(@model.tree_controller))
       end
       
-      @model.add_listener(:refresh) do 
+      @model.add_listener(:refresh) do
         s = Time.now
         begin
           @viewer.refresh

data/textmate/Bundles/RedcarRepl.tmbundle/Syntaxes/InternalRuby.plist

@@ -14,7 +14,7 @@
 	<array>
 		<dict>
 			<key>begin</key>
-			<string>(x>)</string>
+			<string>^>></string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -24,23 +24,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=>>|=>|x>)</string>
-			<key>name</key>
-			<string>repl.entry source.ruby.error</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(>>|=>)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.repl</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(?=>>|=>|x>)</string>
+			<string>^(?=&gt;|x&gt;)</string>
 			<key>name</key>
 			<string>repl.entry source.ruby</string>
 			<key>patterns</key>

data/textmate/Bundles/asciidoc.tmbundle/Syntaxes/AsciiDoc.tmLanguage

@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>comment</key>
+	<string>
+		A very early hack. Mostly ripped from other syntaxes.
+		Only the very basic stuff is working.
+	</string>
+	<key>fileTypes</key>
+	<array>
+		<string>asc</string>
+	</array>
+	<key>foldingStartMarker</key>
+	<string>(?x)
+		(([/+-.*_=]){4,}
+		|&lt;!--(?!.*--&gt;)
+		)</string>
+	<key>foldingStopMarker</key>
+	<string>(?x)
+		(([/+-.*_=]){4,}
+		|^\s*--&gt;
+		)</string>
+	<key>keyEquivalent</key>
+	<string>^~A</string>
+	<key>name</key>
+	<string>AsciiDoc</string>
+	<key>patterns</key>
+	<array>
+		<dict>
+			<key>begin</key>
+			<string>(?x)^
+				(?=	([/+-.*_=]{4,})\s*$
+				|	([ \t]{1,})
+				|	[=]{1,6}\s*+
+				|	[ ]{,3}(?&lt;marker&gt;[-*_])([ ]{,2}\k&lt;marker&gt;){2,}[ \t]*+$
+				)</string>
+			<key>end</key>
+			<string>(?x)^
+				(?!	\1
+				|	([ \t]{1,})
+				|	[=]{1,6}\s*+
+				|	[ ]{,3}(?&lt;marker&gt;[-*_])([ ]{,2}\k&lt;marker&gt;){2,}[ \t]*+$
+				)</string>
+			<key>name</key>
+			<string>meta.block-level.asciidoc</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#block_quote</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#block_raw</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#heading_inline</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#separator</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>^[ ]{0,3}([*+-])(?=\s)</string>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.list_item.asciidoc</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>^(?=\S)</string>
+			<key>name</key>
+			<string>markup.list.unnumbered.asciidoc</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#list-paragraph</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>^[ ]{0,3}[0-9]+(\.)(?=\s)</string>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.list_item.asciidoc</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>^(?=\S)</string>
+			<key>name</key>
+			<string>markup.list.numbered.asciidoc</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#list-paragraph</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>^([/+-.*_=]){4,}\s*$</string>
+			<key>end</key>
+			<string>^\1{4,}\s*$</string>
+			<key>name</key>
+			<string>comment.block.asciidoc</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>^([/+.]){4,}\s*$</string>
+			<key>comment</key>
+			<string>
+				asciidoc formatting is disabled inside certain blocks.
+			</string>
+			<key>end</key>
+			<string>^[/+.]{4,}\s*$</string>
+			<key>name</key>
+			<string>meta.disable-asciidoc</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>^(?=\S)(?![=-]{3,}(?=$))(?!\.\S+)</string>
+			<key>end</key>
+			<string>^(?:\s*$|(?=[ ]{,3}&gt;.))|(?=[ \t]*\n)(?&lt;=^===|^====|=====|^---|^----|-----)[ \t]*\n</string>
+			<key>name</key>
+			<string>meta.paragraph.asciidoc</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#inline</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>text.html.basic</string>
+				</dict>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.heading.asciidoc</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>^(={3,})(?=[ \t]*$)</string>
+					<key>name</key>
+					<string>markup.heading.0.asciidoc</string>
+				</dict>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.heading.asciidoc</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>^(-{3,})(?=[ \t]*$)</string>
+					<key>name</key>
+					<string>markup.heading.1.asciidoc</string>
+				</dict>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.heading.asciidoc</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>^(~{3,})(?=[ \t]*$)</string>
+					<key>name</key>
+					<string>markup.heading.2.asciidoc</string>
+				</dict>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.heading.asciidoc</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>^(\^{3,})(?=[ \t]*$)</string>
+					<key>name</key>
+					<string>markup.heading.3.asciidoc</string>
+				</dict>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.heading.asciidoc</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>^(\+{3,})(?=[ \t]*$)</string>
+					<key>name</key>
+					<string>markup.heading.4.asciidoc</string>
+				</dict>
+			</array>
+		</dict>
+	</array>
+	<key>repository</key>
+	<dict>
+		<key>block_quote</key>
+		<dict>
+			<key>begin</key>
+			<string>^([/+-.*_=]){4,}\s*$</string>
+			<key>end</key>
+			<string>^\1{4,}\s*$</string>
+			<key>name</key>
+			<string>comment.block.asciidoc</string>
+		</dict>
+		<key>block_raw</key>
+		<dict>
+			<key>match</key>
+			<string>\G([ ]{4}|\t).*$\n?</string>
+			<key>name</key>
+			<string>markup.raw.block.asciidoc</string>
+		</dict>
+		<key>bold</key>
+		<dict>
+			<key>begin</key>
+			<string>	(\*|\*\*)(?=\S)</string>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.bold.asciidoc</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>(?&lt;=\S)(\1)</string>
+			<key>name</key>
+			<string>markup.bold.asciidoc</string>
+		</dict>
+		<key>bracket</key>
+		<dict>
+			<key>comment</key>
+			<string>
+				asciidoc will convert this for us. We match it so that the
+				HTML grammar will not mark it up as invalid.
+			</string>
+			<key>match</key>
+			<string>&lt;(?![a-z/?\$!])</string>
+			<key>name</key>
+			<string>meta.other.valid-bracket.asciidoc</string>
+		</dict>
+		<key>escape</key>
+		<dict>
+			<key>match</key>
+			<string>\\[-`*_#+.!(){}\[\]\\&gt;]</string>
+			<key>name</key>
+			<string>constant.character.escape.asciidoc</string>
+		</dict>
+		<key>heading</key>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.heading.asciidoc</string>
+				</dict>
+			</dict>
+			<key>contentName</key>
+			<string>entity.name.section.asciidoc</string>
+			<key>match</key>
+			<string>(?m)^(\S+)$([=-~^+])+\s*$</string>
+			<key>name</key>
+			<string>markup.heading.asciidoc</string>
+		</dict>
+		<key>heading_inline</key>
+		<dict>
+			<key>begin</key>
+			<string>\G(={1,6})(?!=)\s*(?=\S)</string>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.heading.asciidoc</string>
+				</dict>
+			</dict>
+			<key>contentName</key>
+			<string>entity.name.section.asciidoc</string>
+			<key>end</key>
+			<string>\s*(=*)$\n?</string>
+			<key>name</key>
+			<string>markup.heading.asciidoc</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#inline</string>
+				</dict>
+			</array>
+		</dict>
+		<key>inline</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#escape</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#bracket</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#raw</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#bold</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#italic</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#line-break</string>
+				</dict>
+			</array>
+		</dict>
+		<key>italic</key>
+		<dict>
+			<key>begin</key>
+			<string>(_|__)(?=\S)</string>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.italic.asciidoc</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>(?&lt;=\S)(\1)((?!\1)|(?=\1\1))</string>
+			<key>name</key>
+			<string>markup.italic.asciidoc</string>
+		</dict>
+		<key>line-break</key>
+		<dict>
+			<key>match</key>
+			<string> {\+}$</string>
+			<key>name</key>
+			<string>meta.dummy.line-break</string>
+		</dict>
+		<key>list-paragraph</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>begin</key>
+					<string>\G\s+(?=\S)</string>
+					<key>end</key>
+					<string>^\s*$</string>
+					<key>name</key>
+					<string>meta.paragraph.list.asciidoc</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>#inline</string>
+						</dict>
+					</array>
+				</dict>
+			</array>
+		</dict>
+		<key>raw</key>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.raw.asciidoc</string>
+				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.raw.asciidoc</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>(`+)([^`]|(?!(?&lt;!`)\1(?!`))`)*+(\1)</string>
+			<key>name</key>
+			<string>markup.raw.inline.asciidoc</string>
+		</dict>
+		<key>separator</key>
+		<dict>
+			<key>match</key>
+			<string>\G[ ]{,3}([-*_])([ ]{,2}\1){2,}[ \t]*$\n?</string>
+			<key>name</key>
+			<string>meta.separator.asciidoc</string>
+		</dict>
+	</dict>
+	<key>scopeName</key>
+	<string>text.html.asciidoc</string>
+	<key>uuid</key>
+	<string>090F38B8-2CEB-4956-A627-E24C7AA16ED6</string>
+</dict>
+</plist>