redcar 0.3.4.3 → 0.3.5

data/lib/redcar/runner.rb

@@ -16,17 +16,26 @@ module Redcar
         puts "\nCan't find jruby jar at #{jruby_complete}, did you run 'redcar install' ?"
         exit 1
       end
-      args = []
-      if false
-        command = "jruby #{java_args} \"#{bin}\" #{ARGV.join(' ')}"
-      else
-        ENV['RUBYOPT'] = nil # disable other native args
-        command = "java #{java_args} -Xmx500m -Xss1024k -Djruby.memory.max=500m -Djruby.stack.max=1024k -cp \"#{jruby_complete}\" org.jruby.Main \"#{bin}\" #{ARGV.join(' ')} --no-sub-jruby"
-      end
+      ENV['RUBYOPT'] = nil # disable other native args
+      command = "java #{java_args} -Xmx500m -Xss1024k -Djruby.memory.max=500m -Djruby.stack.max=1024k -cp \"#{jruby_complete}\" org.jruby.Main #{"--debug" if debug_mode?} \"#{bin}\" #{cleaned_args} --no-sub-jruby"
       puts command
       exec(command)
     end
     
+    def cleaned_args
+      ARGV.map do |arg|
+        if arg =~ /--(.+)=(.+)/
+          "--" + $1 + "=\"" + $2 + "\""
+        else
+          arg
+        end
+      end.join(' ')
+    end
+    
+    def debug_mode?
+      ARGV.include?("--debug")
+    end
+    
     def java_args
       if Config::CONFIG["host_os"] =~ /darwin/
         "-XstartOnFirstThread"

data/lib/redcar/usage.rb

@@ -16,19 +16,16 @@ module Redcar
 
     def help_requested
       if ARGV.include?("-h") or ARGV.include?("--help")
+        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 "        filename1, filename2, dirname1, dirname2 ..."
-        puts
-        puts
-        puts "To download jars:"
-        puts
-        puts "   $ [sudo] redcar install"
-        puts
+        puts "            --debug  JRuby debugging mode: activates the profiling commands in the Debug menu"
+        puts ""
         #puts "To associate with right click in windows explorer:"
         #puts
         #puts "  C:> redcar --associate_with_any_right_click"

data/lib/redcar_quick_start.rb

@@ -1,21 +1,21 @@
 require 'socket'
 
 module Redcar
-
-  # attempt to load via drb if available
+  DRB_PORT = 10021
+  
   def self.try_to_load_via_drb
     return if ARGV.find{|arg| arg == "--multiple-instance" || arg == '--help' || arg == '-h'}
-    port = 9999
     begin
       begin
-        TCPSocket.new('127.0.0.1', port).close
+        TCPSocket.new('127.0.0.1', DRB_PORT).close
       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:#{port}")
+      drb = DRbObject.new(nil, "druby://127.0.0.1:#{DRB_PORT}")
       
       if ARGV.any?
         ARGV.each do |arg|

data/lib/regex_replace.rb

@@ -1,11 +1,4 @@
 
-begin
-  require 'rubygems'
-  require 'oniguruma'
-rescue LoadError
-  
-end
-
 class RegexReplace
   COND_RE = /\(
                 \?(\d+):

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

@@ -0,0 +1,5 @@
+
+When /^I run the command ([^\s]+)$/ do |command_name|
+  command_class = eval(command_name)
+  command_class.new.run
+end

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

@@ -3,3 +3,8 @@ Given /^I will choose "([^\"]*)" from the "([^\"]*)" dialog$/ do |path, type|
   Redcar.gui.register_dialog_adapter(FakeDialogAdapter.new)
   Redcar.gui.dialog_adapter.set(type.to_sym, path)
 end
+
+Then /^I should not see a "([^\"]*)" dialog for the rest of the feature/ do |type|
+  Redcar.gui.register_dialog_adapter(FakeDialogAdapter.new)
+  Redcar.gui.dialog_adapter.set(type.to_sym, :raise_error)
+end

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

@@ -0,0 +1,38 @@
+
+def filter_dialog
+  dialog(Redcar::ApplicationSWT::FilterListDialogController::FilterListDialog)
+end
+
+def filter_dialog_items
+  filter_dialog.list.get_items.to_a
+end
+
+Then /^there should be a filter dialog open$/ do
+  filter_dialog.should_not be_nil
+end
+
+Then /^there should be no filter dialog open$/ do
+  filter_dialog.should be_nil
+end
+
+When /^I set the filter to "(.*)"$/ do |text|
+  filter_dialog.text.set_text(text)
+end
+
+When /^I select in the filter dialog$/ do
+  filter_dialog.controller.selected
+end
+
+When /^I wait "(.*)" seconds?$/ do |time|
+  Cucumber::Ast::StepInvocation.wait_time = time.to_f
+end
+
+Then /^the filter dialog should have (no|\d+) entr(?:y|ies)$/ do |num|
+  num = (num == "no" ? 0 : num.to_i)
+  filter_dialog_items.length.should == num
+end
+
+Then /^I should see "(.*)" at (\d+) the filter dialog$/ do |text, pos|
+  pos = pos.to_i
+  filter_dialog_items[pos].should == text
+end

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

@@ -1,4 +1,4 @@
 
 Then /^the window should have title "([^\"]*)"$/ do |expected_title|
-  first_shell.get_text.should == expected_title
+  active_shell.get_text.should == expected_title
 end

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

@@ -10,8 +10,22 @@ module SwtHelper
     Redcar::ApplicationSWT.display.get_shells.to_a.first
   end
   
+  def active_shell
+    Redcar::ApplicationSWT.display.get_active_shell
+  end
+  
+  def dialog(type)
+    dialogs.detect {|d| d.is_a?(type) }
+  end
+  
+  def dialogs
+    Redcar::ApplicationSWT.display.get_shells.to_a.map do |s| 
+      Redcar::ApplicationSWT.shell_dialogs[s]
+    end.compact
+  end
+  
   def sash_form 
-    first_shell.getChildren.to_a.first
+    active_shell.getChildren.to_a.first
   end
   
   def tree_book
@@ -45,21 +59,40 @@ class FakeDialogAdapter
   end
   
   def open_file(*args)
-    @responses[:open_file]
+    check_for_raise(@responses[:open_file])
   end
   
   def open_directory(*args)
-    @responses[:open_directory]
+    check_for_raise(@responses[:open_directory])
   end
   
   def save_file(*args)
-    @responses[:save_file]
+    check_for_raise(@responses[:save_file])
+  end
+  
+  def message_box(*args)
+    check_for_raise(@responses[:message_box].to_sym)
+  end
+  
+  def check_for_raise(result)
+    if result == :raise_error
+      raise "did not expect dialog"
+    end
+    result
+  end
+  
+  def available_message_box_button_combos
+    Redcar::ApplicationSWT::DialogAdapter.new.available_message_box_button_combos
   end
 end
 
 World(SwtHelper)
 
 def close_everything
+  Redcar.app.task_queue.cancel_all
+  Redcar::ApplicationSWT.sync_exec do
+    dialogs.each {|d| d.controller.model.close }
+  end
   Redcar.app.windows.each do |win|
     while tree = win.treebook.trees.first
       Redcar::ApplicationSWT.sync_exec do
@@ -84,19 +117,22 @@ def close_everything
       Redcar.app.windows.last.close
     end
   end
+  Redcar::ApplicationSWT.sync_exec do
+    Redcar.app.windows.first.title = Redcar::Window::DEFAULT_TITLE
+  end
 end
 
 Before do
   close_everything
+  Redcar::ApplicationSWT::FilterListDialogController.test_mode = true
 end
 
 After do
   close_everything
 end
 
-
-
-
-
+at_exit {
+  FileUtils.rm_rf(Redcar::Plugin::Storage.storage_dir)
+}
 
 

data/plugins/application/lib/application.rb

@@ -8,10 +8,12 @@ require 'application/clipboard'
 require 'application/command'
 require 'application/dialog'
 require 'application/dialogs/filter_list_dialog'
+require 'application/event_spewer'
 require 'application/keymap'
 require 'application/keymap/builder'
 require 'application/menu'
 require 'application/menu/item'
+require 'application/menu/lazy_menu'
 require 'application/menu/builder'
 require 'application/notebook'
 require 'application/speedbar'
@@ -66,7 +68,7 @@ module Redcar
       ]
     end
     
-    attr_reader :clipboard, :keymap, :menu, :history
+    attr_reader :clipboard, :keymap, :menu, :history, :task_queue
     
     # Create an application instance with a Redcar::Clipboard and a Redcar::History.
     def initialize
@@ -74,10 +76,18 @@ module Redcar
       @window_handlers = Hash.new {|h,k| h[k] = []}
       create_clipboard
       create_history
+      @event_spewer = EventSpewer.new
+      @task_queue   = TaskQueue.new
     end
     
-    # Immediately halts the gui event loop.
+    def events
+      @event_spewer
+    end
+  
+    # Immediately stop the gui event loop.
+    # (You should probably be running QuitCommand instead.)    
     def quit
+      @task_queue.stop
       Redcar.gui.stop
     end
     
@@ -90,15 +100,15 @@ module Redcar
 
     # Create a new Application::Window, and the controller for it.
     def new_window
+      s = Time.now
       new_window = Window.new
       windows << new_window
       notify_listeners(:new_window, new_window)
       attach_window_listeners(new_window)
-      new_window.menu   = load_menu
-      new_window.keymap = main_keymap
       new_window.refresh_menu
       new_window.show
       set_focussed_window(new_window)
+      #puts "App#new_window took #{Time.now - s}s"
       new_window
     end   
     
@@ -118,13 +128,6 @@ module Redcar
       @window_handlers[window].each {|h| window.remove_listener(h) }
       
       @window_handlers.delete(window)
-      if windows.length == 0 and [:linux, :windows].include?(Redcar.platform)
-        if Application.storage['stay_resident_after_last_window_closed'] && !(ARGV.include?("--multiple-instance"))
-          puts 'continuing to run to wait for incoming drb connections later'
-        else
-          quit
-        end
-      end
     end
     
     def self.storage
@@ -175,49 +178,46 @@ module Redcar
     
     # Redraw the main menu, reloading all the Menus and Keymaps from the plugins.
     def refresh_menu!
-      windows.each do |window|
-        window.menu = load_menu
-        window.keymap = main_keymap
-        window.refresh_menu
-      end
+      @main_menu = nil
+      @main_keymap = nil
+      windows.each {|window| window.refresh_menu }
+      controller.refresh_menu
     end
     
     # Generate the main menu by combining menus from all plugins.
     #
     # @return [Redcar::Menu]
-    def load_menu
-      menu = Menu.new
-      Redcar.plugin_manager.loaded_plugins.each do |plugin|
-        if plugin.object.respond_to?(:menus)
-          menu.merge(plugin.object.menus)
+    def main_menu
+      @main_menu ||= begin
+        menu = Menu.new
+        Redcar.plugin_manager.objects_implementing(:menus).each do |object|
+          menu.merge(object.menus)
         end
+        menu
       end
-      menu
     end
     
     # Generate the main keymap by merging the keymaps from all plugins.
     #
     # @return [Redcar::Keymap]
     def main_keymap
-      keymap = Keymap.new("main", Redcar.platform)
-      Redcar.plugin_manager.loaded_plugins.each do |plugin|
-        if plugin.object.respond_to?(:keymaps)
-          maps = plugin.object.keymaps
+      @main_keymap ||= begin
+        keymap = Keymap.new("main", Redcar.platform)
+        Redcar.plugin_manager.objects_implementing(:keymaps).each do |object|
+          maps = object.keymaps
           keymaps = maps.select do |map| 
             map.name == "main" and map.platforms.include?(Redcar.platform)
           end
           keymap = keymaps.inject(keymap) {|k, nk| k.merge(nk) }
         end
+        keymap
       end
-      keymap
     end
     
     # Loads sensitivities from all plugins.
     def load_sensitivities
-      Redcar.plugin_manager.loaded_plugins.each do |plugin|
-        if plugin.object.respond_to?(:sensitivities)
-          plugin.object.sensitivities
-        end
+      Redcar.plugin_manager.objects_implementing(:sensitivities).each do |object|
+        object.sensitivities
       end
     end
     
@@ -226,7 +226,6 @@ module Redcar
     def lost_application_focus
       return if @protect_application_focus
       @application_focus = false
-      puts "Lost application focus"
       notify_listeners(:lost_focus, self)
     end
     
@@ -235,7 +234,6 @@ module Redcar
     def gained_application_focus
       if @application_focus == false
         @application_focus = true
-        puts "Gained application focus"
         notify_listeners(:focussed, self)
       end
     end
@@ -262,6 +260,7 @@ module Redcar
       end
       h3 = window.add_listener(:focussed) do |win|
         self.focussed_window = win
+        notify_listeners(:window_focussed, win)
       end
       h4 = window.add_listener(:new_notebook) do |win|
         notify_listeners(:notebook_change)

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

@@ -16,6 +16,36 @@ module Redcar
   #         tab.close if tab
   #       end
   #     end
+  #
+  # ## Avoiding Memory Leaks (Command instance Lifecycle)
+  #
+  # When a command is activated, an instance of the Command class will be created.
+  # Once the command has been run, the Command instance is put into the Command History,
+  # which stores recent commands so they are accessible to e.g. Macros.
+  #
+  # This means that the command instance will hang around indefinitely, so it is 
+  # easy to create a memory leak (it is not 'technically' a leak because the Command
+  # will be collected eventually, just probably not soon enough.)
+  #
+  # For example, this command has a memory leak:
+  #
+  #     class MyCommand < Redcar::Command
+  #       def execute
+  #         @cache = create_outrageously_large_data_structure
+  #         do_some_stuff_with_data_structure
+  #       end
+  #     end
+  #
+  # Because the History will store the MyCommand instance, the @cache object will 
+  # be around for quite a while. Best to get rid of it:
+  #
+  #     class MyCommand < Redcar::Command
+  #       def execute
+  #         @cache = create_outrageously_large_data_structure
+  #         do_some_stuff_with_data_structure
+  #         @cache = nil
+  #       end
+  #     end
   class Command
     attr_accessor :error
     
@@ -56,11 +86,11 @@ module Redcar
     end
     
     def win
-      env[:win]
+      @win || env[:win]
     end
     
     def tab
-      env[:tab]
+      @tab || env[:tab]
     end
   end
 end