redcar 0.4.1 → 0.5

data/lib/redcar.rb

@@ -1,19 +1,29 @@
 
-$:.push File.expand_path(File.join(File.dirname(__FILE__)))
+$:.push(File.expand_path(File.join(File.dirname(__FILE__))))
+$:.push(File.expand_path(File.join(File.dirname(__FILE__), %w{.. vendor spoon lib})))
+$:.push(File.expand_path(File.join(File.dirname(__FILE__), %w{.. vendor ffi lib})))
 
 require 'redcar/usage'
 
-require 'rbconfig'
-
 require 'redcar/ruby_extensions'
 require 'redcar/instance_exec'
 require 'redcar/usage'
 require 'regex_replace'
 
 require 'forwardable'
-require 'yaml'
 require 'uri'
 
+begin
+  if Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
+    require 'spoon'
+    module Redcar; SPOON_AVAILABLE = true; end
+  else
+    module Redcar; SPOON_AVAILABLE = false; end
+  end
+rescue LoadError
+  module Redcar; SPOON_AVAILABLE = false; end
+end
+
 # ## Loading and Initialization
 #
 # Every feature in Redcar is written as a plugin. This module contains a few
@@ -41,14 +51,16 @@ require 'uri'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.4.1'
+  VERSION         = '0.5' # also change in the Rakefile!
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 4
-  VERSION_RELEASE = 1
+  VERSION_MINOR   = 5
+  VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]
   
   PROCESS_START_TIME = Time.now
+  
+  ICONS_DIRECTORY = File.expand_path(File.join(File.dirname(__FILE__), %w{.. share icons}))
 
   def self.environment=(env)
     unless ENVIRONMENTS.include?(env)
@@ -63,44 +75,9 @@ module Redcar
   end
 
   def self.spin_up
-    forking = ARGV.include?("--fork")
-    no_runner = ARGV.include?("--no-sub-jruby")
-    jruby = Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
-    osx = ! [:linux, :windows].include?(platform)    
-
-    begin
-      if forking and not jruby
-        # jRuby doesn't support fork() because of the runtime stuff...
-        forking = false
-        puts 'Forking failed, attempting to start anyway...' if (pid = fork) == -1
-        exit unless pid.nil? # kill the parent process
-        
-        if pid.nil?
-          # reopen the standard pipes to nothingness
-          STDIN.reopen '/dev/null'
-          STDOUT.reopen '/dev/null', 'a'
-          STDERR.reopen STDOUT
-        end
-      elsif forking
-        # so we need to try something different...
-        # Need to work out the vendoring stuff here.
-        # for now just blow up and do what we'd normally do.
-        #require 'spoon'
-        raise NotImplementedError, 'Attempting to fork from inside jRuby. jRuby doesn\'t support this.'
-        #puts 'Continuing normally...'
-        #forking = false
-      end
-    rescue NotImplementedError
-      puts "Forking isn't supported on this system. Sorry."
-      puts "Starting normally..."
-    end
-    
-    return if no_runner
-    return if jruby and not osx
-    
     require 'redcar/runner'
     runner = Redcar::Runner.new
-    runner.spin_up
+    runner.run
   end
 
   def self.root
@@ -116,54 +93,89 @@ module Redcar
     end
   end
 
-  # Tells the plugin manager to load plugins, and prints debug output.
-  def self.load
+  def self.load_prerequisites
+    exit if ARGV.include?("--quit-immediately")
+    
+    require 'redcar_quick_start'
+    
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "plugin_manager", "lib"))
     require 'plugin_manager'
     
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "json", "lib"))
     require 'json'
     
+    $:.push File.expand_path(File.join(Redcar.asset_dir))
+    
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "openssl", "lib"))
-    require 'openssl'
+    
+    plugin_manager.load("swt")
+  end
 
-    plugin_manager.load
-    if plugin_manager.unreadable_definitions.any?
-      puts "Couldn't read definition files: "
-      puts plugin_manager.unreadable_definitions.map {|d| "  * " + d}
+  def self.load_plugins
+    begin
+      exit if ARGV.include?("--quit-after-splash")
+      
+      plugin_manager.load
+      if plugin_manager.unreadable_definitions.any?
+        puts "Couldn't read definition files: "
+        puts plugin_manager.unreadable_definitions.map {|d| "  * " + d}
+      end
+      if plugin_manager.plugins_with_errors.any?
+        puts "There was an error loading plugins: "
+        puts plugin_manager.plugins_with_errors.map {|d| "  * " + d.name}
+      end
+      if ENV["PLUGIN_DEBUG"]
+        puts "Loaded plugins:"
+        puts plugin_manager.loaded_plugins.map {|d| "  * " + d.name}
+        puts
+        puts "Unloaded plugins:"
+        puts plugin_manager.unloaded_plugins.map {|d| "  * " + d.name}
+      end
+    rescue => e
+      puts e.message
+      puts e.backtrace
+    end
+  end
+  
+  # Tells the plugin manager to load plugins, and prints debug output.
+  def self.load_threaded
+    load_prerequisites
+    thread = Thread.new do
+      load_plugins
+      Redcar::Top.start(ARGV)
     end
-    if plugin_manager.plugins_with_errors.any?
-      puts "There was an error loading plugins: "
-      puts plugin_manager.plugins_with_errors.map {|d| "  * " + d.name}
+    if no_gui_mode?
+      thread.join
     end
-    if ENV["PLUGIN_DEBUG"]
-      puts "Loaded plugins:"
-      puts plugin_manager.loaded_plugins.map {|d| "  * " + d.name}
-      puts
-      puts "Unloaded plugins:"
-      puts plugin_manager.unloaded_plugins.map {|d| "  * " + d.name}
+  end
+  
+  def self.load_unthreaded
+    load_prerequisites
+    load_plugins
+  end
+  
+  def self.no_gui_mode?
+    ARGV.include?("--no-gui")
+  end
+  
+  def self.show_splash
+    return if Redcar.no_gui_mode?
+    
+    Swt.create_splash_screen(plugin_manager.plugins.length + 10)
+    plugin_manager.on_load do |plugin|
+      Swt.sync_exec do
+        Swt.splash_screen.inc
+      end
     end
   end
 
-  # Starts the GUI.
+  ## Starts the GUI.
   def self.pump
+    return if Redcar.no_gui_mode?
+    
     Redcar.gui.start
   end
 
-  # Platform symbol
-  #
-  # @return [:osx/:windows/:linux]
-  def self.platform
-    case Config::CONFIG["target_os"]
-    when /darwin/
-      :osx
-    when /mswin|mingw/
-      :windows
-    when /linux/
-      :linux
-    end
-  end
-
   # Platform specific ~/.redcar
   #
   # @return [String] expanded path
@@ -176,6 +188,11 @@ module Redcar
     File.expand_path(File.join(home_dir, dirname))
   end
   
+  # Platform specific ~/.redcar/assets
+  def self.asset_dir
+    File.join(home_dir, ".redcar", "assets")
+  end
+  
   # Platform specific ~/
   #
   # @return [String] expanded path
@@ -199,6 +216,7 @@ module Redcar
   # Set the application GUI.
   def self.gui=(gui)
     raise "can't set gui twice" if @gui
+    return if Redcar.no_gui_mode?
     @gui = gui
   end
 end

data/lib/redcar_quick_start.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'rbconfig'
 
 module Redcar
   DRB_PORT = 10021
@@ -54,7 +55,7 @@ module Redcar
           end
         end
       else
-       return unless drb.open_item_drb('just_bring_to_front')
+        return unless drb.open_item_drb('just_bring_to_front')
       end
       puts 'Success' if $VERBOSE
       true
@@ -64,4 +65,27 @@ module Redcar
       false
     end
   end
-end
+
+  # Platform symbol
+  #
+  # @return [:osx/:windows/:linux]
+  def self.platform
+    case Config::CONFIG["target_os"]
+    when /darwin/
+      :osx
+    when /mswin|mingw/
+      :windows
+    when /linux/
+      :linux
+    end
+  end
+  
+  def self.null_device
+    case platform
+    when :windows
+      'nul'
+    else
+      '/dev/null'
+    end
+  end
+end

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

@@ -125,34 +125,34 @@ World(SwtHelper)
 
 def close_everything
   Redcar.app.task_queue.cancel_all
-  Redcar::ApplicationSWT.sync_exec do
+  Swt.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
+      Swt.sync_exec do
         win.treebook.remove_tree(tree)
       end
     end
     win.notebooks.each do |notebook|
       while tab = notebook.tabs.first
-        Redcar::ApplicationSWT.sync_exec do
+        Swt.sync_exec do
           tab.close
         end
       end
     end
     if win.notebooks.length == 2
-      Redcar::ApplicationSWT.sync_exec do
+      Swt.sync_exec do
         win.close_notebook
       end
     end
   end
   while Redcar.app.windows.length > 1
-    Redcar::ApplicationSWT.sync_exec do
+    Swt.sync_exec do
       Redcar.app.windows.last.close
     end
   end
-  Redcar::ApplicationSWT.sync_exec do
+  Swt.sync_exec do
     Redcar.app.focussed_window.close_speedbar if Redcar.app.focussed_window.speedbar
     Redcar.app.windows.first.title = Redcar::Window::DEFAULT_TITLE
   end

data/plugins/application/lib/application.rb

@@ -1,4 +1,6 @@
 
+require 'yaml'
+
 require 'application/command/executor'
 require 'application/command/history'
 require 'application/sensitive'
@@ -182,7 +184,7 @@ module Redcar
       @main_menu = nil
       @main_keymap = nil
       windows.each {|window| window.refresh_menu }
-      controller.refresh_menu
+      notify_listeners(:refresh_menu)
     end
     
     # Generate the main menu by combining menus from all plugins.

data/plugins/application/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 require 'redcar'
 Redcar.environment = :test
-Redcar.load
+Redcar.load_unthreaded
 Dir[File.dirname(__FILE__) + "/application/controllers/*.rb"].each do |fn|
   require fn
 end

data/plugins/application_swt/lib/application_swt/dialogs/filter_list_dialog_controller.rb

@@ -144,8 +144,10 @@ module Redcar
       def update_list_sync
         if @dialog
           s = Time.now
-          list = @model.update_list(@dialog.text.get_text)
-          populate_list(list)
+          @update_thread = Thread.new(@dialog.text.get_text) do |text|
+            @model.update_list(text)
+          end
+          populate_list(@update_thread.value)
           @dialog.list.set_selection(0)
           text_focus
         end
@@ -155,7 +157,16 @@ module Redcar
         @dialog.text.set_focus
       end
       
+      def wait_for_search
+        @update_thread.join unless @update_thread.nil?
+      end
+
+      def select_closest_match?
+        @dialog.list.get_selection_index == 0
+      end
+
       def selected
+        wait_for_search if select_closest_match?
         @model.selected(@dialog.list.get_selection.first, @dialog.list.get_selection_index)
       end
       

data/plugins/application_swt/lib/application_swt.rb

@@ -1,16 +1,12 @@
 
-SWT_APP_NAME = "Redcar"
+require 'swt/full_swt'
 
-require "application_swt/swt_wrapper"
-require "application_swt/swt/listener_helpers"
 require "application_swt/tab"
 
 require "application_swt/clipboard"
-require "application_swt/cucumber_runner"
 require "application_swt/dialog_adapter"
 require "application_swt/dialogs/no_buttons_dialog"
 require "application_swt/dialogs/filter_list_dialog_controller"
-require "application_swt/event_loop"
 require "application_swt/html_tab"
 require "application_swt/menu"
 require "application_swt/menu/binding_translator"
@@ -20,29 +16,26 @@ require "application_swt/notebook/tab_drag_and_drop_listener"
 require "application_swt/speedbar"
 require "application_swt/treebook"
 require "application_swt/window"
-require "application_swt/swt/grid_data"
 
-require "dist/application_swt"
+require "application_swt-#{Redcar::VERSION}"
 
 module Redcar
   class ApplicationSWT
     include Redcar::Controller
-    
+        
     def self.display
       @display ||= Swt.display 
     end
 
     def self.start
-      Swt::Widgets::Display.app_name = Redcar::Application::NAME
-      @gui = Redcar::Gui.new("swt")
-      @gui.register_event_loop(EventLoop.new)
-      @gui.register_features_runner(CucumberRunner.new)
-      @gui.register_controllers(
-          Redcar::Tab              => ApplicationSWT::Tab,
-          Redcar::HtmlTab          => ApplicationSWT::HtmlTab,
-          Redcar::FilterListDialog => ApplicationSWT::FilterListDialogController
-        )
-      @gui.register_dialog_adapter(ApplicationSWT::DialogAdapter.new)
+      if Redcar.gui
+        Redcar.gui.register_controllers(
+            Redcar::Tab              => ApplicationSWT::Tab,
+            Redcar::HtmlTab          => ApplicationSWT::HtmlTab,
+            Redcar::FilterListDialog => ApplicationSWT::FilterListDialogController
+          )
+        Redcar.gui.register_dialog_adapter(ApplicationSWT::DialogAdapter.new)
+      end
     end
     
     def self.add_debug_key_filters
@@ -55,35 +48,12 @@ module Redcar
     end
     
     def self.gui
-      @gui
-    end
-    
-    # Runs the given block in the SWT Event thread
-    def self.sync_exec(&block)
-      runnable = Swt::RRunnable.new do
-        begin
-          block.call
-        rescue => e
-          puts "error in sync exec"
-          puts e.message
-          puts e.backtrace
-        end
-      end
-      unless Redcar::ApplicationSWT.display.is_disposed
-        Redcar::ApplicationSWT.display.syncExec(runnable)
-      end
+      Redcar.gui
     end
     
-    # Runs the given block in the SWT Event thread after
-    # the given number of milliseconds
-    def self.timer_exec(ms, &block)
-      runnable = Swt::RRunnable.new(&block)
-      Redcar::ApplicationSWT.display.timerExec(ms, runnable)
-    end
-
     class ShellListener
       def shell_deactivated(_)
-        ApplicationSWT.timer_exec(100) do
+        Swt.timer_exec(100) do
           unless Swt::Widgets::Display.get_current.get_active_shell
             Redcar.app.lost_application_focus
           end
@@ -156,6 +126,7 @@ module Redcar
 
     def add_listeners
       @model.add_listener(:new_window, &method(:new_window))
+      @model.add_listener(:refresh_menu, &method(:refresh_menu))
     end
     
     class Listener

data/plugins/application_swt/plugin.rb

@@ -4,5 +4,6 @@ Plugin.define do
   version "1.0"
   file    "lib", "application_swt"
   object  "Redcar::ApplicationSWT"
-  dependencies "application", ">0"
+  dependencies "application", ">0",
+               "swt",         ">0"
 end

data/plugins/application_swt/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load
+Redcar.load_unthreaded
 
 Spec::Runner.configure do |config|
   config.before(:suite) do

data/plugins/auto_completer/lib/auto_completer.rb

@@ -5,17 +5,17 @@ require 'auto_completer/word_iterator'
 require 'auto_completer/word_list'
 
 module Redcar
-  class AutoCompleter    
+  class AutoCompleter
     WORD_CHARACTERS = /\w|_/ # /(\s|\t|\.|\r|\(|\)|,|;)/
-    
+
     def self.document_controller_types
       [AutoCompleter::DocumentController]
     end
-    
+
     def self.autocompletion_source_types
       [AutoCompleter::CurrentDocumentCompletionSource]
     end
-    
+
     def self.all_autocompletion_source_types
       result = []
       Redcar.plugin_manager.objects_implementing(:autocompletion_source_types).each do |object|
@@ -23,7 +23,23 @@ module Redcar
       end
       result
     end
-    
+
+    #def self.edit_view_context_menus(offset)
+    #  cmd = AutoCompleter::MenuAutoCompleterCommand.new
+    #  cmd.merge_menu(offset)
+    #  completions = cmd.run
+    #  Menu::Builder.build do
+    #    sub_menu "Auto Completion" do
+    #      if completions
+    #        completions.entries.each {|item| append item }
+    #      else
+    #        item "(No Suggestions)" do
+    #        end
+    #      end
+    #    end
+    #  end
+    #end
+
     def self.menus
       Menu::Builder.build do
         sub_menu "Edit" do
@@ -34,13 +50,13 @@ module Redcar
         end
       end
     end
-    
+
     class AutoCompleteCommand < Redcar::EditTabCommand
-      
+
       def execute
         controller = doc.controllers(AutoCompleter::DocumentController).first
         controller.start_modification
-        
+
         if controller.in_completion?
           doc.delete(doc.cursor_offset - controller.length_of_previous, controller.length_of_previous)
           prefix = controller.prefix
@@ -57,7 +73,7 @@ module Redcar
             controller.right     = right
           end
         end
-        
+
         if prefix
           index = (controller.index || 0) + 1
           if word_list.completions.length == index
@@ -65,23 +81,23 @@ module Redcar
           end
           completion = word_list.completions[index]
           controller.index = index
-          
+
           start_offset = right
           doc.insert(right, completion[prefix.length..-1])
           word_end_offset = right + completion.length - prefix.length
           doc.cursor_offset = word_end_offset
-          
+
           controller.length_of_previous = completion.length - prefix.length
-          
+
           controller.start_completion
         end
         controller.end_modification
       end
-      
+
       private
-      
+
       def alternatives(prefix)
-        sources = AutoCompleter.all_autocompletion_source_types.map do |t| 
+        sources = AutoCompleter.all_autocompletion_source_types.map do |t|
           t.new(doc, Project::Manager.focussed_project)
         end
         word_list = WordList.new
@@ -92,8 +108,8 @@ module Redcar
         end
         word_list
       end
-      
-      # returns the prefix that is being touched by the cursor and a range 
+
+      # returns the prefix that is being touched by the cursor and a range
       # containing offsets of the prefix.
       def touched_prefix
         range = doc.current_word_range
@@ -103,10 +119,15 @@ module Redcar
         return prefix, left, right
       end
     end
-    
+
     class MenuAutoCompleterCommand < AutoCompleteCommand
-      
+
+      def merge_menu(offset)
+        @merge_menu = offset
+      end
+
       def execute
+        #TODO: something with offset?
         controller = doc.controllers(AutoCompleter::DocumentController).first
         input_word = ""
         word_list = controller.word_list
@@ -117,7 +138,7 @@ module Redcar
           controller.prefix    = prefix
           controller.left      = left
           controller.right     = right
-          
+
           cur_doc = doc
           builder = Menu::Builder.new do
             word_list.words.each do |current_word, word_distance|
@@ -128,12 +149,13 @@ module Redcar
               end
             end
           end
-          
-          Application::Dialog.popup_menu(builder.menu, :cursor)
+          if @merge_menu
+            builder.menu
+          else
+            Application::Dialog.popup_menu(builder.menu, :cursor)
+          end
         end
       end
     end
   end
 end
-
-

data/plugins/auto_indenter/features/ruby_style_indentation.feature

@@ -21,4 +21,18 @@ Feature: Indents Ruby code correctly
     When I insert "\tfoo" at the cursor
     And I move the cursor to 4
     And I insert "\n" at the cursor
-    Then the contents should be "\tfoo\n\t"
+    Then the contents should be "\tfoo\n\t"
+    
+  Scenario: It should autoindent correctly
+    When I insert "\tdef my_awesome_method\n\t\tfoo\n\tend" at the cursor
+    And I select from 0 to 33
+    And I auto-indent
+    Then the contents should be "def my_awesome_method\n\tfoo\nend"
+    
+  Scenario: It should autoindent correctly
+    When I insert "\tdef my_awesome_method\n\t\tfoo\n\tend" at the cursor
+    And I select from 0 to 33
+    And I auto-indent
+    Then the contents should be "def my_awesome_method\n\tfoo\nend"
+    When I undo
+    Then the contents should be "\tdef my_awesome_method\n\t\tfoo\n\tend"

data/plugins/auto_indenter/features/step_definitions/indentation_steps.rb

@@ -3,4 +3,6 @@ Given /^the indentation rules are like Ruby's$/ do
   Redcar::AutoIndenter.test_rules = Redcar::AutoIndenter::Rules.new(/def/, /end/)
 end
 
-
+When /^I auto-indent/ do
+  Redcar::AutoIndenter::IndentCommand.new.run
+end