redcar 0.3.7.1 → 0.3.8

data/CHANGES

@@ -1,4 +1,20 @@
 
+Version 0.3.8 (TBA)
+===================
+
+ * Can switch between open trees in a window (Dan Lucraft)
+ * Runnables: extensible runnable tasks/build items/tests/generators for projects. (Dan Lucraft)
+ * Runnables: run scripts in edit tabs as processes. (Dan Lucraft)
+ * Fix for: end key not working in documents with Windows-style line endings (Dan Lucraft)
+ * Caches downloaded jar files so that installation is faster when updating versions. (Felipe Coury)
+ * Fix for: dragging and dropping HtmlTabs between notebooks and windows. (Dan Lucraft)
+ * Select Word command (Johannes Wollert)
+ * Move tab up/Move tab down commands (Johannes Wollert)
+ * New APIs: Document#current_word, Document#word_at_offset (Johannes Wollert)
+ * Made the first tab open for a new install MUCH faster by generating the textmate bundle cache in the install script (Dan Lucraft)
+ * Search speedbar is opened with selected text as the default search (Johannes Wollert)
+ * Helper method for executing JavaScript in the browser during controller actions (Dan Lucraft)
+
 Version 0.3.7.1 (25 Jun 2010)
 =============================
 

data/README.md

@@ -30,6 +30,11 @@ for a list of options.
 ## INSTALLING FROM SOURCE
 
 If you want to contribute to Redcar, you can install it from the source code.
+
+If you're running Windows, as a prerequisite, you'll need to install the rubyzip gem:
+
+    $ gem install rubyzip
+
 Download from github, checkout the submodules and build JavaMateView. You will need Ant 
 installed, and RSpec and Cucumber installed as JRuby gems.
 

data/ROADMAP.md

@@ -2,24 +2,22 @@
 Redcar JRuby Port Roadmap
 =========================
 
-Features still to port
------------------------
-
-  * Tests passing on 3 platforms
-  * Full project support
-  * Text/Source/Ruby bundle commands ported
-  * Packaged for one-click install on 3 platforms
-  * Ruby on Rails/HTML/CSS/YAML bundle commands ported
-  
 Version 0.4.0
 -------------
 
 Feature parity with Redcar 0.2.
 
+Remaining:
+  * Text/Source/Ruby bundle commands ported
+  * Ruby on Rails/HTML/CSS/YAML bundle commands ported
+  
+
 And then for 1.0...
 -------------------
 
   * Incremental search
+  * Tests passing on 3 platforms
+  * Packaged for one-click install on 3 platforms
   * Find/Replace
   * Go to symbol
   * Command browser

data/Rakefile

@@ -1,5 +1,4 @@
-REDCAR_VERSION = "0.3.7.1"
-
+REDCAR_VERSION = "0.3.8"
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
@@ -159,12 +158,13 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 desc "Build a MacOS X App bundle"
-task :app_bundle do
+task :app_bundle => :build do
   require 'erb'
 
   redcar_icon = "redcar_icon_beta.png"
 
   bundle_contents = File.join("pkg", "Redcar.app", "Contents")
+  FileUtils.rm_rf bundle_contents if File.exist? bundle_contents
   macos_dir = File.join(bundle_contents, "MacOS")
   resources_dir = File.join(bundle_contents, "Resources")
   FileUtils.mkdir_p macos_dir
@@ -202,7 +202,7 @@ task :app_bundle do
     f << '#!/bin/sh
           DIR=$(cd "$(dirname "$0")"; pwd)
           REDCAR=$(cd "$(dirname "${DIR}/../Resources/bin/redcar")"; pwd)
-          ruby $REDCAR/redcar --ignore-stdin $@'
+          $REDCAR/redcar --ignore-stdin $@'
   end
   File.chmod 0777, File.join(macos_dir, "redcar")
 
@@ -211,7 +211,8 @@ task :app_bundle do
     FileUtils.cp_r f, File.join(resources_dir, f), :remove_destination => true
   end
 
-  system "#{File.join(macos_dir, "redcar")} install"
+  p "Running #{File.join(resources_dir, "bin", "redcar")} install"
+  system "#{File.join(resources_dir, "bin", "redcar")} install"
 
   FileUtils.cp_r File.join(resources_dir, "plugins", "application", "icons", redcar_icon), 
       resources_dir, :remove_destination => true
@@ -288,32 +289,64 @@ task :release => :gem do
   AWS::S3::S3Object.store("redcar-#{REDCAR_VERSION}.gem", open(file), 'redcar', :access => :public_read)
 end
 
-def hash_with_hash_default
-  Hash.new {|h,k| h[k] = hash_with_hash_default }
-end
-
 namespace :redcar do
+  def hash_with_hash_default
+    Hash.new {|h,k| h[k] = hash_with_hash_default }
+  end
+
+  require 'json'
+  
   desc "Redcar Integration: output runnable info"
   task :runnables do
-    mkdir_p(".redcar")
+    mkdir_p(".redcar/runnables")
     puts "Creating runnables"
+    File.open(".redcar/runnables/sync_stdout.rb", "w") do |fout|
+      fout.puts <<-RUBY
+        $stdout.sync = true
+        $stderr.sync = true
+      RUBY
+    end
     
     tasks = Rake::Task.tasks
-    bin = File.join(Config::CONFIG["bindir"], "rake")
-    runnables = hash_with_hash_default
+    runnables = []
+    ruby_bin = Config::CONFIG["bindir"] + "/ruby -r#{File.dirname(__FILE__)}/.redcar/runnables/sync_stdout.rb " 
     tasks.each do |task|
-      bits = task.name.split(":")
-      namespace = runnables
-      while bits.length > 1
-        namespace = namespace[bits.shift]
-      end
-      command = bin + " " + task.name
-      namespace[bits.shift] = {:command => command, :desc => task.comment}
+      name = task.name.gsub(":", "/")
+      command = ruby_bin + $0 + " " + task.name
+      runnables << {
+        "name"        => name,
+        "command"     => command, 
+        "description" => task.comment,
+        "type"        => "task/ruby/rake"
+      }
+    end
+    File.open(".redcar/runnables/rake.json", "w") do |f|
+      data = {"commands" => runnables}
+      f.puts(JSON.pretty_generate(data))
     end
-    p runnables
-    File.open(".redcar/runnables", "w") do |f|
-      f.puts runnables.to_yaml
+    File.open(".redcar/runnables/ruby.json", "w") do |f|
+      data = {"file_runners" => 
+        [
+          {
+            "regex" =>    ".*.rb$",
+            "name" =>     "Run as ruby",
+            "command" =>  ruby_bin + "__PATH__",
+            "type" =>     "script/ruby"
+          }
+        ]
+      }
+      f.puts(JSON.pretty_generate(data))
+    end
+  end
+  
+  task :sample do
+    5.times do |i|
+      puts "out#{i}"
+      sleep 1
+      $stderr.puts "err#{i}"
+      sleep 1
     end
+    FileUtils.touch("finished_process")
   end
 end
 

data/lib/redcar.rb

@@ -41,10 +41,10 @@ require 'uri'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.7.1'
+  VERSION         = '0.3.8'
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 3
-  VERSION_RELEASE = 7
+  VERSION_RELEASE = 8
   
   ENVIRONMENTS = [:user, :debug, :test]
   
@@ -138,16 +138,22 @@ module Redcar
       :test => ".redcar_test",
       :debug => ".redcar_debug"
     }[Redcar.environment]
+    File.expand_path(File.join(home_dir, dirname))
+  end
+  
+  # Platform specific ~/
+  #
+  # @return [String] expanded path
+  def self.home_dir
     if platform == :windows
       if ENV['USERPROFILE'].nil?
-        userdir = "C:/My Documents/#{dirname}/"
+        userdir = "C:/My Documents/"
       else
-        userdir = File.join(ENV['USERPROFILE'], dirname)
+        userdir = ENV['USERPROFILE']
       end
     else
-      userdir = File.join(ENV['HOME'], dirname) unless ENV['HOME'].nil?
+      userdir = ENV['HOME'] unless ENV['HOME'].nil?
     end
-    File.expand_path(userdir)
   end
   
   class << self

data/lib/redcar/installer.rb

@@ -18,6 +18,26 @@ module Redcar
       end
   	end
   	
+  	def install
+  	  unless File.writable?(JRUBY_JAR_DIR)
+  	    puts "Don't have permission to write to #{JRUBY_JAR_DIR}. Please rerun with sudo."
+  	    exit 1
+  	  end
+      Redcar.environment = :user
+  	  puts "Downloading >10MB of jar files. This may take a while."
+  	  grab_jruby
+  	  grab_common_jars
+  	  grab_platform_dependencies
+  	  grab_redcar_jars
+      puts "Building textmate bundle cache"
+      s = Time.now
+      load_textmate_bundles
+      puts "... took #{Time.now - s}s"
+      fix_user_dir_permissions
+  	  puts
+  	  puts "Done! You're ready to run Redcar."
+  	end
+  
     def associate_with_any_right_click
       raise 'this is currently only for windows' unless Redcar.platform == :windows  	  
       require 'rbconfig'
@@ -38,20 +58,6 @@ module Redcar
       puts 'Associated.'
     end
 
-  	def install
-  	  unless File.writable?(JRUBY_JAR_DIR)
-  	    puts "Don't have permission to write to #{JRUBY_JAR_DIR}. Please rerun with sudo."
-  	    exit 1
-  	  end
-  	  puts "Downloading >10MB of jar files. This may take a while."
-  	  grab_jruby
-  	  grab_common_jars
-  	  grab_platform_dependencies
-  	  grab_redcar_jars
-  	  puts
-  	  puts "Done! You're ready to run Redcar."
-  	end
-  
     def plugins_dir
       File.expand_path(File.join(File.dirname(__FILE__), %w(.. .. plugins)))
     end
@@ -71,6 +77,10 @@ module Redcar
       /jface/org.eclipse.core.jobs.jar
     )
     
+    def redcar_jars_dir
+      File.expand_path(File.join(Redcar.user_dir, "jars"))
+    end
+    
     JRUBY_JAR_DIR = File.expand_path(File.join(File.dirname(__FILE__), ".."))
     
     JRUBY = [
@@ -81,59 +91,67 @@ module Redcar
 
     JRUBY << "http://jruby.org.s3.amazonaws.com/downloads/1.5.0/jruby-complete-1.5.0.jar"
     
+    JOPENSSL_DIR = "lib/openssl/lib/"
     JOPENSSL = {
-      "/jruby/bcmail-jdk14-139-#{Redcar::VERSION}.jar" => "lib/openssl/lib/bcmail-jdk14-139.jar",
-      "/jruby/bcprov-jdk14-139-#{Redcar::VERSION}.jar" => "lib/openssl/lib/bcprov-jdk14-139.jar",
-      "/jruby/jopenssl-#{Redcar::VERSION}.jar"         => "lib/openssl/lib/jopenssl.jar",
+      "/jruby/bcmail-jdk14-139-#{Redcar::VERSION}.jar" => "bcmail-jdk14-139.jar",
+      "/jruby/bcprov-jdk14-139-#{Redcar::VERSION}.jar" => "bcprov-jdk14-139.jar",
+      "/jruby/jopenssl-#{Redcar::VERSION}.jar"         => "jopenssl.jar",
     }
 
     REDCAR_JARS = {
       "/java-mateview-#{Redcar::VERSION}.jar" => "plugins/edit_view_swt/vendor/java-mateview.jar",
-      "/application-swt-#{Redcar::VERSION}.jar" => "plugins/application_swt/lib/dist/application_swt.jar"
+      "/application_swt-#{Redcar::VERSION}.jar" => "plugins/application_swt/lib/dist/application_swt.jar"
     }
     
     XULRUNNER_URI = "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2/runtimes/xulrunner-1.9.2.en-US.win32.zip"
 
+    SWT_JARS = {
+      :osx     => {
+        "/swt/osx.jar"     => "osx/swt.jar",
+        "/swt/osx64.jar"   => "osx64/swt.jar"
+      },
+      :linux   => {
+        "/swt/linux.jar"   => "linux/swt.jar",
+        "/swt/linux64.jar" => "linux64/swt.jar"
+      },
+      :windows => {
+        "/swt/win32.jar"   => "win32/swt.jar",
+      }
+    }
+    
     def grab_jruby
-      puts "* Downloading JRuby"
-      JRUBY.each do |jar_url|
-        download(jar_url, File.join(JRUBY_JAR_DIR, File.basename(jar_url)))
-      end
-      JOPENSSL.each do |jar_url, relative_path|
-        download(jar_url, File.join(File.dirname(__FILE__), "..", "..", relative_path))
-      end
+      puts "* Checking JRuby dependencies"
+      
+      setup "jruby",    :resources => JRUBY,    :path => JRUBY_JAR_DIR
+      setup "jopenssl", :resources => JOPENSSL, :path => JOPENSSL_DIR
     end
     
     def grab_common_jars
-      puts "* Downloading common jars"
-      JFACE.each do |jar_url|
-        download(jar_url, File.join(plugins_dir, %w(application_swt vendor jface), File.basename(jar_url)))
-      end
+      puts "* Checking common jars"
+      
+      setup "jface", :resources => JFACE, :path => File.join(plugins_dir, %w(application_swt vendor jface))
     end
     
     def grab_platform_dependencies
-      puts "* Downloading platform-specific SWT jars"
+      puts "* Checking platform-specific SWT jars"
       case Config::CONFIG["host_os"]
       when /darwin/i
-        download("/swt/osx.jar", File.join(plugins_dir, %w(application_swt vendor swt osx swt.jar)))
-        download("/swt/osx64.jar", File.join(plugins_dir, %w(application_swt vendor swt osx64 swt.jar)))
+        setup "swt", :resources => SWT_JARS[:osx],     :path => File.join(plugins_dir, %w(application_swt vendor swt))
+
       when /linux/i
-        download("/swt/linux.jar", File.join(plugins_dir, %w(application_swt vendor swt linux swt.jar)))
-        download("/swt/linux64.jar", File.join(plugins_dir, %w(application_swt vendor swt linux64 swt.jar)))
-      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)))
+        setup "swt", :resources => SWT_JARS[:linux],   :path => File.join(plugins_dir, %w(application_swt vendor swt))
 
-        download(XULRUNNER_URI, File.join(vendor_dir, 'xulrunner.zip'))
+      when /windows|mswin|mingw/i
+        setup "swt", :resources => SWT_JARS[:windows], :path => File.join(plugins_dir, %w(application_swt vendor swt))
+        setup "swt", :resources => [XULRUNNER_URI],    :path => File.expand_path(File.join(File.dirname(__FILE__), %w(.. .. vendor)))
+        link( File.join(redcar_jars_dir, "swt", "xulrunner"),
+              File.expand_path(File.join(File.dirname(__FILE__), %w(.. .. vendor xulrunner))))
       end
     end
     
     def grab_redcar_jars
-      puts "* Downloading Redcar jars"
-      REDCAR_JARS.each do |jar_url, relative_path|
-        download(jar_url, File.join(File.dirname(__FILE__), "..", "..", relative_path))
-      end
+      puts "* Checking Redcar jars"
+      setup "redcar", :resources => REDCAR_JARS, :path => File.join(File.dirname(__FILE__), "..", "..")
     end
     
     def download(uri, path)
@@ -150,7 +168,48 @@ module Redcar
       	Installer.unzip_file(path)
       end
 
-      puts "  downloaded #{uri}\n          to #{path}\n"
+      # puts "  downloaded #{uri}\n          to #{path}\n"
+    end
+    
+    def setup(name, options)
+      resources = options.delete(:resources)
+      path      = options.delete(:path)
+      
+      if resources.is_a?(Array)
+        resources.each do |resource|
+          setup_resource name, path, resource, File.basename(resource)
+        end
+      else
+        resources.each_pair do |url, save_as|
+          setup_resource name, path, url, save_as
+        end
+      end
+    end
+    
+    def setup_resource(name, path, url, save_as)
+      target = File.join(path, save_as)
+      return if File.exist?(target)
+      
+      cached = File.join(redcar_jars_dir, name, save_as)
+      unless File.exists?(cached)
+        print "  downloading #{File.basename(cached)}... "
+        download(url, cached)
+        puts "done!"
+      end
+
+      FileUtils.mkdir_p File.dirname(target)
+      link(cached, target)
+    end
+
+    def link(cached, target)
+      # Windoze doesn't support FileUtils.ln_sf, so we copy the files
+      if Config::CONFIG["host_os"] =~ /windows|mswin|mingw/i
+        puts "  copying #{File.basename(cached)}..."
+        FileUtils.cp_r cached, target
+      else
+        puts "  linking #{File.basename(cached)}..."
+        FileUtils.ln_sf cached, target
+      end
     end
     
     # unzip a .zip file into the directory it is located
@@ -168,6 +227,22 @@ module Redcar
         end
       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
+    end
+    
+    def fix_user_dir_permissions
+      desired_uid = File.stat(Redcar.home_dir).uid
+      desired_gid = File.stat(Redcar.home_dir).gid
+      FileUtils.chown_R(desired_uid, desired_gid.to_s, Redcar.user_dir)
+    end
   end
 end