redcar 0.5.2dev → 0.5.3dev

data/lib/plugin_manager/spec/plugin_manager_spec.rb

@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "spec_helper")
+require "spec_helper"
 
 describe PluginManager do
   before do
@@ -19,7 +19,7 @@ describe PluginManager do
   describe "loading plugin definitions" do
     before do
       @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures example)))
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading example)))
     end
     
     it "should find plugin files inside the source" do
@@ -36,8 +36,8 @@ describe PluginManager do
   
   describe "loading plugin definitions with syntax errors in them" do
     before do
-      @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures error_in_definition)))
+      @manager = PluginManager.new(StringIO.new)
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading error_in_definition)))
     end
     
     it "should not die when loading the definition" do
@@ -47,14 +47,14 @@ describe PluginManager do
     it "should report it as an error" do
       @manager.unreadable_definitions.length.should == 1
       @manager.unreadable_definitions.first.should == 
-        File.expand_path(File.join(File.dirname(__FILE__), %w(fixtures error_in_definition core plugin.rb)))
+        File.expand_path(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading error_in_definition core plugin.rb)))
     end
   end
   
   describe "loading plugins" do
     before do
       @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures example)))
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading example)))
       @manager.load
     end
     
@@ -73,8 +73,8 @@ describe PluginManager do
   
   describe "loading plugins with errors in them" do
     before do
-      @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures error_in_plugin)))
+      @manager = PluginManager.new(StringIO.new)
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading error_in_plugin)))
     end
     
     it "should not die when loading plugins" do
@@ -91,7 +91,7 @@ describe PluginManager do
   describe "loading plugins with unmet dependencies because the plugin is missing" do
     before do
       @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures unmet_dependencies1)))
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading unmet_dependencies1)))
     end
     
     it "should load the rest of the plugins ok" do
@@ -103,7 +103,7 @@ describe PluginManager do
   describe "loading plugins with unmet dependencies because the plugin is not recent enough" do
     before do
       @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures unmet_dependencies2)))
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading unmet_dependencies2)))
     end
     
     it "should load the rest of the plugins ok" do
@@ -115,7 +115,7 @@ describe PluginManager do
   describe "reloading plugins" do
     before do
       @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures example)))
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading example)))
       @manager.load
     end
     
@@ -128,7 +128,7 @@ describe PluginManager do
   describe "loading when there are multiple versions" do
     before do
       @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures two_versions1)))
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading two_versions1)))
       @manager.load
     end
     
@@ -144,16 +144,54 @@ describe PluginManager do
   describe "loading when there are multiple versions and the most recent has unmet deps" do
     before do
       @manager = PluginManager.new
-      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures two_versions2)))
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading two_versions2)))
+    end
+     
+    it "should not load the plugin" do
       @manager.load
+      @manager.loaded_plugins.length.should == 0
+    end
+  end
+  
+  describe "specify which plugin to load and load only that and it's dependencies" do
+    before do
+      @manager = PluginManager.new
+      @manager.add_plugin_source(File.join(File.dirname(__FILE__), %w(fixtures plugin_loading example)))
     end
      
-    it "should only load one version" do
+    it "should only load one plugin if that's right" do
+      @manager.load("Core")
       @manager.loaded_plugins.length.should == 1
+      @manager.loaded_plugins.first.name.should == "Core"
+    end
+    
+    it "should load dependencies of the specified plugin" do
+      @manager.load("Extras")
+      @manager.loaded_plugins.length.should == 2
+      @manager.loaded_plugins.map {|pl| pl.name }.sort.should == ["Core", "Extras"]
+    end
+
+    it "should load dependencies of dependencies" do
+      @manager.load("Debug")
+      @manager.loaded_plugins.length.should == 3
+      @manager.loaded_plugins.map {|pl| pl.name }.sort.should == ["Core", "Debug", "Extras"]
+    end
+    
+    it "should let you specify multiple plugins to load" do
+      @manager.load("Core", "Debug")
+      @manager.loaded_plugins.length.should == 3
+      @manager.loaded_plugins.map {|pl| pl.name }.sort.should == ["Core", "Debug", "Extras"]
+    end
+    
+    it "should let you load more after loading the first batch" do
+      @manager.load("Core")
+      @manager.load("Debug")
+      @manager.loaded_plugins.length.should == 3
+      @manager.loaded_plugins.map {|pl| pl.name }.sort.should == ["Core", "Debug", "Extras"]
     end
     
-    it "should load the most recent version with met dependencies" do
-      @manager.loaded_plugins.first.version.should == "1.0"
+    it "should raise an error if you try to load a plugin that doesn't exist" do
+      lambda { @manager.load("AFOSIJ") }.should raise_error
     end
   end
     

data/lib/redcar.rb

@@ -52,7 +52,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.5.2dev' # also change in the Rakefile!
+  VERSION         = '0.5.3dev' # also change in the Rakefile!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 5
   VERSION_RELEASE = 0
@@ -76,52 +76,9 @@ module Redcar
   end
 
   def self.spin_up
-    forking = ARGV.include?("--fork")
-    no_runner = ARGV.include?("--no-sub-jruby")
-    jruby = Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
-    osx = (not [:linux, :windows].include?(platform))
-
-    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 Redcar.null_device
-          STDOUT.reopen Redcar.null_device, 'a'
-          STDERR.reopen STDOUT
-        end
-      elsif forking and SPOON_AVAILABLE and ::Spoon.supported?
-        # so we need to try something different...
-        
-        forking = false
-        require 'redcar/runner'
-        runner = Redcar::Runner.new
-        runner.spin_up do |command|
-          command.push('--silent')
-          ::Spoon.spawnp(*command)
-        end
-        exit 0
-      elsif forking
-        raise NotImplementedError, "Something weird has happened. Please contact us."
-      end
-    rescue NotImplementedError
-      puts $!.class.name + ": " + $!.message
-      puts "Forking isn't supported on this system. Sorry."
-      puts "Starting normally..."
-    end
-    
-    return if no_runner
-    return if jruby and not osx
-    
     require 'redcar/runner'
     runner = Redcar::Runner.new
-    runner.spin_up do |command|
-      exec(*command)
-    end
+    runner.run
   end
 
   def self.root
@@ -137,8 +94,11 @@ module Redcar
     end
   end
 
-  # Tells the plugin manager to load plugins, and prints debug output.
-  def self.load
+  def self.load_prerequisites
+    exit if ARGV.include?("--quit-immediately")
+    
+    require 'redcar_quick_start'
+    
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "plugin_manager", "lib"))
     require 'plugin_manager'
     
@@ -149,27 +109,72 @@ module Redcar
     
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "openssl", "lib"))
     require 'openssl'
+    
+    plugin_manager.load("swt")
+  end
 
-    plugin_manager.load
-    if plugin_manager.unreadable_definitions.any?
-      puts "Couldn't read definition files: "
-      puts plugin_manager.unreadable_definitions.map {|d| "  * " + d}
+  def self.load_plugins
+    begin
+      exit if ARGV.include?("--quit-after-splash")
+      
+      plugin_manager.load
+      if plugin_manager.unreadable_definitions.any?
+        puts "Couldn't read definition files: "
+        puts plugin_manager.unreadable_definitions.map {|d| "  * " + d}
+      end
+      if plugin_manager.plugins_with_errors.any?
+        puts "There was an error loading plugins: "
+        puts plugin_manager.plugins_with_errors.map {|d| "  * " + d.name}
+      end
+      if ENV["PLUGIN_DEBUG"]
+        puts "Loaded plugins:"
+        puts plugin_manager.loaded_plugins.map {|d| "  * " + d.name}
+        puts
+        puts "Unloaded plugins:"
+        puts plugin_manager.unloaded_plugins.map {|d| "  * " + d.name}
+      end
+    rescue => e
+      puts e.message
+      puts e.backtrace
     end
-    if plugin_manager.plugins_with_errors.any?
-      puts "There was an error loading plugins: "
-      puts plugin_manager.plugins_with_errors.map {|d| "  * " + d.name}
+  end
+  
+  # Tells the plugin manager to load plugins, and prints debug output.
+  def self.load_threaded
+    load_prerequisites
+    thread = Thread.new do
+      load_plugins
+      Redcar::Top.start(ARGV)
     end
-    if ENV["PLUGIN_DEBUG"]
-      puts "Loaded plugins:"
-      puts plugin_manager.loaded_plugins.map {|d| "  * " + d.name}
-      puts
-      puts "Unloaded plugins:"
-      puts plugin_manager.unloaded_plugins.map {|d| "  * " + d.name}
+    if no_gui_mode?
+      thread.join
+    end
+  end
+  
+  def self.load_unthreaded
+    load_prerequisites
+    load_plugins
+  end
+  
+  def self.no_gui_mode?
+    ARGV.include?("--no-gui")
+  end
+  
+  def self.show_splash
+    return if Redcar.no_gui_mode?
+    
+    Swt.create_splash_screen(plugin_manager.plugins.length + 10)
+    plugin_manager.on_load do |plugin|
+      Swt.sync_exec do
+        Swt.splash_screen.inc
+      end
     end
   end
 
-  # Starts the GUI.
+  ## Starts the GUI.
   def self.pump
+    return if Redcar.no_gui_mode?
+    
     Redcar.gui.start
   end
 
@@ -187,7 +192,7 @@ module Redcar
   
   # Platform specific ~/.redcar/assets
   def self.asset_dir
-    File.join(user_dir, "assets")
+    File.join(home_dir, ".redcar", "assets")
   end
   
   # Platform specific ~/
@@ -213,6 +218,7 @@ module Redcar
   # Set the application GUI.
   def self.gui=(gui)
     raise "can't set gui twice" if @gui
+    return if Redcar.no_gui_mode?
     @gui = gui
   end
 end

data/lib/redcar/installer.rb

@@ -23,10 +23,7 @@ module Redcar
       Redcar.environment = :user
       puts "Downloading >10MB of binary assets. This may take a while the first time."
       fetch_all_assets
-      puts "Building textmate bundle cache"
-      s = Time.now
-      load_textmate_bundles
-      puts "... took #{Time.now - s}s"
+      precache_textmate_bundles
       puts "Done! You're ready to run Redcar."
     end
   
@@ -105,7 +102,8 @@ module Redcar
         exit
       end
       
-      FileUtils.mv(temporary_target, destination_file)
+      FileUtils.cp(temporary_target, destination_file)
+      FileUtils.rm_rf(temporary_target)
       puts "done!"
     end
     
@@ -126,14 +124,11 @@ module Redcar
       end
     end
     
-    def load_textmate_bundles
-      $:.unshift("#{File.dirname(__FILE__)}/../../plugins/core/lib")
-      $:.unshift("#{File.dirname(__FILE__)}/../../plugins/textmate/lib")
-      require 'core'
-      Redcar.environment = :user
-      Core.loaded
-      require 'textmate'
-      Redcar::Textmate.all_bundles
+    def precache_textmate_bundles
+      puts "Precaching textmate bundles..."
+      Runner.new.construct_command(["--no-gui", "--compute-textmate-cache-and-quit", "--multiple-instance"]) do |cmd|
+        %x{#{cmd.join(' ')}}
+      end
     end
     
     # Xulrunner releases don't hang around very long, so we scrape their site to figure out 

data/lib/redcar/jvm_options_probe.rb

@@ -0,0 +1,14 @@
+
+class JvmOptionsProbe
+  def initialize
+    @help = `java -help`
+  end
+  
+  def can_use_d32?
+    @help.include?("-d32")
+  end
+  
+  def can_use_client?
+    @help.include?("-client")
+  end
+end

data/lib/redcar/runner.rb

@@ -1,11 +1,55 @@
 module Redcar
   # Cribbed from ruby-processing. Many thanks!
   class Runner
+    def run
+      forking = ARGV.include?("--fork")
+      no_runner = ARGV.include?("--no-sub-jruby")
+      jruby = Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
+      osx = (not [:linux, :windows].include?(Redcar.platform))
+      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 Redcar.null_device
+            STDOUT.reopen Redcar.null_device, 'a'
+            STDERR.reopen STDOUT
+          end
+        elsif forking and SPOON_AVAILABLE and ::Spoon.supported?
+          # so we need to try something different...
+          
+          forking = false
+          construct_command do |command|
+            command.push('--silent')
+            ::Spoon.spawnp(*command)
+          end
+          exit 0
+        elsif forking
+          raise NotImplementedError, "Something weird has happened. Please contact us."
+        end
+      rescue NotImplementedError
+        puts $!.class.name + ": " + $!.message
+        puts "Forking isn't supported on this system. Sorry."
+        puts "Starting normally..."
+      end
+      
+      return if no_runner
+      return if jruby and not osx
+      
+      construct_command do |command|
+        exec(*command)
+      end
+    end
+    
     # Trade in this Ruby instance for a JRuby instance, loading in a 
     # starter script and passing it some arguments.
     # If --jruby is passed, use the installed version of jruby, instead of 
     # our vendored jarred one (useful for gems).
-    def spin_up
+    def construct_command(args="")
       bin = File.expand_path(File.join(File.dirname(__FILE__), %w{.. .. bin redcar}))
       jruby_complete = File.expand_path(File.join(Redcar.asset_dir, "jruby-complete-1.5.2.jar"))
       unless File.exist?(jruby_complete)
@@ -22,6 +66,7 @@ module Redcar
       command.push(bin)
       command.push(*cleaned_args)
       command.push("--no-sub-jruby", "--ignore-stdin")
+      command.push(*args)
       
       puts command.join(' ')
       yield command
@@ -29,13 +74,15 @@ module Redcar
     
     def cleaned_args
       # We should never pass --fork to a subprocess
-      ARGV.find_all {|arg| arg != '--fork'}.map do |arg|
+      result = ARGV.find_all {|arg| arg != '--fork'}.map do |arg|
         if arg =~ /--(.+)=(.+)/
           "--" + $1 + "=\"" + $2 + "\""
         else
           arg
         end
       end
+      result.delete("install")
+      result
     end
     
     def debug_mode?
@@ -51,10 +98,13 @@ module Redcar
       if ARGV.include?("--load-timings")
         str.push "-Djruby.debug.loadService.timing=true"
       end
+
+      require 'redcar/jvm_options_probe'
       
-      if ARGV.include?("--quick")
-        str.push "-d32 -client"
-      end
+      jvm_options_probe = JvmOptionsProbe.new
+      
+      str.push "-d32" if jvm_options_probe.can_use_d32?
+      str.push "-client" if jvm_options_probe.can_use_client?
       
       str
     end