redcar 0.7 → 0.8

data/CHANGES

@@ -1,3 +1,45 @@
+Version 0.8 (26 October 2010)
+=============================
+
+Enhancements:
+
+ * Alternate Runnables File Runner command and shortcut (Delisa Mason)
+ * File runners now have access to line number and file names (Delisa Mason)
+ * Projects can have 'subproject' windows which share config files like Runnables (Delisa Mason)
+ * Symlinks to other directories are searched recursively (Tim Felgentreff)
+ * Redcar can be started without opening a window (for boot-time startup) (Tim Felgentreff)
+ * The Mac OS X app bundle comes with assets bundled (Tim Felgentreff)
+ * The Runnables tree now nests runnables depending on slashes in the type definition (Tim Felgentreff)
+ * Deleting or moving a file updates the tab title and file correctly. (Delisa Mason)
+ * Paired characters are not inserted if it looks like you are closing a pair (Dan Lucraft)
+ * Syntax checking for Ruby upon save (Tim Felgentreff)
+ * Deleting a file from the project tree will move it to the trash, if the OS permits (Tim Felgentreff)
+ * Help Menu options for submitting bugs and viewing the users' guide (Delisa Mason)
+ * Toggle line and selection commenting (Delisa Mason)
+ * Clipboard History Viewer and Paster (Delisa Mason)
+ * Web Preview files and Bookmarks (Delisa Mason)
+ * -w commandline switch to block the prompt when piping into or opening files on an existing Redcar instance (Tim Felgentreff)
+ * 'Open Default App' project context menu item for opening any type of file (Jeremy Wentworth)
+ * Changing to another tab reveals the associated file in the project tree (Johannes Wollert)
+ * Trees can be hidden or revealed by a keyboard shortcut (Delisa Mason)
+ * Fullscreen mode! (Matt Scharley)
+
+Bugfixes:
+
+ * Snippet completion works even when preceded by other characters (Delisa Mason)
+ * New files now open in the project window which is the closest ancestor (Delisa Mason)
+ * Search-and-replace now operates on the user-selected text as well, not only after it (Tim Felgentreff)
+ * Word back/forward movement is not confused by multi-byte characters. (Dan Lucraft)
+ * Can load files with multi-byte characters and see them in the tree (Dan Lucraft)
+ * Open in command line now works correctly with Terminal.app (Delisa Mason, Mat Schaffer)
+ * Search-and-replace won't loop forever over a document anymore if it still finds the search string (Tim Felgentreff)
+ * Goto line command works again (Dan Lucraft)
+ * Run tab commands are now project-aware (Delisa Mason)
+
+New APIs:
+ * after_save can be implemented by plugins to run code after an edit view was saved (Tim Felgentreff)
+ * before_web_refresh can be implemented by plugins to run code before a HtmlTab is refreshed (Delisa Mason)
+
 Version 0.7 (4 October 2010)
 ============================
 

data/README.md

@@ -9,12 +9,14 @@ A pure Ruby text editor running on JRuby.
 
 ## INSTALLATION
 
-You must have Java installed. You will also need to run these commands for each user on your computer that needs access to Redcar.
+You must have Java installed [1]. You will also need to run these commands for each user on your computer that needs access to Redcar.
 
     $ sudo gem install redcar
     $ redcar install
     
-NB the install will take a minute or so to complete as it has to download about 15MB of jar files.
+The install will take a minute or so to complete as it has to download about 15MB of jar files.
+
+[1] Sun Java or OpenJDK work. Gcj is known not to work.
 
 ## USAGE
 
@@ -56,7 +58,7 @@ If you are running a source version of Redcar and you have pulled changes from m
 
 ## TESTS
 
-NB. Redcar features won't run with Cucumber 0.9.0 yet. They are known to work with 0.8.5.
+NB. Redcar features are known to work with Cucumber 0.8.5, 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,10 +1,11 @@
-REDCAR_VERSION = "0.7" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.8" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 require "rake/gempackagetask"
 require "rake/rdoctask"
+Dir[File.expand_path("../tasks/*.rake", __FILE__)].each { |f| load f }
 
 if RUBY_PLATFORM =~ /mswin|mingw/
   begin
@@ -41,7 +42,12 @@ task :release_docs do
 end
 
 ### CI
-task :ci => [:specs_ci, :cucumber_ci]
+COVERAGE_DATA = "coverage.data"
+task :ci do
+  FileUtils.rm COVERAGE_DATA if File.exist?(COVERAGE_DATA)
+  Rake::Task["specs_ci"].invoke
+  Rake::Task["cucumber_ci"].invoke
+end
 
 def find_ci_reporter(filename)
   jruby_gem_path = %x[jruby -rubygems -e "p Gem.path.first"].gsub("\n", "").gsub('"', "")
@@ -49,18 +55,27 @@ def find_ci_reporter(filename)
   result || raise("Could not find ci_reporter gem in #{jruby_gem_path}")
 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}}
+  jruby_run(cmd)
+end
+
+def jruby_run(cmd)
+  opts = "-J-XstartOnFirstThread" if Config::CONFIG["host_os"] =~ /darwin/
+  sh("jruby --debug #{opts} -S #{cmd} && echo 'done'")
+end
+
 task :specs_ci do
-  rspec_loader = find_ci_reporter "rspec_loader"  
+  rspec_loader = find_ci_reporter "rspec_loader"
   files = Dir['plugins/*/spec/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*/*_spec.rb']
-  opts = "-J-XstartOnFirstThread" if Config::CONFIG["host_os"] =~ /darwin/
-  opts = "#{opts} -S spec --require #{rspec_loader} --format CI::Reporter::RSpec -c #{files.join(" ")}"
-  sh("jruby #{opts} && echo 'done'")
+  rspec_opts = "--require #{rspec_loader} --format CI::Reporter::RSpec -c #{files.join(" ")}"
+  rcov_run('"$GEM_HOME"/bin/spec', rspec_opts)
 end
 
-task :cucumber_ci do  
-  opts = "-J-XstartOnFirstThread" if Config::CONFIG["host_os"] =~ /darwin/
-  opts = "#{opts} bin/cucumber -f progress -f junit --out features/reports/ plugins/*/features"
-  sh("jruby #{opts} && echo 'done'")
+task :cucumber_ci do
+  reports_folder = "features/reports"
+  FileUtils.rm_rf reports_folder if File.exist? reports_folder
+  rcov_run("bin/cucumber", "-f progress -f junit --out #{reports_folder} plugins/*/features")
 end
 
 ### TESTS
@@ -80,11 +95,13 @@ end
 
 desc "Run features"
 task :cucumber do
-  case Config::CONFIG["host_os"]
-  when "darwin"
-    sh("jruby -J-XstartOnFirstThread bin/cucumber -cf progress plugins/*/features && echo 'done'")
-  else
-    sh("jruby bin/cucumber -cf progress plugins/*/features && echo 'done'")
+  cmd = "jruby "
+  if Config::CONFIG["host_os"] == "darwin"
+    cmd += "-J-XstartOnFirstThread "
+  end
+  cmd += "bin/cucumber -cf progress"
+  Dir["plugins/*/features"].each do |f|
+    sh("#{cmd} #{f} && echo 'done'")
   end
 end
 
@@ -112,7 +129,7 @@ def remove_matching_files(list, string)
   list.reject {|entry| entry.include?(string)}
 end
 
-spec = Gem::Specification.new do |s|
+Spec = spec = Gem::Specification.new do |s|
   s.name              = "redcar"
   s.version           = REDCAR_VERSION
   s.summary           = "A JRuby text editor."
@@ -149,19 +166,19 @@ spec = Gem::Specification.new do |s|
   
   s.post_install_message = <<TEXT
 
-------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
 
 Please now run:
 
   $ redcar install
 
-to complete the installation. (NB do NOT use sudo. In previous versions, sudo was 
-required for this step, but now it should be run as the user.)
+to complete the installation. (NB. do NOT use sudo. In previous versions,
+sudo was required for this step, but now it should be run as the user.)
 
-NB. This will download jars that Redcar needs to run from the internet. It will put
-them into ~/.redcar/assets.
+NB. This will download jars that Redcar needs to run from the internet.
+It will put them into ~/.redcar/assets.
 
-------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
 
 TEXT
 end
@@ -170,65 +187,6 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-desc "Build a MacOS X App bundle"
-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
-  FileUtils.mkdir_p resources_dir
-
-  info_plist_template = ERB.new <<-PLIST
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleExecutable</key>
-	<string>redcar</string>
-	<key>CFBundleIconFile</key>
-	<string><%= redcar_icon %></string>
-	<key>CFBundleIdentifier</key>
-	<string>com.redcareditor.Redcar</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string><%= spec.version %></string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.5</string>
-</dict>
-</plist>
-  PLIST
-  File.open(File.join(bundle_contents, "Info.plist"), "w") do |f|
-    f << info_plist_template.result(binding)
-  end
-
-  File.open(File.join(macos_dir, "redcar"), "w") do |f|
-    f << '#!/bin/sh
-          DIR=$(cd "$(dirname "$0")"; pwd)
-          REDCAR=$(cd "$(dirname "${DIR}/../Resources/bin/redcar")"; pwd)
-          $REDCAR/redcar install
-          $REDCAR/redcar --ignore-stdin $@'
-  end
-  File.chmod 0777, File.join(macos_dir, "redcar")
-
-  spec.files.each do |f|
-    FileUtils.mkdir_p File.join(resources_dir, File.dirname(f))
-    FileUtils.cp_r f, File.join(resources_dir, f), :remove_destination => true
-  end
-
-  FileUtils.cp_r File.join(resources_dir, "plugins", "application", "icons", redcar_icon), 
-      resources_dir, :remove_destination => true
-end
-
 desc 'Run a watchr continuous integration daemon for the specs'
 task :run_ci do
   require 'watchr'

data/bin/redcar

@@ -13,7 +13,7 @@ if ARGV.include? '--silent'
   STDERR.reopen STDOUT
 end
 
-if ARGV.first == "install"
+if ARGV.include? "install"
   require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar)))
   require 'redcar/installer'
   require 'redcar/runner'

data/lib/redcar.rb

@@ -51,9 +51,9 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.7' # also change in the Rakefile!
+  VERSION         = '0.8' # also change in the Rakefile!
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 7
+  VERSION_MINOR   = 8
   VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]
@@ -201,14 +201,17 @@ module Redcar
   #
   # @return [String] expanded path
   def self.home_dir
-    if platform == :windows
+    @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?
-        userdir = "C:/My Documents/"
+        "C:/My Documents/"
       else
-        userdir = ENV['USERPROFILE']
+        ENV['USERPROFILE']
       end
     else
-      userdir = ENV['HOME'] unless ENV['HOME'].nil?
+      ENV['HOME'] unless ENV['HOME'].nil?
     end
   end
   

data/lib/redcar/installer.rb

@@ -38,7 +38,7 @@ module Redcar
     
     def assets_by_platform
       { :all => {
-          "http://jruby.org.s3.amazonaws.com/downloads/1.5.2/jruby-complete-1.5.2.jar" => "/jruby-complete-1.5.2.jar",
+          "http://jruby.org.s3.amazonaws.com/downloads/1.5.3/jruby-complete-1.5.3.jar" => "/jruby-complete-1.5.3.jar",
           "http://redcar.s3.amazonaws.com/jface/org.eclipse.core.commands.jar" => nil,
           "http://redcar.s3.amazonaws.com/jface/org.eclipse.core.runtime_3.5.0.v20090525.jar" => nil,
           "http://redcar.s3.amazonaws.com/jface/org.eclipse.equinox.common.jar" => nil,

data/lib/redcar/ruby_extensions.rb

@@ -20,6 +20,25 @@ class String
     downcase
   end
   
+  def chars
+    r = split(//)
+    def r.to_s
+      join("")
+    end
+    r
+  end
+  
+  def byte_offset_to_char_offset(byte_offset)
+    self[0...byte_offset].chars.length
+  end
+  
+  def char_offset_to_byte_offset(char_offset)
+    self.chars[0...char_offset].to_s.length
+  end
+  
+  def to_java
+    java.lang.String.new(to_java_bytes, "UTF8")
+  end
 end
 
 class Object

data/lib/redcar/runner.rb

@@ -51,7 +51,7 @@ module Redcar
     # our vendored jarred one (useful for gems).
     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"))
+      jruby_complete = File.expand_path(File.join(Redcar.asset_dir, "jruby-complete-1.5.3.jar"))
       unless File.exist?(jruby_complete)
         puts "\nCan't find jruby jar at #{jruby_complete}, did you run 'redcar install' ?"
         exit 1

data/lib/redcar/usage.rb

@@ -24,6 +24,9 @@ module Redcar
         puts "--untitled-file=PATH  Open the given file as an untitled tab."
         puts "      --ignore-stdin  Ignore stdin."
         puts "              --fork  Detach from the console."
+        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 "To associate with right click in windows explorer:"
         #puts
         #puts "  C:> redcar --associate_with_any_right_click"

data/lib/redcar_quick_start.rb

@@ -40,19 +40,19 @@ module Redcar
       
       if ARGV.any?
         ARGV.each do |arg|
-          if File.file?(arg) or File.directory?(arg)
-            if drb.open_item_drb(File.expand_path(arg)) != 'ok'
-              return
-            end
-          end
           if arg =~ /--untitled-file=(.*)/
-            path = $1
-            if File.file?(path)
-              if drb.open_item_untitled(File.expand_path(path)) != 'ok'
-                return
-              end
-            end
+            path = $1 if File.file?($1)
+            untitled = true
+          elsif File.file?(arg) or File.directory?(arg)
+            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
+          return unless drb_answer == 'ok'
         end
       else
         return unless drb.open_item_drb('just_bring_to_front')

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

@@ -1,11 +1,15 @@
 
 When /^I expand the tree row "([^\"]*)"$/ do |row|
-  item = top_tree.items.detect {|item| item.getText == row }
+  item = visible_tree_items(top_tree).detect {|item| item.getText == row }
   viewer = focussed_tree.controller.viewer
   node = viewer.getViewerRowFromItem(item).getElement
   viewer.expandToLevel(node, 1)
 end
 
+When /^I toggle tree visibility$/ do
+  Redcar::Top::ToggleTreesCommand.new.run
+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|
@@ -17,10 +21,14 @@ Then /^I should (not )?see "([^\"]*)" in the tree$/ do |negate, rows|
   end
 end
 
-Then /^the tree width should be the default$/ do
+Then /^the tree width should be (0|the default)$/ do |w|
   width = Redcar.app.focussed_window.treebook.controller.tab_folder.bounds.width
-  default = Redcar::ApplicationSWT::Window::TREEBOOK_WIDTH + Redcar::ApplicationSWT::Window::SASH_WIDTH - 5
-  raise "The tree width was #{width}, expected #{default}" unless width == default
+  if w == 0
+    width.should == 0
+  else
+    default = Redcar::ApplicationSWT::Window::TREEBOOK_WIDTH + Redcar::ApplicationSWT::Window::SASH_WIDTH - 5
+    raise "The tree width was #{width}, expected #{default}" unless width == default
+  end
 end
 
 When /^I activate the "([^"]*)" node in the tree$/ do |node_text|
@@ -30,6 +38,15 @@ When /^I activate the "([^"]*)" node in the tree$/ do |node_text|
   node       = find_node_with_text(mirror.top, node_text)
 
   node.should_not be_nil
-  
+
   controller.activated(model, node)
+end
+
+When /^I rename the "([^"]*)" node in the tree$/ do |node_text|
+  controller = focussed_tree.tree_controller
+  mirror     = focussed_tree.tree_mirror
+  node       = find_node_with_text(mirror.top, node_text)
+
+  node.should_not be_nil
+  controller.single_rename(focussed_tree, node)
 end

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

@@ -1,4 +1,12 @@
 
 Then /^the window should have title "([^\"]*)"$/ do |expected_title|
   active_shell.get_text.should == expected_title
-end
+end
+
+When /^I manually widen the treebook (only a few pixels|to show the sash)$/ do |w|
+  if w =~ /^only/
+    focussed_window.controller.send(:set_sash_widths, Redcar::ApplicationSWT::Window::SASH_WIDTH-1)
+  else
+    focussed_window.controller.send(:set_sash_widths, Redcar::ApplicationSWT::Window::SASH_WIDTH)
+  end
+end