redcar 0.3.5 → 0.3.6

data/CHANGES

@@ -1,4 +1,32 @@
 
+Version 0.3.6 (5 Jun 2010)
+==========================
+
+Enhancements:
+
+  * Folders open in the project view on a double click (Nizar Jouini)
+  * Drag and drop tabs (Tim Felgentreff)
+  * Change font and theme commands (Sam Clopton)
+  * Word wrap option (Dan Lucraft)
+  * Toggle line numbers (Dan Lucraft)
+  * Can put TM themes and bundles into .redcar/{Bundles,Themes} (Dan Lucraft)
+  * Home command goes to start of text first then start of line (Dan Lucraft)
+  * The project view has a fixed width that doesn't change if you resize the main window (Tim Felgentreff)
+  * Optional margin that colours text differently past a configurable column. (Dan Lucraft)
+  * Experimental app bundle for Mac OSX. (Tim Felgentreff)
+  * Moved to JRuby 1.5 (Dan Lucraft)
+  * Opens content from standard in (Dan Lucraft)
+  * Dev versions of Redcar have a blue icon (Dan Lucraft)
+
+New APIs:
+
+  * Annotations column (Dan Lucraft)
+  * Open popup menu and tooltips at cursor/pointer locations (Dan Lucraft)
+  
+New contributors:
+
+  * Nizar Jouini
+
 Version 0.3.5dev (1 May 2010)
 =============================
 

data/README.md

@@ -50,6 +50,13 @@ To run on OSX:
 
 You may also need to install the rake, rspec and cucumber gems.
 
+## UPDATING A SOURCE BUILD
+
+If you are running a source version of Redcar and you have pulled changes from master, then you may have to update your jars by updating and rebuilding:
+
+  $ git submodule update
+  $ jruby -S rake build
+
 ## PROBLEMS?
 
 * Irc at #redcar on irc.freenode.net

data/ROADMAP.md

@@ -8,7 +8,6 @@ Features still to port
   * Tests passing on 3 platforms
   * Full project support
   * Text/Source/Ruby bundle commands ported
-  * Drag and drop of tabs
   * Packaged for one-click install on 3 platforms
   * Ruby on Rails/HTML/CSS/YAML bundle commands ported
   
@@ -29,3 +28,14 @@ And then for 1.0...
   * Recently opened files
   * more ... ?
 
+
+Notes on features
+=================
+
+Macros
+------
+
+ * Cursor movement keys are not commands:
+   - alt left/right
+   - shift alt left/right
+   - cmd left/right

data/Rakefile

@@ -78,7 +78,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name              = "redcar"
-  s.version           = "0.3.5"
+  s.version           = "0.3.6"
   s.summary           = "A JRuby text editor."
   s.author            = "Daniel Lucraft"
   s.email             = "dan@fluentradical.com"
@@ -132,13 +132,72 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+desc "Build a MacOS X App bundle"
+task :app_bundle do
+  require 'erb'
+
+  redcar_icon = "redcar_icon_beta.png"
+
+  bundle_contents = File.join("pkg", "Redcar.app", "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)
+          ruby $REDCAR/redcar $@'
+  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
+
+  system "#{File.join(macos_dir, "redcar")} install"
+
+  FileUtils.cp_r File.join(resources_dir, "plugins", "application", "icons", redcar_icon), 
+      resources_dir, :remove_destination => true
+end
+
 desc 'Clean up (sanitize) the Textmate files for packaging'
 task :clean_textmate do
   # rename files to be x-platform safe
   Dir["textmate/Bundles/*.tmbundle/*/**/*"].each do |fn|
     if File.file?(fn)
       bits = fn.split("/").last.split(".")[0..-2].join("_")
-      new_basename = bits.gsub(" ", "_").gsub(/[^\w_]/, "__") + File.extname(fn)
+      new_basename = bits.gsub(" ", "_").gsub(/[^\w_]/, "__").gsub(/\\./, "__") + File.extname(fn)
       new_fn = File.join(File.dirname(fn), new_basename)
       # p [fn,new_fn]
       next if new_fn == fn

data/bin/redcar

@@ -14,6 +14,7 @@ elsif ARGV.first == '--associate_with_any_right_click'
   installer = Redcar::Installer.new
   installer.associate_with_any_right_click
 else
+  Redcar.read_stdin
   exit if Redcar.try_to_load_via_drb
   require File.join(File.dirname(__FILE__), %w(.. lib redcar))
   Redcar.spin_up
@@ -21,4 +22,4 @@ else
   Redcar.load
   Redcar::Top.start(ARGV)
   Redcar.pump
-end
+end

data/lib/redcar.rb

@@ -40,10 +40,10 @@ require 'yaml'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.5'
+  VERSION         = '0.3.6'
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 3
-  VERSION_RELEASE = 5
+  VERSION_RELEASE = 6
   
   ENVIRONMENTS = [:user, :debug, :test]
   
@@ -57,6 +57,7 @@ module Redcar
   end
   
   def self.environment
+    raise "no environment set" unless @environment
     @environment
   end
 
@@ -150,7 +151,7 @@ module Redcar
     attr_accessor :app
     attr_reader :gui
   end
-
+  
   # Set the application GUI.
   def self.gui=(gui)
     raise "can't set gui twice" if @gui

data/lib/redcar/installer.rb

@@ -67,6 +67,8 @@ module Redcar
       /jface/org.eclipse.jface.text_3.5.0.jar
       /jface/org.eclipse.osgi.jar
       /jface/org.eclipse.text_3.5.0.v20090513-2000.jar
+      /jface/org.eclipse.core.resources.jar
+      /jface/org.eclipse.core.jobs.jar
     )
     
     JRUBY_JAR_DIR = File.expand_path(File.join(File.dirname(__FILE__), ".."))
@@ -77,7 +79,7 @@ module Redcar
       "/jruby/joni.jar"
     ]
 
-    JRUBY << "http://jruby.kenai.com/downloads/1.4.0/jruby-complete-1.4.0.jar"
+    JRUBY << "http://jruby.org.s3.amazonaws.com/downloads/1.5.0/jruby-complete-1.5.0.jar"
     
     JOPENSSL = {
       "/jruby/bcmail-jdk14-139-#{Redcar::VERSION}.jar" => "lib/openssl/lib/bcmail-jdk14-139.jar",

data/lib/redcar/runner.rb

@@ -11,7 +11,7 @@ module Redcar
     # our vendored jarred one (useful for gems).
     def spin_up
       bin = "#{File.dirname(__FILE__)}/../../bin/redcar"
-      jruby_complete = File.expand_path(File.join(File.dirname(__FILE__), "..", "jruby-complete-1.4.0.jar"))
+      jruby_complete = File.expand_path(File.join(File.dirname(__FILE__), "..", "jruby-complete-1.5.0.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

@@ -19,13 +19,10 @@ module Redcar
         puts
         puts "Usage: redcar [OPTIONS] [FILE|DIR]*"
         puts
-        puts "        --font=FONT  Choose font"
-        puts "   --font-size=SIZE  Choose font point size"
-        puts "      --theme=THEME  Choose Textmate theme"
-        puts "--multiple-instance  Don't attempt to run from an existing instance"
-        puts "          --verbose  Set $VERBOSE to true"
-        puts "            --debug  JRuby debugging mode: activates the profiling commands in the Debug menu"
-        puts ""
+        puts " --multiple-instance  Don't attempt to open files and dirs in an already running instance"
+        puts "             --debug  JRuby debugging mode: activates the profiling commands in the Debug menu"
+        puts "--untitled-file=PATH  Open the given file as an untitled tab."
+        puts "      --ignore-stdin  Ignore stdin"
         #puts "To associate with right click in windows explorer:"
         #puts
         #puts "  C:> redcar --associate_with_any_right_click"

data/lib/redcar_quick_start.rb

@@ -2,9 +2,34 @@ require 'socket'
 
 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 = ""
+      begin
+        chunk = $stdin.read_nonblock(1024)
+        data << chunk
+        while chunk
+          chunk = $stdin.read_nonblock(1024)
+          data << chunk
+        end
+      rescue Errno::EAGAIN
+        retry
+      rescue EOFError
+      end
+      
+      if data.size > 0
+        require 'tmpdir'
+        file = File.join(Dir.tmpdir, "tmp#{$$}.txt")
+        File.open(file, 'w') {|f| f.write data}
+        ARGV.unshift "--untitled-file=#{file}", DONT_READ_STDIN_ARG
+      end
+    end
+  end
   
   def self.try_to_load_via_drb
-    return if ARGV.find{|arg| arg == "--multiple-instance" || arg == '--help' || arg == '-h'}
+    return if ARGV.find {|arg| arg == "--multiple-instance" || arg == '--help' || arg == '-h'}
     begin
       begin
         TCPSocket.new('127.0.0.1', DRB_PORT).close
@@ -19,10 +44,19 @@ module Redcar
       
       if ARGV.any?
         ARGV.each do |arg|
-          next if arg[0..0] == "-"
-          if drb.open_item_drb(File.expand_path(arg)) != 'ok'
-            return
-          end        
+          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
+          end
         end
       else
        return unless drb.open_item_drb('just_bring_to_front')

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

@@ -16,3 +16,9 @@ Then /^I should (not )?see "([^\"]*)" in the tree$/ do |bool, rows|
     on_top or on_2
   end
 end
+
+Then /^the directory tree width should be the default$/ do
+  width = Redcar.app.focussed_window.treebook.trees.last.controller.viewer.control.bounds.width
+  default = Redcar::ApplicationSWT::Window::TREEBOOK_WIDTH + Redcar::ApplicationSWT::Window::SASH_WIDTH
+  raise "The directory tree width was #{width}, expected #{default}" unless width == default
+end

data/plugins/application/features/support/env.rb

@@ -24,16 +24,12 @@ module SwtHelper
     end.compact
   end
   
-  def sash_form 
-    active_shell.getChildren.to_a.first
-  end
-  
   def tree_book
-    sash_form.getChildren.to_a.first
+    active_shell.children.to_a.first.children.to_a.first
   end
   
   def top_tree
-    r = tree_book.getLayout.topControl
+    r = tree_book
     r.extend(TreeHelpers)
     r
   end

data/plugins/application/lib/application/command/executor.rb

@@ -22,14 +22,22 @@ module Redcar
           result = @command_instance.execute
         rescue Object => e
           @command_instance.error = e
+          print_command_error(e)
         rescue java.lang.StackOverflowError => e
           @command_instance.error = e
+          print_command_error(e)
         end
         record
         result
       end
       
       private
+
+      def print_command_error(e)
+        puts "Error in command #{@command_instance.class}"
+        puts e.class.to_s + ": " + e.message
+        puts e.backtrace
+      end
       
       def record
         if Redcar.app.history

data/plugins/application/lib/application/dialog.rb

@@ -75,8 +75,31 @@ module Redcar
       end
       
       # Shows a tool tip to the user, at the cursor location.
-      def self.tool_tip(message)
-        Redcar.gui.dialog_adapter.tool_tip(message)
+      #
+      # Allowed locations:
+      #  * :cursor - the location of the text cursor in the focussed text widget
+      #  * :pointer - the location of the mouse pointer
+      #
+      # If :cursor is specified with no open tab, it will default to :pointer.
+      #
+      # @param [String] message
+      # @param [Symbol] location
+      def self.tool_tip(message, location)
+        Redcar.gui.dialog_adapter.tool_tip(message, location)
+      end
+      
+      # Shows a popup menu to the user.
+      #
+      # Allowed locations:
+      #  * :cursor - the location of the text cursor in the focussed text widget
+      #  * :pointer - the location of the mouse pointer
+      #
+      # If :cursor is specified with no open tab, it will default to :pointer.
+      #
+      # @param [Redcar::Menu] menu
+      # @param [Symbol] location
+      def self.popup_menu(menu, location)
+        Redcar.gui.dialog_adapter.popup_menu(menu, location)
       end
     end
   end

data/plugins/application/lib/application/notebook.rb

@@ -63,6 +63,10 @@ module Redcar
       notify_listeners(:tab_focussed, tab)
     end
     
+    def sort_tabs!(&block)
+      @tabs.sort! &block
+    end
+    
     # Focus the next tab to the right from the currently focussed tab.
     # Does not wrap.
     def switch_up

data/plugins/application/lib/application/window.rb

@@ -210,5 +210,9 @@ module Redcar
         tab.focus
       end
     end
+    
+    def all_tabs
+      notebooks.map {|nb| nb.tabs }.flatten
+    end
   end
 end

data/plugins/application_swt/lib/application_swt.rb

@@ -16,6 +16,8 @@ require "application_swt/menu"
 require "application_swt/menu/binding_translator"
 require "application_swt/notebook"
 require "application_swt/notebook/drag_and_drop_listener"
+require "application_swt/notebook/tab_transfer"
+require "application_swt/notebook/tab_drag_and_drop_listener"
 require "application_swt/speedbar"
 require "application_swt/treebook"
 require "application_swt/window"

data/plugins/application_swt/lib/application_swt/dialog_adapter.rb

@@ -89,14 +89,41 @@ module Redcar
         {:button => button, :value => dialog.getValue}
       end
       
-      def tool_tip(message)
+      def tool_tip(message, location)
         tool_tip = Swt::Widgets::ToolTip.new(parent_shell, Swt::SWT::ICON_INFORMATION)
         tool_tip.set_message(message)
         tool_tip.set_visible(true)
+        tool_tip.set_location(*get_coordinates(location))
+      end
+      
+      def popup_menu(menu, location)
+        window = Redcar.app.focussed_window
+        menu   = ApplicationSWT::Menu.new(window.controller, menu, nil, Swt::SWT::POP_UP)
+        menu.move(*get_coordinates(location))
+        menu.show
       end
       
       private
       
+      def get_coordinates(location)
+        edit_view = EditView.focussed_tab_edit_view
+        if location == :cursor and not edit_view
+          location = :pointer
+        end
+        case location
+        when :cursor
+          location = edit_view.controller.mate_text.viewer.get_text_widget.get_location_at_offset(edit_view.cursor_offset)
+          x, y = location.x, location.y
+          widget_offset = edit_view.controller.mate_text.viewer.get_text_widget.to_display(0,0)
+          x += widget_offset.x
+          y += widget_offset.y
+        when :pointer
+          location = ApplicationSWT.display.get_cursor_location
+          x, y = location.x, location.y
+        end
+        [x, y]
+      end
+      
       def file_dialog(type, options)
         dialog = Swt::Widgets::FileDialog.new(parent_shell, type)
         if options[:filter_path]