redcar 0.8.1 → 0.9.0

data/CHANGES

@@ -1,9 +1,49 @@
+Version 0.9 (25 November 2010)
+==============================
+
+Enhancements:
+
+ * Vertical tree tabs now have a close button like edit view tabs (Tim Felgentreff)
+ * Strip Trailing Spaces is now _much_ faster (Tim Felgentreff)
+ * "Online Help" and "Submit a Bug" open the default system browser (Johannes Wollert)
+ * -l command line switch to jump to a file number (Johannes Wollert)
+ * Font and Theme dialogs now update the setting on selection change for instant feedback (Tim Felgentreff)
+ * Tabs now display an alert icon if the underlying file is unwritable (Delisa Mason)
+ * Browser bar URL field now supports project-relative paths (Delisa Mason)
+ * URLs can be opened in the internal browser or the OS-default based on preferences (Delisa Mason)
+ * Syntax checking for Groovy (Delisa Mason)
+ * Jump to declaration for Groovy (Delisa Mason)
+ * Margin is drawn with a line or a shaded area (Tim Felgentreff)
+ * Syntax checking for JavaScript (Delisa Mason)
+ * Word wrap wraps at the margin column (Daniel Lucraft)
+ * Improvements and optimizations to replace-all function (Tim Felgentreff)
+ * .redcar plugins dir is created on startup to help people know they can put plugins there (Philip Arndt)
+ * Add jruby jar to JVM bootclasspath to speedup startup marginally (Tim Felgentreff)
+
+Bug fixes:
+
+ * Declarations plugin is able to deal with similarly named ruby methods
+ * Declarations plugin lets Ruby methods have trailing spaces (Johannes Wollert)
+ * Fix Application::Dialog#tool_tip to set the location correctly on Windows (Patrik Sundberg)
+ * 64bit Soylatte JDK7 can now be used to run Redcar on Mac OS X
+ * Run Tab now checks for underlying file (Delisa Mason)
+ * Hovering on annotations only displays the tooltip(s) under the cursor, not all of them (Delisa Mason)
+ * Fix for installing on Ruby 1.8.6 (Dan Lucraft)
+ * Connection manager should not try and read directories and unreadable files when looking for private keys (Antono Vasiljev)
+ * Required cucumber version is specified in the Gemfile (Tianyi Cui)
+ * Pair highlighter works on first and last character in the document (Kirill Nikitin)
+
+Internal changes:
+
+  * Code coverage is above 70% (up from 60%) (everyone)
+  * Code cleanup and refactoring in various plugins (everyone)
+  * Speedbar can now contain sliders (Tim Felgentreff)
 
 Version 0.8.1 (26 October 2010)
 ===============================
 
- * Remove files with multi-byte names from the gem so windows rubygems is happy (Dan Lucraft)
  * Replace all is a single undo operation (Steven Hancock)
+ * Remove files with multi-byte names from the gem so windows rubygems is happy (Dan Lucraft)
 
 Version 0.8 (26 October 2010)
 =============================

data/README.md

@@ -58,7 +58,7 @@ If you are running a source version of Redcar and you have pulled changes from m
 
 ## TESTS
 
-NB. Redcar features are known to work with Cucumber 0.8.5, and known NOT to work with Cucumber >= 0.9
+NB. Redcar features are known to work with Cucumber 0.9.2, and known NOT to work with Cucumber < 0.9
 
 To run the tests you need JRuby installed. You also need rspec and cucumber installed as Jruby gems. See jruby.org for this, or install with rvm.
 

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.8.1" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.9.0" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
@@ -56,7 +56,7 @@ def find_ci_reporter(filename)
 end
 
 def rcov_run(cmd, opts)
-  cmd = %{rcov --aggregate #{COVERAGE_DATA} -x "features/,spec/,vendor/,openssl/,yaml/,json/,yaml,gems,file:,(eval),(__FORWARDABLE__)" #{cmd} -- #{opts}}
+  cmd = %{rcov --aggregate #{COVERAGE_DATA} -x "jsignal_internal,(erb),features/,spec/,vendor/,openssl/,yaml/,json/,yaml,gems,file:,(eval),(__FORWARDABLE__)" #{cmd} -- #{opts}}
   jruby_run(cmd)
 end
 
@@ -96,10 +96,8 @@ end
 desc "Run features"
 task :cucumber do
   cmd = "jruby "
-  if Config::CONFIG["host_os"] == "darwin"
-    cmd += "-J-XstartOnFirstThread "
-  end
-  cmd += "bin/cucumber -cf progress"
+  cmd << "-J-XstartOnFirstThread " if Config::CONFIG["host_os"] == "darwin"
+  cmd << "bin/cucumber -cf progress"
   Dir["plugins/*/features"].each do |f|
     sh("#{cmd} #{f} && echo 'done'")
   end
@@ -230,6 +228,7 @@ task :release => :gem do
   }
   
   s3_uploads.each do |source, target|
+    puts [source, target]
     AWS::S3::S3Object.store(target, open(source), 'redcar', :access => :public_read)
   end
 end

data/lib/plugin_manager/lib/plugin_manager.rb

@@ -120,8 +120,6 @@ class PluginManager
     @plugins.select {|pl| pl.name == name }.sort_by {|pl| pl.version }.last
   end
   
-  private
-  
   def load_plugin(plugin)
     begin
       @output.puts "[PluginManager] loading #{plugin.name}" if ENV["PLUGIN_DEBUG"]
@@ -143,6 +141,7 @@ class PluginManager
     while ready_plugin = @unloaded_plugins.detect {|pl| pl.dependencies.all? {|dep| dep.satisfied? }}
       load_plugin(ready_plugin)
     end
+    @load_observer = nil # After loading all possible plugins, remove the load observer
   end
   
   def expand_dependencies(dependency_array)

data/lib/redcar.rb

@@ -51,10 +51,10 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.8.1' # also change in the Rakefile!
+  VERSION         = '0.9.0' # also change in the Rakefile!
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 8
-  VERSION_RELEASE = 1
+  VERSION_MINOR   = 9
+  VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]
   
@@ -87,12 +87,16 @@ module Redcar
   def self.plugin_manager
     @plugin_manager ||= begin
       m = PluginManager.new
-      m.add_plugin_source(File.join(root, "plugins"))
-      m.add_plugin_source(File.join(user_dir, "plugins"))
+      add_plugin_sources(m)
       m
     end
   end
 
+  def self.add_plugin_sources(manager)
+    manager.add_plugin_source(File.join(root, "plugins"))
+    manager.add_plugin_source(File.join(user_dir, "plugins"))
+  end
+
   def self.load_prerequisites
     exit if ARGV.include?("--quit-immediately")
     
@@ -201,17 +205,18 @@ module Redcar
   #
   # @return [String] expanded path
   def self.home_dir
-    @userdir ||= if arg = ARGV.detect {|v| v.start_with? "--home-dir=" }
-      arg =~ /\-\-home\-dir=(.*)/
-      File.expand_path($1)
-    elsif platform == :windows
-      if ENV['USERPROFILE'].nil?
-        "C:/My Documents/"
+    @userdir ||= begin
+      if arg = ARGV.map {|v| v[/^--home-dir=(.*)/, 1] }.compact.first
+        File.expand_path(arg)
+      elsif platform == :windows
+        if ENV['USERPROFILE'].nil?
+          "C:/My Documents/"
+        else
+          ENV['USERPROFILE']
+        end
       else
-        ENV['USERPROFILE']
+        ENV['HOME'] unless ENV['HOME'].nil?
       end
-    else
-      ENV['HOME'] unless ENV['HOME'].nil?
     end
   end
   

data/lib/redcar/installer.rb

@@ -18,24 +18,25 @@ module Redcar
       end
       puts "found latest XULRunner release version: #{xulrunner_version}" if Redcar.platform == :windows
     end
-      
+
     def install
       Redcar.environment = :user
       puts "Downloading >10MB of binary assets. This may take a while the first time."
       fetch_all_assets
       precache_textmate_bundles
+      ensure_user_plugins_directory_exists
       puts "Done! You're ready to run Redcar."
     end
-  
+
     def plugins_dir
       File.expand_path(File.join(File.dirname(__FILE__), %w(.. .. plugins)))
     end
-    
+
     def fetch_all_assets
       assets = assets_by_platform[:all].merge(assets_by_platform[Redcar.platform])
       assets.each {|source, target| fetch_asset(source, target) }
     end
-    
+
     def assets_by_platform
       { :all => {
           "http://jruby.org.s3.amazonaws.com/downloads/1.5.3/jruby-complete-1.5.3.jar" => "/jruby-complete-1.5.3.jar",
@@ -61,7 +62,8 @@ module Redcar
           "http://redcar.s3.amazonaws.com/clojure-contrib-1.2beta1.jar" => "/clojure-contrib.jar",
           "http://redcar.s3.amazonaws.com/org-enclojure-repl-server.jar" => nil,
           "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/codehaus/groovy/groovy-all/1.7.4/groovy-all-1.7.4.jar" => "/groovy-all.jar",
-          "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/tmatesoft/svnkit/svnkit/1.3.4/svnkit-1.3.4.jar" => "/svnkit.jar"
+          "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/tmatesoft/svnkit/svnkit/1.3.4/svnkit-1.3.4.jar" => "/svnkit.jar",
+          "http://mirrors.ibiblio.org/pub/mirrors/maven2/rhino/js/1.7R2/js-1.7R2.jar" => "/js.jar"
         },
         :windows => {
           "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/#{xulrunner_version}/runtimes/xulrunner-#{xulrunner_version}.en-US.win32.zip" => "xulrunner-#{xulrunner_version}.en-US.win32.zip",
@@ -77,7 +79,7 @@ module Redcar
         }
       }
     end
-    
+
     def fetch_asset(source, target)
       relative_target   = target || implicit_target(source)
       absolute_target   = File.join(Redcar.asset_dir, relative_target)
@@ -85,11 +87,11 @@ module Redcar
       download_file_to(source, absolute_target)
       unzip_file(absolute_target) if absolute_target =~ /\.zip$/
     end
-    
+
     def implicit_target(source)
       URI.parse(source).path.gsub(/^\//, "")
     end
-    
+
     def download_file_to(uri, destination_file)
       print "  downloading #{uri}... "; $stdout.flush
       temporary_target  = destination_file + ".part"
@@ -97,18 +99,18 @@ module Redcar
       File.open(temporary_target, "wb") do |write_out|
         write_out.print @connection.get(URI.parse(uri))
       end
-      
+
       if File.open(temporary_target).read(200) =~ /Access Denied/
         puts "\n\n*** Error downloading #{uri}, got Access Denied from S3."
         FileUtils.rm_rf(temporary_target)
         exit
       end
-      
+
       FileUtils.cp(temporary_target, destination_file)
       FileUtils.rm_rf(temporary_target)
       puts "done!"
     end
-    
+
     # unzip a .zip file into the directory it is located
     def unzip_file(path)
       print "unzipping #{path}..."; $stdout.flush
@@ -125,15 +127,19 @@ module Redcar
         end
       end
     end
-    
+
     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 
+
+    def ensure_user_plugins_directory_exists
+      FileUtils.mkpath File.join(Redcar.user_dir, 'plugins')
+    end
+
+    # Xulrunner releases don't hang around very long, so we scrape their site to figure out
     # which one to download this time.
     def xulrunner_version
       @xulrunner_version ||= begin
@@ -142,6 +148,4 @@ module Redcar
       end
     end
   end
-end
-
-
+end

data/lib/redcar/runner.rb

@@ -67,7 +67,8 @@ module Redcar
       # unfortuanately, ruby doesn't support [a, *b, c]
       command = ["java"]
       command.push(*java_args)
-      command.push("-Xmx500m", "-Xss1024k", "-Djruby.memory.max=500m", "-Djruby.stack.max=1024k", "-cp", jruby_complete, "org.jruby.Main")
+      command.push("-Xbootclasspath/a:#{jruby_complete}")
+      command.push("-Xmx320m", "-Xss1024k", "-Djruby.memory.max=320m", "-Djruby.stack.max=1024k", "org.jruby.Main")
       command.push "--debug" if debug_mode?
       command.push(bin)
       command.push(*cleaned_args)
@@ -105,14 +106,16 @@ module Redcar
         str.push "-Djruby.debug.loadService.timing=true"
       end
 
-      require 'redcar/jvm_options_probe'
-      
-      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.push "-d32" if JvmOptionsProbe::D32
+      str.push "-client" if JvmOptionsProbe::Client
       
       str
     end
+
+    class JvmOptionsProbe
+      Redirect = "> #{Redcar.null_device} 2>&1"
+      D32 = system("java -d32 #{Redirect}")
+      Client = system("java -client #{Redirect}")
+    end
   end
 end

data/lib/redcar/usage.rb

@@ -27,6 +27,7 @@ module Redcar
         puts "         --no-window  Don't force opening a window on Redcar startup"
         puts "     --home-dir=PATH  Use the specified directory as Redcar home directory"
         puts "                  -w  Open the specified files and wait until they are closed"
+        puts "          -l[NUMBER]  Open a specified file at line NUMBER. Multiple comma-seperated args for multiple files are allowed."
         #puts "To associate with right click in windows explorer:"
         #puts
         #puts "  C:> redcar --associate_with_any_right_click"

data/lib/redcar_quick_start.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 module Redcar
   DRB_PORT = 10021
   DONT_READ_STDIN_ARG = "--ignore-stdin"
-  
+
   def self.read_stdin
     if not $stdin.tty? and not ARGV.include?(DONT_READ_STDIN_ARG)
       data = ""
@@ -14,7 +14,7 @@ module Redcar
       #  retry
       rescue EOFError
       end
-      
+
       if data.size > 0
         require 'tmpdir'
         file = File.join(Dir.tmpdir, "tmp#{$$}.txt")
@@ -23,21 +23,21 @@ module Redcar
       end
     end
   end
-  
+
   def self.try_to_load_via_drb
     return if ARGV.find {|arg| arg == "--multiple-instance" || arg == '--help' || arg == '-h'}
     begin
       begin
         TCPSocket.new('127.0.0.1', DRB_PORT).close
-      rescue Errno::ECONNREFUSED 
+      rescue Errno::ECONNREFUSED
         # no other instance is currently running...
         return
       end
       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:#{DRB_PORT}")
-      
+
       if ARGV.any?
         ARGV.each do |arg|
           if arg =~ /--untitled-file=(.*)/
@@ -47,11 +47,7 @@ module Redcar
             path = File.expand_path(arg)
           end
           next unless path
-          if ARGV.include? "-w" and File.file?(path)
-            drb_answer = drb.open_file_and_wait(path, untitled)
-          else
-            drb_answer = drb.open_item_drb(path, untitled)
-          end
+          drb_answer = drb.open_item_drb(path, untitled, ARGV.include?("-w"))
           return unless drb_answer == 'ok'
         end
       else
@@ -79,7 +75,7 @@ module Redcar
       :linux
     end
   end
-  
+
   def self.null_device
     case platform
     when :windows

data/lib/regex_replace.rb

@@ -45,12 +45,12 @@ class RegexReplace
       while left.length > 0
         md = re.match(left)
         if md
-          newstr += md.pre_match
+          newstr << md.pre_match
           r  = yield md
-          newstr += r
+          newstr << r
           left = md.post_match
         else
-          newstr += left
+          newstr << left
           left = ""
         end
       end

data/plugins/application/features/step_definitions/menu_steps.rb

@@ -31,3 +31,13 @@ Then /^the menu item "([^\"]*)\|([^\"]*)" should be (active|inactive)$/ do |menu
     item.enabled.should be_false
   end
 end
+
+When /^I (?:open the|click) "([^"]*)" from the "([^"]*)" menu$/ do |menu_item, menu_name|
+  menu_items = menu_name.split("/").inject(main_menu.get_items.to_a.dup) do |items, item_name|
+    m = items.detect {|i| i.text == item_name }
+    items = m.get_menu.get_items.to_a
+  end
+  item = menu_items.detect {|i| i.text.split("\t").first == menu_item }
+  FakeEvent.new(Swt::SWT::Selection, item)
+end
+

data/plugins/application/features/step_definitions/speedbar_steps.rb

@@ -58,5 +58,11 @@ Then /^"([^"]*)" should not be checked in the speedbar$/ do |checkbox_name|
   item.value.should be_false
 end
 
-
-
+Then /^there should( not)? be an open speedbar$/ do |negate|
+  speedbar = Redcar.app.focussed_window.speedbar
+  if negate
+    speedbar.should == nil
+  else
+    speedbar.should_not == nil
+  end
+end

data/plugins/application/features/step_definitions/tree_steps.rb

@@ -10,6 +10,37 @@ When /^I toggle tree visibility$/ do
   Redcar::Top::ToggleTreesCommand.new.run
 end
 
+When "I close the tree" do
+  Redcar::Top::CloseTreeCommand.new.run
+end
+
+When "I click the close button" do
+  vtabitem = focussed_window.treebook.controller.tab_folder.selection
+  swtlabel = swt_label_for_item(vtabitem)
+
+  # Make sure the close icon is showing
+  FakeEvent.new(Swt::SWT::MouseEnter, swtlabel)
+
+  # Fire the click event
+  FakeEvent.new(Swt::SWT::MouseUp, swtlabel,
+    :x => Swt::Widgets::VTabLabel::ICON_PADDING + 1,
+    :y => Swt::Widgets::VTabLabel::ICON_PADDING + 1)
+end
+
+When /^I (?:(left|right)-)?click the (project|directory|"[^\"]*") tree tab$/ do |button, target|
+  if target =~ /(project|directory)/
+    path  = Redcar::Project::Manager.in_window(Redcar.app.focussed_window).path
+    target = File.basename(path) + "/"
+  end
+  target.gsub!('"', '')
+  vtabitem = focussed_window.treebook.controller.tab_folder.get_item(target)
+  swtlabel = swt_label_for_item(vtabitem)
+
+  button = (button == "right" ? 2 : 1)
+  FakeEvent.new(Swt::SWT::MouseEnter, swtlabel)
+  FakeEvent.new(Swt::SWT::MouseUp, swtlabel, :x => 1, :y => 1, :button => button)
+end
+
 Then /^I should (not )?see "([^\"]*)" in the tree$/ do |negate, rows|
   item_names = visible_tree_items(top_tree).map(&:get_text)
   rows.split(',').map(&:strip).each do |row|
@@ -21,13 +52,24 @@ Then /^I should (not )?see "([^\"]*)" in the tree$/ do |negate, rows|
   end
 end
 
-Then /^the tree width should be (0|the default)$/ do |w|
-  width = Redcar.app.focussed_window.treebook.controller.tab_folder.bounds.width
-  if w == 0
-    width.should == 0
+Then /^there should (not )?be a tree titled "([^\"]*)"$/ do |negate,title|
+  if negate
+    tree_with_title(title).should == nil
+  else
+    tree_with_title(title).should_not == nil
+  end
+end
+
+Then /^the tree width should be (the default|\d+ pixels|the minimum size)$/ do |w|
+  width = focussed_treebook_width
+  if w == "the default"
+    unless width == default_treebook_width
+      raise "The tree width was #{width}, expected #{default_treebook_width}"
+    end
+  elsif w == "the minimum size"
+    width.should == Redcar::ApplicationSWT::Window::MINIMUM_TREEBOOK_WIDTH
   else
-    default = Redcar::ApplicationSWT::Window::TREEBOOK_WIDTH + Redcar::ApplicationSWT::Window::SASH_WIDTH - 5
-    raise "The tree width was #{width}, expected #{default}" unless width == default
+    width.should == w.split(" ")[0].to_i
   end
 end