redcar 0.3.3 → 0.3.4

data/CHANGES

@@ -1,4 +1,25 @@
 
+Version 0.3.4dev (7 Mar 2010)
+=============================
+
+New features:
+
+  * Auto-pairer inserts matching characters ( -> ), " -> ", etc
+  * Snippets
+  * Recent directories menu
+  * Uses Gecko for HTMLTabs on Windows.
+  
+Internal changes:
+
+  * New API for creating text Marks, to tag a position in a Document.
+  * new PersistentCache class for plugins to simply cache stuff.
+  * Textmate plugin for dealing with Textmate bundles.
+  * Application focus in/out events.
+  
+New contributors:
+
+  * Aaron McLeod
+
 Version 0.3.3dev (21 Feb 2010)
 ==============================
 

data/README.md

@@ -23,13 +23,9 @@ NB the install will take a minute or so to complete as it has to download about
 
 Run 
 
-    $ redcar
+    $ redcar --help
     
-Usage:
-
-         --font=FONT  Choose font
-    --font-size=SIZE  Choose font point size
-       --theme=THEME  Choose Textmate theme
+for a list of options.
 
 ## INSTALLING FROM SOURCE
 
@@ -51,6 +47,7 @@ To run on OSX:
 
     $ jruby -J-XstartOnFirstThread bin/redcar        
 
+You may also need to install the rake, rspec and cucumber gems.
 
 ## PROBLEMS?
 

data/ROADMAP.md

@@ -7,8 +7,6 @@ Features still to port
 
   * Tests passing on 3 platforms
   * Full project support
-  * Snippets
-  * Bracket matching
   * Text/Source/Ruby bundle commands ported
   * Drag and drop of tabs
   * Packaged for one-click install on 3 platforms

data/Rakefile

@@ -1,4 +1,3 @@
-
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
@@ -6,8 +5,9 @@ require 'cucumber/rake/task'
 require "rake/gempackagetask"
 require "rake/rdoctask"
 
-if RUBY_PLATFORM =~ /mswin/
+if RUBY_PLATFORM =~ /mswin|mingw/
   begin
+    # not available for jruby yet
     require 'win32console'
   rescue LoadError
     ARGV << "--nocolour"
@@ -74,10 +74,8 @@ def remove_gitignored_files(filelist)
 end
 
 spec = Gem::Specification.new do |s|
-  
-  # Change these as appropriate
   s.name              = "redcar"
-  s.version           = "0.3.3"
+  s.version           = "0.3.4"
   s.summary           = "A JRuby text editor."
   s.author            = "Daniel Lucraft"
   s.email             = "dan@fluentradical.com"
@@ -86,25 +84,22 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc          = true
   s.extra_rdoc_files  = %w(README.md)
   s.rdoc_options      = %w(--main README.md)
-  # s.platform          = 
 
-  # Add any extra files to include in the gem
   s.files             = %w(CHANGES LICENSE Rakefile README.md ROADMAP.md) + 
                           Dir.glob("bin/redcar") + 
                           Dir.glob("config/**/*") + 
                           remove_gitignored_files(Dir.glob("lib/**/*")) + 
                           remove_gitignored_files(Dir.glob("plugins/**/*")) + 
                           Dir.glob("textmate/Bundles/*.tmbundle/Syntaxes/**/*") + 
+                          Dir.glob("textmate/Bundles/*.tmbundle/Preferences/**/*") + 
+                          Dir.glob("textmate/Bundles/*.tmbundle/Snippets/**/*") + 
                           Dir.glob("textmate/Themes/*.tmTheme")
   s.executables       = FileList["bin/redcar"].map { |f| File.basename(f) }
    
   s.require_paths     = ["lib"]
 
-  # If you want to depend on other gems, add them here, along with any
-  # relevant versions
-  # s.add_dependency("logging", "> 1.0.0")
+  s.add_dependency("rubyzip")
   
-  # If your tests use any gems, include them here
   s.add_development_dependency("cucumber")
   s.add_development_dependency("rspec")
   s.add_development_dependency("watchr")
@@ -133,7 +128,7 @@ end
 desc 'Clean up (sanitize) the Textmate files for packaging'
 task :clean_textmate do
   # rename files to be x-platform safe
-  Dir["textmate/Bundles/*.tmbundle/{Syntaxes,Snippets,Templates}/**/*"].each do |fn|
+  Dir["textmate/Bundles/*.tmbundle/*/**/*"].each do |fn|
     if File.file?(fn)
       bits = fn.split("/").last.split(".")[0..-2].join("_")
       new_basename = bits.gsub(" ", "_").gsub(/[^\w_]/, "__") + File.extname(fn)

data/bin/redcar

@@ -16,7 +16,7 @@ else
   require File.join(File.dirname(__FILE__), %w(.. lib redcar_quick_start))
   exit if Redcar.try_to_load_via_drb
   require File.join(File.dirname(__FILE__), %w(.. lib redcar))
-  Redcar.ensure_jruby
+  Redcar.spin_up
   Redcar.environment = :user
   Redcar.load
   Redcar::Top.start

data/lib/plugin_manager/lib/plugin_manager/plugin_definition.rb

@@ -21,7 +21,15 @@ class PluginManager
     end
     
     def load
-      required_files.each {|file| $".delete(file) }
+      required_files.each do |file|
+        #fn = File.expand_path(file, definition_directory)
+        #p file
+        #p fn
+        #if fn.match(/^#{Regexp.escape(definition_directory)}/)
+        #p :delete
+          $".delete(file)
+        #end
+      end
       load_file = File.expand_path(File.join(File.dirname(definition_file), file))
       $:.unshift(File.dirname(load_file))
       new_files = log_requires do
@@ -37,6 +45,10 @@ class PluginManager
       eval(object_string)
     end
     
+    def definition_directory
+      File.expand_path(File.dirname(@definition_file))
+    end
+    
     private
     
     def log_requires

data/lib/redcar.rb

@@ -8,6 +8,7 @@ require 'rbconfig'
 require 'redcar/ruby_extensions'
 require 'redcar/instance_exec'
 require 'redcar/usage'
+require 'regex_replace'
 
 require 'forwardable'
 require 'yaml'
@@ -39,10 +40,10 @@ require 'yaml'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.3'
+  VERSION         = '0.3.4'
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 3
-  VERSION_RELEASE = 3
+  VERSION_RELEASE = 4
   
   ENVIRONMENTS = [:user, :debug, :test]
 
@@ -57,12 +58,13 @@ module Redcar
     @environment
   end
 
-  def self.ensure_jruby
-    if Config::CONFIG["RUBY_INSTALL_NAME"] != "jruby"
-      require 'redcar/runner'
-      runner = Redcar::Runner.new
-      runner.spin_up
-    end
+  def self.spin_up
+    return if ARGV.include?("--no-sub-jruby")
+    return if Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby" and [:linux, :windows].include?(platform)
+    
+    require 'redcar/runner'
+    runner = Redcar::Runner.new
+    runner.spin_up
   end
 
   def self.root

data/lib/redcar/installer.rb

@@ -2,6 +2,11 @@
 require 'net/http'
 require 'fileutils'
 
+if Redcar.platform == :windows
+  require "rubygems"
+  require "zip/zipfilesystem"
+end
+
 module Redcar
   class Installer
   	def initialize
@@ -19,7 +24,10 @@ module Redcar
       require 'win32/registry'
       # associate it with the current rubyw.exe
       rubyw_bin = File.join([Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']]) << 'w' << Config::CONFIG['EXEEXT']
-      rubyw_bin.gsub!('/', '\\') # executable name wants back slashes
+      if rubyw_bin.include? 'file'
+        raise 'this must be run from a ruby exe, not a java -cpjruby.jar command'
+      end
+      rubyw_bin.gsub!('/', '\\') # executable names wants back slashes
       for type, english_text  in {'*' => 'Open with Redcar', 'Directory' => 'Open with Redcar (dir)'}
         name = Win32::Registry::HKEY_LOCAL_MACHINE.create "Software\\classes\\#{type}\\shell\\open_with_redcar"
         name.write_s nil, english_text
@@ -64,11 +72,12 @@ module Redcar
     JRUBY_JAR_DIR = File.expand_path(File.join(File.dirname(__FILE__), ".."))
     
     JRUBY = [
-      "http://jruby.kenai.com/downloads/1.4.0/jruby-complete-1.4.0.jar",
       "/jruby/jcodings.jar",
       "/jruby/jdom.jar",
       "/jruby/joni.jar"
     ]
+
+    JRUBY << "http://jruby.kenai.com/downloads/1.4.0/jruby-complete-1.4.0.jar" unless RUBY_PLATFORM =~ /java/
     
     JOPENSSL = {
       "/jruby/bcmail-jdk14-139-#{Redcar::VERSION}.jar" => "lib/openssl/lib/bcmail-jdk14-139.jar",
@@ -79,6 +88,8 @@ module Redcar
     REDCAR_JARS = {
       "/java-mateview-#{Redcar::VERSION}.jar" => "plugins/edit_view_swt/vendor/java-mateview.jar"
     }
+    
+    XULRUNNER_URI = "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2/runtimes/xulrunner-1.9.2.en-US.win32.zip"
 
     def grab_jruby
       puts "* Downloading JRuby"
@@ -109,6 +120,9 @@ module Redcar
       when /windows|mswin|mingw/i
         download("/swt/win32.jar", File.join(plugins_dir, %w(application_swt vendor swt win32 swt.jar)))
         # download("/swt/win64.jar", File.join(plugins_dir, %w(application_swt vendor swt win64 swt.jar)))
+        vendor_dir = File.expand_path(File.join(File.dirname(__FILE__), %w(.. .. vendor)))
+
+        download(XULRUNNER_URI, File.join(vendor_dir, 'xulrunner.zip'))
       end
     end
     
@@ -127,8 +141,31 @@ module Redcar
       File.open(path, "wb") do |write_out|
         write_out.print @connection.get(URI.parse(uri))
       end
+      
+      if path =~ /.*\.zip$/
+      	puts '  unzipping  ' + path
+      	Installer.unzip_file(path)
+      end
 
       puts "  downloaded #{uri}\n          to #{path}\n"
     end
+    
+    # unzip a .zip file into the directory it is located
+    def self.unzip_file(source)
+      source = File.expand_path(source)
+      Dir.chdir(File.dirname(source)) do
+        Zip::ZipFile.open(source) do |zipfile|
+          zipfile.entries.each do |entry|
+            FileUtils.mkdir_p(File.dirname(entry.name))
+          	begin
+              entry.extract
+            rescue Zip::ZipDestinationFileExistsError
+            end
+          end
+        end
+      end
+    end
   end
 end
+
+

data/lib/redcar/runner.rb

@@ -21,8 +21,9 @@ module Redcar
         command = "jruby #{java_args} \"#{bin}\" #{ARGV.join(' ')}"
       else
         ENV['RUBYOPT'] = nil # disable other native args
-        command = "java #{java_args} -cp \"#{jruby_complete}\" org.jruby.Main \"#{bin}\" #{ARGV.join(' ')}"
+        command = "java #{java_args} -Xmx500m -Xss1024k -Djruby.memory.max=500m -Djruby.stack.max=1024k -cp \"#{jruby_complete}\" org.jruby.Main \"#{bin}\" #{ARGV.join(' ')} --no-sub-jruby"
       end
+      puts command
       exec(command)
     end
     

data/lib/redcar_quick_start.rb

@@ -4,7 +4,7 @@ module Redcar
 
   # attempt to load via drb if available
   def self.try_to_load_via_drb
-    return if ARGV.include?("--multiple-instance")    
+    return if ARGV.find{|arg| arg == "--multiple-instance" || arg == '--help' || arg == '-h'}
     port = 9999
     begin
       begin
@@ -13,12 +13,13 @@ module Redcar
         # no other instance is currently running...
         return
       end
-      puts 'attempting to start via running instance'
+      puts 'attempting to start via running instance' if $VERBOSE
       require 'drb' # late require to avoid loadup time
       drb = DRbObject.new(nil, "druby://127.0.0.1:#{port}")
       
       if ARGV.any?
         ARGV.each do |arg|
+          next if arg[0..0] == "-"
           if drb.open_item_drb(File.expand_path(arg)) != 'ok'
             return
           end        
@@ -26,7 +27,7 @@ module Redcar
       else
        return unless drb.open_item_drb('just_bring_to_front')
       end
-      puts 'Success'
+      puts 'Success' if $VERBOSE
       true
     rescue Exception => e
       puts e.class.to_s + ": " + e.message

data/lib/regex_replace.rb

@@ -70,8 +70,10 @@ class RegexReplace
       re.sub(string, &blk)
     else
       md = re.match(string)
-      r  = yield md
-      string[md.begin(0)..(md.end(0)-1)] = r
+      if md
+        r  = yield md
+        string[md.begin(0)..(md.end(0)-1)] = r
+      end
       string
     end
   end
@@ -144,6 +146,12 @@ if $0 == __FILE__
       assert_equal "foo laura bar", rr.rep("foo blackbird bar")
     end
     
+    def test_simple_blank
+      rr = RegexReplace.new("blackbird", 
+                            "laura")
+      assert_equal "", rr.rep("")
+    end
+    
     def test_simple_global
       rr = RegexReplace.new("blackbird", 
                             "laura")

data/plugins/application/lib/application.rb

@@ -119,7 +119,7 @@ module Redcar
       
       @window_handlers.delete(window)
       if windows.length == 0 and [:linux, :windows].include?(Redcar.platform)
-        if Application.storage['stay_resident_after_last_window_closed'] == 'yes' && !(ARGV.include?("--multiple-instance"))
+        if Application.storage['stay_resident_after_last_window_closed'] && !(ARGV.include?("--multiple-instance"))
           puts 'continuing to run to wait for incoming drb connections later'
         else
           quit
@@ -130,7 +130,7 @@ module Redcar
     def self.storage
       @storage ||= begin
          storage = Plugin::Storage.new('application_plugin')
-         storage.set_default('stay_resident_after_last_window_closed', 'no')
+         storage.set_default('stay_resident_after_last_window_closed', false)
          storage
       end
     end
@@ -221,6 +221,36 @@ module Redcar
       end
     end
     
+    # Called by the Gui to tell the Application that it
+    # has lost focus.
+    def lost_application_focus
+      return if @protect_application_focus
+      @application_focus = false
+      puts "Lost application focus"
+      notify_listeners(:lost_focus, self)
+    end
+    
+    # Called by the Gui to tell the Application that it
+    # has gained focus.
+    def gained_application_focus
+      if @application_focus == false
+        @application_focus = true
+        puts "Gained application focus"
+        notify_listeners(:focussed, self)
+      end
+    end
+    
+    def has_focus?
+      @application_focus
+    end
+    
+    def protect_application_focus
+      @protect_application_focus = true
+      r = yield
+      @protect_application_focus = false
+      r
+    end
+    
     private
     
     def attach_window_listeners(window)

data/plugins/application/lib/application/dialogs/filter_list_dialog.rb

@@ -41,5 +41,53 @@ module Redcar
     def selected(text, ix)
       puts "Hooray! You selected #{text} at index #{ix}"
     end
+    
+    # Helper method for fuzzily filtering a list
+    #
+    # @param [Array<A>]     list        the list to filter
+    # @param [String]       query       the fuzzy string to match on
+    # @param [Integer]      max_length  the length of the resulting list (default 20)
+    # @block A -> String    turns an element from the list into a string to match on
+    def filter_and_rank_by(list, query, max_length=20)
+      re = make_regex(query)
+      score_match_pairs = []
+      cutoff = 100000000
+      results = list.each do |element|
+        bit = yield(element)
+        begin
+          if m = bit.match(re)
+            cs = []
+            m.captures.each_with_index do |_, i|
+              prev = cs.last
+              if prev and m.begin(i + 1) == prev[0] - prev[1]
+                cs.last[1] -= 1
+              else
+                cs << [m.begin(i + 1), m.begin(i + 1) - m.end(i + 1)]
+              end
+            end
+            if cs.first.first < cutoff
+              score_match_pairs << [cs, element]
+              score_match_pairs = score_match_pairs.sort_by {|a| a.first }
+              if score_match_pairs.length == max_length
+                cutoff = score_match_pairs.last.first.first.first
+                score_match_pairs.pop
+              end
+            end
+          end
+        rescue Errno::ENOENT
+          # File.directory? can throw no such file or directory even if File.exist?
+          # has returned true. For example this happens on some awful textmate filenames
+          # unicode in them.
+        end
+      end
+      score_match_pairs.map {|a| a.last }
+    end
+    
+    private
+    
+    def make_regex(text)
+      re_src = "(" + text.split(//).map{|l| Regexp.escape(l) }.join(").*?(") + ")"
+      Regexp.new(re_src, :options => Regexp::IGNORECASE)
+    end
   end
 end