redcar 0.5.2dev → 0.5.3dev

data/CHANGES

@@ -11,7 +11,11 @@ Enhancements
  * Open directory in command line / os directory viewer (Matthew Scharley, Delisa Mason)
  * Can press enter really fast in the FindFileDialog and it will open the correct file (Tim Felgentreff)
  * Use spoon for forking on Linux, OSX (Matthew Scharley)
- * Find in project streams (Kieran Pilkington)
+ * Find-in-project streams as it finds results (Kieran Pilkington)
+ * Installer doesn't need to be run as root anymore. (Dan Lucraft)
+ * Splash screen (Dan Lucraft)
+ * Installer loads Redcar, therefore putting all the Redcar files in the OS disk cache (Dan Lucraft)
+ * Read installed JVM options and use 32bit client vm if available (Dan Lucraft)
 
 New internal APIs
 
@@ -21,6 +25,14 @@ New internal APIs
 Fixes:
 
  * Fix for autocomplete, which was randomly broken due to a load order error (Anko painting)
+ * [Bug 300] Remove duplicate snippets (requires deleting your Textmate cache file)(Dan Lucraft)
+ * [Bug 297] New files can be immediately opened from the directory tree again (Dan Lucraft)
+ * [Bug 302] Search/replace won't infinitely recurse when the search string is a prefixed substring of the replace text. (Dan Lucraft)
+ * [Bug 293] Select Word works correctly on such un-American words as: "können" (Dan Lucraft)
+ * [Bug 286] The paste command no longer inserts in the wrong location when the autoindenter tries to run during the command (Dan Lucraft)
+ * [Bug 270] The "Go to declaration" fuzzy finder chooses the right file when you have refined the list (Dan Lucraft)
+ * Precaching textmate bundles is now more robust (Dan Lucraft)
+ * [Bug 209] Gives visual feedback during startup (Dan Lucraft)
 
 Version 0.4.1 (24 Aug 2010)
 ===========================
@@ -130,7 +142,7 @@ Version 0.3.7 (24 Jun 2010)
 ===========================
 
 Enhancements:
- 
+
   * Can create new files and directories, rename and delete files in the Project pane (Dan Lucraft)
   * Can Bulk Rename files in projects with regular expression replacement (Dan Lucraft)
   * Can drag and drop files and directories in the Project pane (Dan Lucraft)
@@ -173,7 +185,7 @@ New APIs:
 
   * Annotations column (Dan Lucraft)
   * Open popup menu and tooltips at cursor/pointer locations (Dan Lucraft)
-  
+
 New contributors:
 
   * Nizar Jouini
@@ -182,7 +194,7 @@ Version 0.3.5dev (1 May 2010)
 =============================
 
 Enhancements:
-  
+
   * Jump to declaration support for Ruby and Java
   * Double click respects word boundaries
   * Window title reflects project name
@@ -207,14 +219,14 @@ Enhancements:
   * Add profiling commands to the Debug menu (uses jruby-prof)
   * Lazy menus API
   * Commands to profile Redcar with jruby-prof.
-  
+
 Fixes:
 
   * Fix delete at end of line when using "\r\n" delimiter
   * Increase and decrease indent commands respect soft tabs and tab width settings
   * Directory tree sorts correctly
   * Speed up opening a project (about 1s faster)
-  
+
 New contributors:
 
   * Antono Vasiljev
@@ -232,18 +244,18 @@ New features:
   * 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.
-  
+
 Fixes:
 
   * Respects Windows style line delimiters
-  
+
 New contributors:
 
   * Aaron McLeod
@@ -287,7 +299,7 @@ Fixes:
   * Search searches last line in doc.
   * Doesn't die on Windows-1252 encodings.
   * Plugin Manager UI works on Linux and Windows.
-  
+
 New contributors:
 
   * Mat Schaffer
@@ -346,7 +358,7 @@ Enhancements:
   * Added Java, Perl and Ruby on Rails bundles.
   * New simpler way for bundles to add commands to menus (used in repl.rb)
   * New "redcar install" command to download jars.
-  
+
 Fixes:
 
   * Change key logic in JavaMateView - should fix a bunch of subtle highlighting bugs.
@@ -359,7 +371,7 @@ Version 0.3.0dev (25 Dec 2009)
 Rewritten in JRuby/SWT.
 
 Enhancements:
-  
+
   * _Much_ simpler installation: packaged as a gem.
   * Faster highlighter
   * Fewer bugs
@@ -404,7 +416,7 @@ Version 0.1 (6 April 2009)
 ==========================
 http://redcareditor.com/releases/redcar-0.1.tar.gz
 
-First release. 
+First release.
 
 Features:
 

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.5.2dev" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.5.3dev" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'

data/bin/redcar

@@ -13,6 +13,7 @@ end
 if ARGV.first == "install"
   require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar)))
   require 'redcar/installer'
+  require 'redcar/runner'
   installer = Redcar::Installer.new
   installer.install
 else
@@ -21,7 +22,7 @@ else
   require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar)))
   Redcar.environment = :user
   Redcar.spin_up
-  Redcar.load
-  Redcar::Top.start(ARGV)
+  Redcar.load_threaded
+  Redcar.show_splash
   Redcar.pump
 end

data/lib/plugin_manager/README.md

@@ -54,6 +54,9 @@ The code in the appropriate plugins will be loaded and you will then have availa
     # plugins that raised exceptions while being loaded
     manager.plugins_with_errors
 
+NB. There is a BIG difference between this and say, Rubygems, in that plugin_manager will ONLY EVER
+LOAD THE MOST RECENT VERSION OF A PLUGIN. Older versions essentially DON'T EXIST from the point of view
+of the plugin_manager.
 
 License
 =======

data/lib/plugin_manager/lib/plugin_manager.rb

@@ -6,17 +6,27 @@ require 'plugin_manager/plugin_definition'
 require 'plugin_manager/definition_builder'
 
 class PluginManager
-  attr_reader :unreadable_definitions, :plugins_with_errors, :loaded_plugins, :unloaded_plugins
+  attr_reader :unreadable_definitions, :plugins_with_errors, :loaded_plugins, :unloaded_plugins, :output
 
-  def initialize
-    @unloaded_plugins = []
-    @loaded_plugins = []
+  class << self
+    attr_accessor :current
+  end
+  
+  def initialize(output = STDOUT)
+    @plugins                = []
+    @unloaded_plugins       = []
+    @loaded_plugins         = []
     @unreadable_definitions = []
-    @plugins_with_errors = []
+    @plugins_with_errors    = []
+    @output = output
   end
 
+  def on_load(&block)
+    @load_observer = block
+  end
+  
   def plugins
-    @unloaded_plugins + @loaded_plugins
+    @plugins
   end
   
   def plugin_objects
@@ -27,62 +37,143 @@ class PluginManager
     plugin_objects.select {|obj| obj.respond_to?(method_name) }
   end
 
+  class Dependency
+    attr_reader :required_name
+    attr_reader :required_version
+    
+    def initialize(plugin_manager, required_name, required_version)
+      @plugin_manager = plugin_manager
+      @required_name = required_name
+      @required_version = required_version
+    end
+    
+    def satisfied?
+      if loaded_plugin = @plugin_manager.loaded_plugins.detect {|pl| pl.name == required_name }
+        PluginManager.compare_version(required_version, loaded_plugin.version)
+      end
+    end
+    
+    def inspect
+      "dep(#{required_name} #{required_version})"
+    end
+  end
+  
   def add_plugin_source(directory)
     definition_files = Dir[File.join(File.expand_path(directory), "*", "plugin.rb")]
     definition_files.reject! {|f| plugins.any? {|pl| pl.definition_file == File.expand_path(f) } }
-    new_definitions = 
-      definition_files.map do |file|
-        begin
-          definition = instance_eval(File.read(file))
-          definition.definition_file = File.expand_path(file)
-          definition
-        rescue Object => e
-          puts "Unreadable plugin definition: #{file}"
-          puts "  " + e.message
-          puts e.backtrace.map {|l| "  " + l }
-          @unreadable_definitions << file
-          nil
+    definition_files.each do |file|
+      begin
+        PluginManager.current = self
+        definition = instance_eval(File.read(file))
+        PluginManager.current = nil
+        definition.definition_file = File.expand_path(file)
+        if already_with_that_name = @plugins.detect {|pl| pl.name == definition.name }
+          if already_with_that_name.version.to_f < definition.version.to_f
+            @unloaded_plugins.delete(already_with_that_name)
+            @plugins.delete(already_with_that_name)
+            @unloaded_plugins << definition
+            @plugins << definition
+          end
+        else
+          @unloaded_plugins << definition
+          @plugins << definition
         end
-      end.compact.sort_by {|p| p.name.downcase }
-    @unloaded_plugins += new_definitions
+      rescue Object => e
+        @output.puts "Unreadable plugin definition: #{file}"
+        @output.puts "  " + e.message
+        @output.puts e.backtrace.map {|l| "  " + l }
+        @unreadable_definitions << file
+        nil
+      end
+    end
+    
+    @plugins = @plugins.sort_by {|pl| pl.name }
+    @unloaded_plugins = @unloaded_plugins.sort_by {|pl| pl.name }
   end
   
-  def load
-    previous_length = @unloaded_plugins.length + 1
-    while previous_length > @unloaded_plugins.length
-      previous_length = @unloaded_plugins.length
-      if plugin = next_to_load
-        begin
-          puts "[PluginManager] loading #{plugin.name}" if ENV["PLUGIN_DEBUG"]
-          plugin.load
-          @loaded_plugins << plugin
-        rescue Object => e
-          puts "Error loading plugin: #{plugin.inspect}"
-          puts "  " + e.message
-          puts e.backtrace.map {|l| "  " + l }
-          @plugins_with_errors << plugin
+  def load(*plugin_names)
+    if plugin_names.empty?
+      return load_maximal
+    else
+      target_dependencies = plugin_names.map do |n| 
+        unless result = latest_version_by_name(n) 
+          raise "can't find plugin named #{n}"
         end
-        @unloaded_plugins.delete(plugin)
+        Dependency.new(self, n, ">0")
+      end
+    end
+    remaining_to_load = expand_dependencies(target_dependencies)
+    while remaining_to_load.length > 0
+      previous_length = remaining_to_load.length
+      if plugin = next_to_load(remaining_to_load)
+        load_plugin(plugin)
+        remaining_to_load = remaining_to_load.reject {|dep| dep.required_name == plugin.name }
+      else
+        puts "no plugin to load from #{remaining_to_load.inspect}"
+        return
       end
+      new_length = remaining_to_load.length
     end
   end
   
+  def latest_version_by_name(name)
+    @plugins.select {|pl| pl.name == name }.sort_by {|pl| pl.version }.last
+  end
+  
   private
   
-  def next_to_load
-    # this ordering ensures we try the most recent version of a plugin first
-    remaining_plugins = @unloaded_plugins.sort_by {|pl| pl.version }.reverse
-    
-    remaining_plugins.detect do |d|
-      next if @loaded_plugins.map {|pl| pl.name }.include?(d.name)
-      (d.dependencies||[]).all? do |dep|
-        req_name, req_ver = *dep
-        @loaded_plugins.detect do |d1| 
-          d1.name == req_name and 
-            PluginManager.compare_version(req_ver, d1.version)
+  def load_plugin(plugin)
+    begin
+      @output.puts "[PluginManager] loading #{plugin.name}" if ENV["PLUGIN_DEBUG"]
+      plugin.load
+      if @load_observer
+        @load_observer.call(plugin)
+      end
+      @loaded_plugins << plugin
+    rescue Object => e
+      @output.puts "Error loading plugin: #{plugin.inspect}"
+      @output.puts "  " + e.message
+      @output.puts e.backtrace.map {|l| "  " + l }
+      @plugins_with_errors << plugin
+    end
+    @unloaded_plugins.delete(plugin)
+  end
+  
+  def load_maximal
+    while ready_plugin = @unloaded_plugins.detect {|pl| pl.dependencies.all? {|dep| dep.satisfied? }}
+      load_plugin(ready_plugin)
+    end
+  end
+  
+  def expand_dependencies(dependency_array)
+    previous_length = dependency_array.length
+    new_dependency_array = dependency_array.map do |dep|
+      if pl = latest_version_by_name(dep.required_name)
+        [dep, pl.dependencies]
+      else
+        dep
+      end
+    end.flatten.uniq
+    if new_dependency_array.length > previous_length
+      expand_dependencies(new_dependency_array)
+    else
+      new_dependency_array
+    end
+  end
+
+  def next_to_load(dependency_array)
+    hash = Hash.new {|h,k| h[k] = []}
+    dependency_array.each {|dep| hash[dep.required_name] << dep.required_version}
+    hash.each do |name, version_requirements|
+      if candidate_for_loading = unloaded_plugins.detect {|pl| pl.name == name}
+        all_requirements_met = version_requirements.all? do |version_requirement|
+          PluginManager.compare_version(version_requirement, candidate_for_loading.version)
         end
+        all_candidate_deps_met = candidate_for_loading.dependencies.all? {|dep| dep.satisfied?}
+        return candidate_for_loading if all_requirements_met and all_candidate_deps_met
       end
     end
+    nil
   end
   
   def self.compare_version(required, got)
@@ -106,7 +197,7 @@ class PluginManager
           md[2] != got
         end
       else
-        puts "don't recognize version string: #{required.inspect}"
+        @output.puts "don't recognize version string: #{required.inspect}"
       end
     end
   end

data/lib/plugin_manager/lib/plugin_manager/definition_builder.rb

@@ -27,10 +27,28 @@ class PluginManager
       @definition.file = values
     end
     
+    def install(*args)
+      if args.length == 1
+        if Hash === args.first
+          hash = args.first
+        else
+          hash = { args.first => File.basename(args.first) }
+        end
+      elsif args.length == 2
+        prefix = args.first
+        if Hash === args[1]
+          hash   = Hash[args[1].map {|k, v| [prefix + k, v]}]
+        elsif Array === args[1]
+          hash = Hash[args[1].map {|path| [prefix + path, File.basename(path) ] } ]
+        end
+      end
+      @definition.resources.merge!(hash)
+    end
+    
     def dependencies(*deps)
       @definition.dependencies ||= []
       deps.each_slice(2) do |name, ver|
-        @definition.dependencies << [name, ver]
+        @definition.dependencies << PluginManager::Dependency.new(PluginManager.current, name, ver)
       end
     end
   end

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

@@ -5,21 +5,29 @@ class PluginManager
                   :version,
                   :object_string,
                   :file,
-                  :dependencies,
-                  :definition_file
+                  :definition_file,
+                  :resources
                   
     def inspect1              
-      "<Plugin #{name} #{version} depends:[#{(dependencies||[]).map{|dep| dep.join("")}.join(", ")}] #{required_files.length} files>"
+      "<Plugin #{name} #{version} depends:#{dependencies.inspect} #{required_files.length} files>"
     end
     
     def inspect
       inspect1
     end
     
+    def resources
+      @resources ||= {}
+    end
+    
     def required_files
       @required_files ||= []
     end
     
+    def dependencies
+      @dependencies ||= []
+    end
+    
     def load_time
       @load_time
     end