redcar 0.3.10.1dev → 0.4

data/CHANGES

@@ -1,6 +1,6 @@
 
-Version 0.3.10 (TBA)
-====================
+Version 0.4 (23 Aug 2010)
+=========================
 
 Enhancements:
 
@@ -10,6 +10,16 @@ Enhancements:
  * Strip trailing spaces on save option (Steven Hancock)
  * Search and replace supports backreferences (\1 \2 etc) (Mat Schaffer)
  * Uses client, 32bit jvm mode, for twice as fast startup. (Dan Lucraft)
+ * Bracket highlighting! (Alex Lourie)
+ * Todo list (find all occurrences of TODO etc in project) (Delisa Mason)
+ * Styled runnable tabs (Mat Schaffer)
+ * See all snippets in a tree (Delisa Mason)
+ * Find in project plugin (uses grep and ack) (Kieran Pilkington and Krzysztof Jablonski)
+ * Runnables re-use an open tab. (Mat Schaffer)
+ * Can pin your choice of bundles to the bundles menu (Delisa Mason)
+ * Experimental git scm integration (Matthew Scharley)
+ * PHP jump to declaration support (Daniel Cestari)
+ * Outline view of document (jump to declaration in document) (Johannes Wollert)
 
 Fixes:
 

data/README.md

@@ -1,4 +1,3 @@
-
 {Redcar}
 ========
 
@@ -43,7 +42,7 @@ installed as JRuby gems.
 
 Download from github, checkout the submodules and build JavaMateView. 
 
-    $ git clone git://github.com/danlucraft/redcar.git
+    $ git clone git://github.com/redcar/redcar.git
     $ cd redcar
     $ git submodule init
     $ git submodule update

data/Rakefile

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

data/bin/redcar

@@ -1,22 +1,22 @@
 #!/usr/bin/env ruby
 $redcar_process_start_time = Time.now
 $VERBOSE = true if ARGV.find{|arg| arg == '--verbose'}
-require File.join(File.dirname(__FILE__), %w(.. lib redcar_quick_start))
+require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar_quick_start)))
 
 if ARGV.first == "install"
-  require File.join(File.dirname(__FILE__), %w(.. lib redcar))
+  require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar)))
   require 'redcar/installer'
   installer = Redcar::Installer.new
   installer.install
 elsif ARGV.first == '--associate_with_any_right_click'
-  require File.join(File.dirname(__FILE__), %w(.. lib redcar))
+  require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar)))
   require 'redcar/installer'
   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))
+  require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar)))
   Redcar.spin_up
   Redcar.environment = :user
   Redcar.load

data/lib/redcar.rb

@@ -41,10 +41,10 @@ require 'uri'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.10.1dev'
+  VERSION         = '0.4'
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 3
-  VERSION_RELEASE = 10
+  VERSION_MINOR   = 4
+  VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]
   

data/lib/redcar/installer.rb

@@ -18,9 +18,9 @@ module Redcar
       end
       puts "found latest XULRunner release version: #{xulrunner_version}" if Redcar.platform == :windows
     end
-  	
+    
   	def install
-  	  unless File.writable?(JRUBY_JAR_DIR)
+      unless File.writable?(JRUBY_JAR_DIR)
   	    puts "Don't have permission to write to #{JRUBY_JAR_DIR}. Please rerun with sudo."
   	    exit 1
   	  end
@@ -90,7 +90,7 @@ module Redcar
       "/jruby/joni.jar"
     ]
 
-    JRUBY << "http://jruby.org.s3.amazonaws.com/downloads/1.5.1/jruby-complete-1.5.1.jar"
+    JRUBY << "http://jruby.org.s3.amazonaws.com/downloads/1.5.2/jruby-complete-1.5.2.jar"
     
     JOPENSSL_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", "openssl/lib/")) 
     JOPENSSL = {

data/lib/redcar/runner.rb

@@ -7,7 +7,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.5.1.jar"))
+      jruby_complete = File.expand_path(File.join(File.dirname(__FILE__), "..", "jruby-complete-1.5.2.jar"))
       unless File.exist?(jruby_complete)
         puts "\nCan't find jruby jar at #{jruby_complete}, did you run 'redcar install' ?"
         exit 1
@@ -43,6 +43,10 @@ module Redcar
       if ARGV.include?("--load-timings")
         str << " -Djruby.debug.loadService.timing=true"
       end
+      
+      if ARGV.include?("--quick")
+        str << " -d32 -client"
+      end
       str
     end
   end

data/lib/redcar/usage.rb

@@ -22,7 +22,8 @@ module Redcar
         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 "      --ignore-stdin  Ignore stdin."
+        puts "              --fork  Detach from the console."
         #puts "To associate with right click in windows explorer:"
         #puts
         #puts "  C:> redcar --associate_with_any_right_click"

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

@@ -1,19 +1,19 @@
 
 When /^I expand the tree row "([^\"]*)"$/ do |row|
   item = top_tree.items.detect {|item| item.getText == row }
-  viewer = Redcar.app.focussed_window.treebook.trees.last.controller.viewer
+  viewer = focussed_tree.controller.viewer
   node = viewer.getViewerRowFromItem(item).getElement
   viewer.expandToLevel(node, 1)
 end
 
-Then /^I should (not )?see "([^\"]*)" in the tree$/ do |bool, rows|
-  bool = !bool
-  matcher = bool ? be_true : be_false
-  rows = rows.split(",").map {|r| r.strip}
-  rows.each do |row|
-    on_top = top_tree.item_texts.include?(row)
-    on_2 = top_tree.items.any? {|item| item.getItems.to_a.any? {|sub_item| sub_item.getText == row } }
-    on_top or on_2
+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|
+    if negate
+      item_names.should_not include row
+    else
+      item_names.should include row
+    end
   end
 end
 
@@ -22,3 +22,14 @@ Then /^the tree width should be the default$/ do
   default = Redcar::ApplicationSWT::Window::TREEBOOK_WIDTH + Redcar::ApplicationSWT::Window::SASH_WIDTH - 5
   raise "The tree width was #{width}, expected #{default}" unless width == default
 end
+
+When /^I activate the "([^"]*)" node in the tree$/ do |node_text|
+  controller = focussed_tree.tree_controller
+  model      = focussed_tree.controller.model
+  mirror     = focussed_tree.tree_mirror
+  node       = find_node_with_text(mirror.top, node_text)
+
+  node.should_not be_nil
+  
+  controller.activated(model, node)
+end

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

@@ -14,7 +14,15 @@ module SwtHelper
   end
   
   def active_shell
-    Redcar.app.focussed_window.controller.shell
+    focussed_window.controller.shell
+  end
+
+  def focussed_window
+    Redcar.app.focussed_window
+  end
+
+  def focussed_tree
+    focussed_window.treebook.focussed_tree
   end
   
   def dialog(type)
@@ -26,17 +34,28 @@ module SwtHelper
       Redcar::ApplicationSWT.shell_dialogs[s]
     end.compact
   end
-  
-  def tree_book
-    active_shell.children.to_a.first.children.to_a.first.children.to_a.first.children.to_a.first
+
+  def visible_tree_items(tree, items = [])
+    tree.getItems.to_a.each do |item|
+      items << item
+      visible_tree_items(item, items) if item.expanded?
+    end
+    return items
   end
-  
+
   def top_tree
-    r = tree_book
-    r.extend(TreeHelpers)
-    r
+    tree = focussed_tree.controller.viewer.get_tree
+    tree.extend(TreeHelpers)
+    tree
   end
   
+  def find_node_with_text(top, node_text)
+    node = top.detect { |node| node.text == node_text }
+    return node if node
+    all_children = top.map{ |node| node.children }.flatten
+    find_node_with_text(all_children, node_text) unless all_children.empty?
+  end
+
   module TreeHelpers
     def items
       getItems.to_a

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

@@ -19,7 +19,11 @@ module Redcar
       def execute
         @command_instance.environment(Executor.current_environment)
         begin
-          result = @command_instance.execute
+          if not @options.empty?
+            result = @command_instance.execute(@options) 
+          else
+            result = @command_instance.execute
+          end
         rescue Object => e
           @command_instance.error = e
           print_command_error(e)

data/plugins/application/lib/application/menu/builder/group.rb

@@ -37,6 +37,10 @@ module Redcar
         def lazy_sub_menu(text, options={}, &block)
           @builder.lazy_sub_menu(text, @defaults.merge(options), &block)
         end
+
+        def append(item)
+          @builder.append(item)
+        end
       end
     end
   end

data/plugins/application/lib/application/menu/item.rb

@@ -12,7 +12,7 @@ module Redcar
         end
       end
       
-      attr_reader :text, :command, :priority
+      attr_reader :text, :command, :priority, :value, :type, :active
   
       # Create a new Item, with the given text to display in the menu, and
       # either:
@@ -24,6 +24,9 @@ module Redcar
         if options.respond_to?('[]')
           @command = options[:command] || block
           @priority = options[:priority]
+          @value = options[:value]
+          @type = options[:type]
+          @active = options[:active] ? true : false
         # This branch is for compatibility with old code. Please use :command 
         # option in new code
         # FIXME: Should this be removed at some point?
@@ -36,7 +39,19 @@ module Redcar
       
       # Call this to signal that the menu item has been selected by the user.
       def selected(with_key=false)
-        @command.new.run#(:with_key => with_key)
+        if @value
+          @command.new.run(:value => @value)
+        else  
+          @command.new.run#(:with_key => with_key)
+        end
+      end
+      
+      def type
+        @type
+      end
+      
+      def type
+        @type
       end
       
       def merge(other)

data/plugins/application/spec/application/command/executor_spec.rb

@@ -56,6 +56,11 @@ class Redcar::Command
       before do
         @command = MyErrorCommand.new
         @executor = Executor.new(@command)
+        $stdout = StringIO.new
+      end
+      
+      after do
+        $stdout = STDOUT
       end
 
       it "should capture the error" do

data/plugins/application_swt/lib/application_swt/event_loop.rb

@@ -9,13 +9,18 @@ module Redcar
       # Begins the SWT event loop. Blocks.
       def start
         @running = true
-        display = ApplicationSWT.display
-        while @running and not display.disposed?
-          unless display.read_and_dispatch
-            display.sleep
+        @display = ApplicationSWT.display
+        while @running and not @display.disposed?
+          unless read = @display.read_and_dispatch
+            @display.sleep
           end
         end
-        display.dispose
+        @display.dispose
+      end
+      
+      # Lets the even loop run until block returns false
+      def yield_until
+        @display.read_and_dispatch until yield
       end
       
       # Halts the SWT event loop.

data/plugins/application_swt/lib/application_swt/menu.rb

@@ -1,20 +1,27 @@
 module Redcar
   class ApplicationSWT
     class Menu
+
+      def self.types
+        @types = { :check => Swt::SWT::CHECK, :radio => Swt::SWT::RADIO }
+      end
+
       def self.items
         @items ||= Hash.new {|h,k| h[k] = []}
       end
-      
+
       def self.disable_items(key_string)
         items[key_string].each {|i| p i.text; i.enabled = false}
       end
-    
+
       attr_reader :menu_bar
-      
+
+
+
       def self.menu_types
         [Swt::SWT::BAR, Swt::SWT::POP_UP]
       end
-      
+
       def initialize(window, menu_model, keymap, type, options={})
         s = Time.now
         unless Menu.menu_types.include?(type)
@@ -31,7 +38,7 @@ module Redcar
         add_entries_to_menu(@menu_bar, menu_model)
         #puts "ApplicationSWT::Menu initialize took #{Time.now - s}s"
       end
-      
+
       def show
         @menu_bar.set_visible(true)
       end
@@ -41,23 +48,25 @@ module Redcar
         @menu_bar.dispose
         @result
       end
-      
+
       def move(x, y)
         @menu_bar.setLocation(x, y)
       end
-      
+
       private
-      
+
       def use_numbers?
         @use_numbers
       end
 
       def add_entries_to_menu(menu, menu_model)
+
         menu_model.each do |entry|
           if entry.is_a?(Redcar::Menu::LazyMenu)
             menu_header = Swt::Widgets::MenuItem.new(menu, Swt::SWT::CASCADE)
             menu_header.text = entry.text
-            new_menu = Swt::Widgets::Menu.new(@window.shell, Swt::SWT::DROP_DOWN)
+            #new_menu = Swt::Widgets::Menu.new(@window.shell, Swt::SWT::DROP_DOWN)
+            new_menu = Swt::Widgets::Menu.new(menu)
             menu_header.menu = new_menu
             menu_header.add_arm_listener do
               new_menu.get_items.each {|i| i.dispose }
@@ -66,13 +75,15 @@ module Redcar
           elsif entry.is_a?(Redcar::Menu)
             menu_header = Swt::Widgets::MenuItem.new(menu, Swt::SWT::CASCADE)
             menu_header.text = entry.text
-            new_menu = Swt::Widgets::Menu.new(@window.shell, Swt::SWT::DROP_DOWN)
+            #new_menu = Swt::Widgets::Menu.new(@window.shell, Swt::SWT::DROP_DOWN)
+            new_menu = Swt::Widgets::Menu.new(menu)
             menu_header.menu = new_menu
             add_entries_to_menu(new_menu, entry)
           elsif entry.is_a?(Redcar::Menu::Item::Separator)
             item = Swt::Widgets::MenuItem.new(menu, Swt::SWT::SEPARATOR)
           elsif entry.is_a?(Redcar::Menu::Item)
-            item = Swt::Widgets::MenuItem.new(menu, Swt::SWT::PUSH)
+            item = Swt::Widgets::MenuItem.new(menu, Menu.types[entry.type] || Swt::SWT::PUSH)
+            item.setSelection(entry.active)
             if entry.command.is_a?(Proc)
               connect_proc_to_item(item, entry)
             else
@@ -88,16 +99,16 @@ module Redcar
         def initialize(entry)
           @entry = entry
         end
-        
+
         def widget_selected(e)
           Redcar.safely("menu item '#{@entry.text}'") do
             @entry.command.call
           end
         end
-        
+
         alias :widget_default_selected :widget_selected
       end
-      
+
       def connect_proc_to_item(item, entry)
         if use_numbers? and Redcar.platform == :osx
           item.text = entry.text + "\t" + @number.to_s
@@ -107,21 +118,21 @@ module Redcar
         end
         item.addSelectionListener(ProcSelectionListener.new(entry))
       end
-      
+
       class SelectionListener
         def initialize(entry)
           @entry = entry
         end
-        
+
         def widget_selected(e)
           @entry.selected(e.stateMask != 0)
         end
-        
+
         def widget_default_selected(e)
           @entry.selected(e.stateMask != 0)
         end
       end
-      
+
       def connect_command_to_item(item, entry)
         if key_specifier = @keymap.command_to_key(entry.command)
           if key_string    = BindingTranslator.platform_key_string(key_specifier)
@@ -148,4 +159,4 @@ module Redcar
       end
     end
   end
-end
+end