redcar 0.3.9 → 0.3.10.0dev

data/CHANGES

@@ -1,6 +1,22 @@
 
-Version 0.3.9 (TBA)
-===================
+Version 0.3.10 (TBA)
+====================
+
+Enhancements:
+
+ * Colourful Runnables! (The output tab supports ANSI escape codes) (Mat Schaffer)
+ * Runnables scroll as the output gets longer (Delisa Mason)
+ * Option to save all tabs before running any Runnable (Delisa Mason)
+ * Strip trailing spaces on save option (Steven Hancock)
+ * Search and replace supports backreferences (\1 \2 etc) (Mat Schaffer)
+ * Uses client, 32bit jvm mode, for twice as fast startup. (Dan Lucraft)
+
+Fixes:
+
+ * Fix for opening files with regex characters in. (Tom Murray)
+
+Version 0.3.9 (12 Aug 2010)
+===========================
 
  * Clojure REPL (David Byrne)
  * Remote edit files (Felipe Coury & Dan Lucraft)

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.3.9"
+REDCAR_VERSION = "0.3.10.0dev"
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
@@ -32,6 +32,14 @@ begin
 rescue LoadError
 end
 
+desc "upload the docs to redcareditor.com"
+task :release_docs do
+  port     = YAML.load(File.read(".server.yaml"))["port"]
+  docs_dir = YAML.load(File.read(".server.yaml"))["dir"]
+  sh "rsync -e 'ssh -p #{port}' -avz doc/ danlucraft.com:#{docs_dir}/#{REDCAR_VERSION}/"
+  sh "rsync -e 'ssh -p #{port}' -avz doc/ danlucraft.com:#{docs_dir}/latest/"
+end
+
 ### CI
 task :ci => [:specs_ci, :cucumber_ci]
 

data/bin/redcar

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+$redcar_process_start_time = Time.now
 $VERBOSE = true if ARGV.find{|arg| arg == '--verbose'}
 require File.join(File.dirname(__FILE__), %w(.. lib redcar_quick_start))
 

data/lib/redcar.rb

@@ -41,10 +41,10 @@ require 'uri'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.9'
+  VERSION         = '0.3.10.0dev'
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 3
-  VERSION_RELEASE = 9
+  VERSION_RELEASE = 10
   
   ENVIRONMENTS = [:user, :debug, :test]
   
@@ -68,26 +68,31 @@ module Redcar
     jruby = Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
     osx = ! [:linux, :windows].include?(platform)    
 
-    if forking and not jruby
-      # jRuby doesn't support fork() because of the runtime stuff...
-      forking = false
-      puts 'Forking failed, attempting to start anyway...' if (pid = fork) == -1
-      exit unless pid.nil?
-
-      if pid.nil?
-        # reopen the standard pipes to nothingness
-        STDIN.reopen '/dev/null'
-        STDOUT.reopen '/dev/null', 'a'
-        STDERR.reopen STDOUT
+    begin
+      if forking and not jruby
+        # jRuby doesn't support fork() because of the runtime stuff...
+        forking = false
+        puts 'Forking failed, attempting to start anyway...' if (pid = fork) == -1
+        exit unless pid.nil? # kill the parent process
+        
+        if pid.nil?
+          # reopen the standard pipes to nothingness
+          STDIN.reopen '/dev/null'
+          STDOUT.reopen '/dev/null', 'a'
+          STDERR.reopen STDOUT
+        end
+      elsif forking
+        # so we need to try something different...
+        # Need to work out the vendoring stuff here.
+        # for now just blow up and do what we'd normally do.
+        #require 'spoon'
+        raise NotImplementedError, 'Attempting to fork from inside jRuby. jRuby doesn\'t support this.'
+        #puts 'Continuing normally...'
+        #forking = false
       end
-    elsif forking
-      # so we need to try something different...
-      # Need to work out the vendoring stuff here.
-      # for now just blow up and do what we'd normally do.
-      #require 'spoon'
-      puts 'Attempting to fork from inside jRuby. jRuby doesn\'t support this.'
-      puts 'Continuing normally...'
-      forking = false
+    rescue NotImplementedError
+      puts "Forking isn't supported on this system. Sorry."
+      puts "Starting normally..."
     end
     
     return if no_runner

data/lib/redcar/runner.rb

@@ -13,7 +13,7 @@ module Redcar
         exit 1
       end
       ENV['RUBYOPT'] = nil # disable other native args
-      command = "java #{java_args} -Xmx500m -Xss1024k -Djruby.memory.max=500m -Djruby.stack.max=1024k -cp \"#{jruby_complete}\" org.jruby.Main #{"--debug" if debug_mode?} \"#{bin}\" #{cleaned_args} --no-sub-jruby --ignore-stdin"
+      command = "java -d32 -client #{java_args} -Xmx500m -Xss1024k -Djruby.memory.max=500m -Djruby.stack.max=1024k -cp \"#{jruby_complete}\" org.jruby.Main #{"--debug" if debug_mode?} \"#{bin}\" #{cleaned_args} --no-sub-jruby --ignore-stdin"
       puts command
       exec(command)
     end
@@ -34,11 +34,15 @@ module Redcar
     end
     
     def java_args
+      str = ""
       if Config::CONFIG["host_os"] =~ /darwin/
-        "-XstartOnFirstThread"
-      else
-        ""
+        str <<"-XstartOnFirstThread"
       end
+      
+      if ARGV.include?("--load-timings")
+        str << " -Djruby.debug.loadService.timing=true"
+      end
+      str
     end
   end
 end

data/plugins/document_search/features/replace.feature

@@ -111,4 +111,13 @@ Feature: Replace in file
     Then the contents should be "THE\n* Speedbars have access to THE properties of THE widgets in THEm."
     And the selection range should be from 64 to 67
 
+  Scenario: Replace regex with back-references
+    When I replace the contents with "Curry chicken"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchAndReplaceCommand
+    And I type "(\w+) chicken" into the "Search" field in the speedbar
+    And I type "\1 beef" into the "Replace" field in the speedbar
+    And I press "Replace" in the speedbar
+    Then the contents should be "Curry beef"
+
   

data/plugins/document_search/lib/document_search/search.rb

@@ -2,11 +2,13 @@ module DocumentSearch
   class Search
     # An instance of a search type method: Regular expression
     def self.regex_search_method(line, query, replace)
-      if line =~ /#{query}/
-        startoff = $`.length
-        endoff   = (startoff + $&.length) - 1
-        line[startoff..endoff] = replace
-        return line, startoff, startoff + replace.length
+      new_line = line.sub(/#{query}/, replace)
+
+      if match = $~
+        startoff = match.pre_match.length
+        endoff   = (startoff + match[0].length) - 1
+        
+        return new_line, startoff, startoff + match[0].length
       end
       return nil
     end

data/plugins/project/lib/project.rb

@@ -88,7 +88,7 @@ module Redcar
     end
     
     def contains_path?(path)
-      File.expand_path(path) =~ /^#{@path}($|\/|\\)/
+      File.expand_path(path) =~ /^#{Regexp.escape(@path)}($|\/|\\)/
     end
     
     # A list of files previously opened in this session for this project

data/plugins/project/lib/project/adapters/remote.rb

@@ -1,5 +1,3 @@
-require 'net/ssh'
-require 'net/sftp'
 
 module Redcar
   class Project

data/plugins/project/lib/project/adapters/remote_protocols/ftp.rb

@@ -1,5 +1,3 @@
-require 'net/ftp'
-require 'net/ftp/list'
 
 module Redcar
   class Project
@@ -13,6 +11,8 @@ module Redcar
           end
           
           def connection
+            require 'net/ftp'
+            require 'net/ftp/list'
             @connection ||= Net::FTP.open(host, user, password)
           end
           

data/plugins/project/lib/project/adapters/remote_protocols/protocol.rb

@@ -1,5 +1,3 @@
-require 'net/ssh'
-require 'net/sftp'
 
 module Redcar
   class Project

data/plugins/project/lib/project/adapters/remote_protocols/sftp.rb

@@ -1,5 +1,3 @@
-require 'net/ssh'
-require 'net/sftp'
 
 module Redcar
   class Project
@@ -13,6 +11,8 @@ module Redcar
           end
 
           def connection
+            require 'net/ssh'
+            require 'net/sftp'
             Redcar.timeout(10) do
               @connection ||= Net::SSH.start(host, user, :password => password, :keys => private_key_files)
             end

data/plugins/redcar/redcar.rb

@@ -763,6 +763,7 @@ module Redcar
         link "Ctrl+Shift+[",    MoveTabDownCommand
         link "Ctrl+Shift+]",    MoveTabUpCommand
         link "Ctrl+R",          Runnables::RunEditTabCommand
+        link "Cmd+Alt+I",       ToggleInvisibles
 
         link "Ctrl+Shift+P",    PrintScopeCommand
         
@@ -836,7 +837,8 @@ module Redcar
         link "Ctrl+Shift+Page Up",   MoveTabDownCommand
         link "Ctrl+Shift+Page Down", MoveTabUpCommand
         link "Ctrl+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
-        
+        link "Ctrl+Alt+I",       ToggleInvisibles
+
         link "Ctrl+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :linux)
 
@@ -1013,6 +1015,7 @@ module Redcar
       Redcar::Project::Manager.start(args)
       puts "project start took #{Time.now - s}s"
       Redcar.app.make_sure_at_least_one_window_open
+      puts "start time: #{Time.now - $redcar_process_start_time}"
     end
   end
 end

data/plugins/runnables/lib/runnables.rb

@@ -1,29 +1,39 @@
 
-require File.dirname(__FILE__) + "/../vendor/session-2.4.0/lib/session"
+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'
 
 module Redcar
   class Runnables
     TREE_TITLE = "Runnables"
-    
-    def self.run_process(path, command, title, output)
-      controller = CommandOutputController.new(path, command, title)
-      if output == "window"
-        Project::Manager.open_project_for_path(".")
-        output = "tab"
+
+    def self.run_process(path, command, title, output = "tab")
+      if Runnables.storage['save_project_before_running'] == true
+        Redcar.app.focussed_window.notebooks.each do |notebook|
+          notebook.tabs.each do |tab|
+            case tab
+            when EditTab
+              tab.edit_view.document.save!
+            end
+          end
+        end
       end
+      controller = CommandOutputController.new(path, command, title)
       if output == "none"
         controller.run
-      else
+      else #default to new tab
+        if output == "window"
+          Project::Manager.open_project_for_path(".")
+        end
         tab = Redcar.app.focussed_window.new_tab(HtmlTab)
         tab.html_view.controller = controller
         tab.focus
       end
     end
-    
+
     def self.menus
       Menu::Builder.build do
         sub_menu "Project", :priority => 15 do
@@ -69,6 +79,14 @@ module Redcar
         @top
       end
     end
+
+    def self.storage
+      @storage ||= begin
+        storage = Plugin::Storage.new('runnables')
+        storage.set_default('save_project_before_running', false)
+        storage
+      end
+    end
     
     class RunnableGroup
       include Redcar::Tree::Mirror::NodeMirror
@@ -220,6 +238,3 @@ module Redcar
     end
   end
 end
-
-
-

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

@@ -35,16 +35,30 @@ module Redcar
         end
       end
       
+      def stylesheet_link_tag(*files)
+        files.map do |file|
+          path = File.join(Redcar.root, %w(plugins runnables views) + [file.to_s + ".css"])
+          url = "file://" + File.expand_path(path)
+          %Q|<link href="#{url}" rel="stylesheet" type="text/css" />|
+        end.join("\n")
+      end
+      
+      def process(text)
+        @processor ||= OutputProcessor.new
+        @processor.process(text)
+      end
+      
       def run_windows
         @thread = Thread.new do
           output = `cd #{@path} & #{@cmd} 2>&1`
           html=<<-HTML
           <div class="stdout">
-            <pre>#{output}</pre>
+            #{process(output)}
           </div>
           HTML
           execute(<<-JAVASCRIPT)
             $("#output").append(#{html.inspect});
+            $("html, body").attr({ scrollTop: $("#output").attr("scrollHeight") }); 
           JAVASCRIPT
         end
       end
@@ -56,12 +70,13 @@ module Redcar
           @shell.outproc = lambda do |out|
             html=<<-HTML
               <div class="stdout">
-                <pre>#{out}</pre>
+                #{process(out)}
               </div>
             HTML
             execute(<<-JAVASCRIPT)
               $("#output").append(#{html.inspect});
-            JAVASCRIPT
+              $("html, body").attr({ scrollTop: $("#output").attr("scrollHeight") }); 
+           JAVASCRIPT
           end
           @shell.errproc = lambda do |err|
             html=<<-HTML
@@ -71,6 +86,7 @@ module Redcar
             HTML
             execute(<<-JAVASCRIPT)
               $("#output").append(#{html.inspect});
+              $("html, body").attr({ scrollTop: $("#output").attr("scrollHeight") }); 
             JAVASCRIPT
           end
           begin
@@ -86,6 +102,7 @@ module Redcar
           HTML
           execute(<<-JAVASCRIPT)
             $("#output").append(#{html.inspect});
+            $("html, body").attr({ scrollTop: $("#output").attr("scrollHeight") }); 
           JAVASCRIPT
           @shell = nil
           @thread = nil

data/plugins/runnables/lib/runnables/output_processor.rb

@@ -0,0 +1,63 @@
+module Redcar
+  class Runnables
+    class OutputProcessor
+      # From TextMate's Support/lib/escape.rb
+      # Make string suitable for display as HTML, preserve spaces. Set :no_newline_after_br => true
+      # to cause “\n” to be substituted by “<br>” instead of “<br>\n”
+      def process(str, opts = {})
+        str = str.to_s.gsub("&", "&amp;").gsub("<", "&lt;")
+        str = process_ansi(str)
+        str = str.gsub(/\t+/, '<span style="white-space:pre;">\0</span>')
+        str = str.reverse.gsub(/ (?= |$)/, ';psbn&').reverse
+        if opts[:no_newline_after_br].nil?
+          str.gsub("\n", "<br>\n")
+        else
+          str.gsub("\n", "<br>")
+        end 
+      end
+      
+      def initialize
+        @ansi_stack = []
+        @ansi_colors = %w(black red green yellow blue purple cyan gray) 
+      end
+      
+      def color(num)
+        @ansi_colors[num.to_i]
+      end
+
+      def close_ansi_spans(clear = false)
+        stack_length = @ansi_stack.size
+        @ansi_stack = [] if clear
+        "</span>" * stack_length
+      end
+
+      def ansi_span(style)
+        %Q|<span class="#{style}">|
+      end
+
+      def restart_ansi_spans
+        @ansi_stack.map do |style|
+          ansi_span(style)
+        end.join('')
+      end
+
+      def process_ansi(str)
+        restart_ansi_spans + str.gsub(/\e\[(([0,1]);?)?((\d)(\d))?m/) do |m|
+          match = $~
+          if match[2] == "0" && match[4].nil?
+            close_ansi_spans(:clear)
+          else
+            style = ""          
+            style += "ansi-regular "               if match[2] == "0"
+            style += "ansi-bold "                  if match[2] == "1"
+            style += "ansi-light "                 if match[4] == "9"
+            style += "ansi-on-#{color(match[5])} " if match[4] == "4"
+            style += "ansi-#{color(match[5])}"     if match[4] == "3" || match[4] == "9"
+            @ansi_stack << style unless style.empty?
+            ansi_span(style)
+          end
+        end + close_ansi_spans
+      end
+    end
+  end
+end