redcar 0.3.10.0dev → 0.3.10.1dev

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.3.10.0dev"
+REDCAR_VERSION = "0.3.10.1dev"
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'

data/lib/redcar/runner.rb

@@ -13,7 +13,8 @@ module Redcar
         exit 1
       end
       ENV['RUBYOPT'] = nil # disable other native args
-      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"
+      # add -d32 -client for faster startup if the jvm is defaulting to server/64bit mode
+      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"
       puts command
       exec(command)
     end

data/lib/redcar.rb

@@ -41,7 +41,7 @@ require 'uri'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.10.0dev'
+  VERSION         = '0.3.10.1dev'
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 3
   VERSION_RELEASE = 10

data/plugins/application_swt/spec/spec_helper.rb

@@ -13,7 +13,7 @@ Spec::Runner.configure do |config|
 
   config.after(:each) do
   end
-  
+
   config.after(:suite) do
   end
 end

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -20,12 +20,13 @@ module Redcar
     end
     
     def self.load_textmate_assets
+      s = Time.now
       load_textmate_assets_from_dir(Redcar.root + "/plugins/textmate/vendor/redcar-bundles")
       Redcar.plugin_manager.loaded_plugins.each do |plugin|
         load_textmate_assets_from_dir(File.dirname(plugin.definition_file) + "/")
       end
       load_textmate_assets_from_dir(Redcar.user_dir + "/")
-      
+      puts "took #{Time.now - s}s to load textmate assets"
       EditView.themes.unshift(*JavaMateView::ThemeManager.themes.to_a.map {|th| th.name })
     end
     

data/plugins/redcar/redcar.rb

@@ -1002,9 +1002,7 @@ module Redcar
       puts "loading plugins took #{Time.now - PROCESS_START_TIME}"
       Application.start
       ApplicationSWT.start
-      s = Time.now
       EditViewSWT.start
-      puts "EditViewSWT.start took #{Time.now - s}s"
       s = Time.now
       Redcar.gui = ApplicationSWT.gui
       Redcar.app.controller = ApplicationSWT.new(Redcar.app)

data/plugins/textmate/lib/textmate.rb

@@ -8,9 +8,10 @@ require 'textmate/snippet'
 module Redcar
   module Textmate
     def self.all_bundle_paths
-      Dir[File.join(Redcar.root, "plugins", "textmate", "vendor", "redcar-bundles", "Bundles", "*")]
+      Dir[File.join(Redcar.root, "plugins", "textmate", "vendor", "redcar-bundles", "Bundles", "*")] + 
+        Dir[File.join(Redcar.user_dir, "Bundles", "*")]
     end
-    
+
     def self.uuid_hash
       @uuid_hash ||= begin
         h = {}