redcar 0.5 → 0.5.1dev

data/lib/redcar/runner.rb

@@ -1,55 +1,11 @@
 module Redcar
   # Cribbed from ruby-processing. Many thanks!
   class Runner
-    def run
-      forking = ARGV.include?("--fork")
-      no_runner = ARGV.include?("--no-sub-jruby")
-      jruby = Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
-      osx = (not [:linux, :windows].include?(Redcar.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 Redcar.null_device
-            STDOUT.reopen Redcar.null_device, 'a'
-            STDERR.reopen STDOUT
-          end
-        elsif forking and SPOON_AVAILABLE and ::Spoon.supported?
-          # so we need to try something different...
-          
-          forking = false
-          construct_command do |command|
-            command.push('--silent')
-            ::Spoon.spawnp(*command)
-          end
-          exit 0
-        elsif forking
-          raise NotImplementedError, "Something weird has happened. Please contact us."
-        end
-      rescue NotImplementedError
-        puts $!.class.name + ": " + $!.message
-        puts "Forking isn't supported on this system. Sorry."
-        puts "Starting normally..."
-      end
-      
-      return if no_runner
-      return if jruby and not osx
-      
-      construct_command do |command|
-        exec(command.join(" "))
-      end
-    end
-    
     # Trade in this Ruby instance for a JRuby instance, loading in a 
     # starter script and passing it some arguments.
     # If --jruby is passed, use the installed version of jruby, instead of 
     # our vendored jarred one (useful for gems).
-    def construct_command(args="")
+    def spin_up
       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"))
       unless File.exist?(jruby_complete)
@@ -57,13 +13,7 @@ module Redcar
         exit 1
       end
       ENV['RUBYOPT'] = nil # disable other native args
-
-      # Windows XP updates
-      if [:windows].include?(Redcar.platform)
-	bin = "\"#{bin}\""
-	jruby_complete = "\"#{jruby_complete}\""
-      end      
-
+      
       # unfortuanately, ruby doesn't support [a, *b, c]
       command = ["java"]
       command.push(*java_args)
@@ -72,7 +22,6 @@ module Redcar
       command.push(bin)
       command.push(*cleaned_args)
       command.push("--no-sub-jruby", "--ignore-stdin")
-      command.push(*args)
       
       puts command.join(' ')
       yield command
@@ -80,15 +29,13 @@ module Redcar
     
     def cleaned_args
       # We should never pass --fork to a subprocess
-      result = ARGV.find_all {|arg| arg != '--fork'}.map do |arg|
+      ARGV.find_all {|arg| arg != '--fork'}.map do |arg|
         if arg =~ /--(.+)=(.+)/
           "--" + $1 + "=\"" + $2 + "\""
         else
           arg
         end
       end
-      result.delete("install")
-      result
     end
     
     def debug_mode?
@@ -104,13 +51,10 @@ module Redcar
       if ARGV.include?("--load-timings")
         str.push "-Djruby.debug.loadService.timing=true"
       end
-
-      require 'redcar/jvm_options_probe'
       
-      jvm_options_probe = JvmOptionsProbe.new
-      
-      str.push "-d32" if jvm_options_probe.can_use_d32?
-      str.push "-client" if jvm_options_probe.can_use_client?
+      if ARGV.include?("--quick")
+        str.push "-d32 -client"
+      end
       
       str
     end

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

@@ -125,34 +125,34 @@ World(SwtHelper)
 
 def close_everything
   Redcar.app.task_queue.cancel_all
-  Swt.sync_exec do
+  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
-      Swt.sync_exec do
+      Redcar::ApplicationSWT.sync_exec do
         win.treebook.remove_tree(tree)
       end
     end
     win.notebooks.each do |notebook|
       while tab = notebook.tabs.first
-        Swt.sync_exec do
+        Redcar::ApplicationSWT.sync_exec do
           tab.close
         end
       end
     end
     if win.notebooks.length == 2
-      Swt.sync_exec do
+      Redcar::ApplicationSWT.sync_exec do
         win.close_notebook
       end
     end
   end
   while Redcar.app.windows.length > 1
-    Swt.sync_exec do
+    Redcar::ApplicationSWT.sync_exec do
       Redcar.app.windows.last.close
     end
   end
-  Swt.sync_exec do
+  Redcar::ApplicationSWT.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,6 +1,4 @@
 
-require 'yaml'
-
 require 'application/command/executor'
 require 'application/command/history'
 require 'application/sensitive'
@@ -184,7 +182,7 @@ module Redcar
       @main_menu = nil
       @main_keymap = nil
       windows.each {|window| window.refresh_menu }
-      notify_listeners(:refresh_menu)
+      controller.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_unthreaded
+Redcar.load
 Dir[File.dirname(__FILE__) + "/application/controllers/*.rb"].each do |fn|
   require fn
 end

data/plugins/application_swt/lib/application_swt.rb

@@ -1,12 +1,16 @@
 
-require 'swt/full_swt'
+SWT_APP_NAME = "Redcar"
 
+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"
@@ -16,26 +20,29 @@ 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 "application_swt-#{Redcar::VERSION}"
 
 module Redcar
   class ApplicationSWT
     include Redcar::Controller
-        
+    
     def self.display
       @display ||= Swt.display 
     end
 
     def self.start
-      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
+      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)
     end
     
     def self.add_debug_key_filters
@@ -48,12 +55,35 @@ module Redcar
     end
     
     def self.gui
-      Redcar.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
     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(_)
-        Swt.timer_exec(100) do
+        ApplicationSWT.timer_exec(100) do
           unless Swt::Widgets::Display.get_current.get_active_shell
             Redcar.app.lost_application_focus
           end
@@ -126,7 +156,6 @@ 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/lib/application_swt/cucumber_runner.rb

@@ -0,0 +1,25 @@
+module Redcar
+  class ApplicationSWT
+    class CucumberRunner
+      START_DELAY = 1
+    
+      def run_features(args)
+        require "cucumber/cli/main"
+        require "cucumber"
+        require "cucumber/rb_support/rb_language"
+        require "application_swt/cucumber_patches"
+        Thread.new do
+          begin
+            sleep START_DELAY
+            main = Cucumber::Cli::Main.new(args)
+            main.execute!(Cucumber::StepMother.new)
+            Redcar.app.quit
+          rescue Object => e
+            puts e.message
+            puts e.backtrace
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+
+module Redcar
+  class ApplicationSWT
+    class EventLoop
+      def initialize
+        @running = false
+      end
+      
+      # Begins the SWT event loop. Blocks.
+      def start
+        @running = true
+        @display = ApplicationSWT.display
+        while @running and not @display.disposed?
+          unless read = @display.read_and_dispatch
+            @display.sleep
+          end
+        end
+        @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.
+      def stop
+        @running = false
+      end
+    end
+  end
+end

data/plugins/{swt/lib/swt/full_swt.rb → application_swt/lib/application_swt/swt_wrapper.rb}

@@ -1,20 +1,45 @@
+require 'rbconfig'
 
 module Swt
-  import org.eclipse.swt.SWT
+  def self.jar_path
+    case Config::CONFIG["host_os"]
+    when /darwin/i
+      if Config::CONFIG["host_cpu"] == "x86_64"
+        'osx64'
+      else
+        'osx'
+      end
+    when /linux/i
+      if %w(amd64 x84_64).include? Config::CONFIG["host_cpu"]
+        'linux64'
+      else
+        'linux'
+      end
+    when /windows|mswin/i
+      'win32'
+    end
+  end
 
+  require File.join(Redcar.asset_dir, "swt/" + Swt.jar_path)
+    
+  import org.eclipse.swt.SWT
+  
   module Widgets
     import org.eclipse.swt.widgets.Button
     import org.eclipse.swt.widgets.Caret
     import org.eclipse.swt.widgets.Combo
     import org.eclipse.swt.widgets.Composite
+    import org.eclipse.swt.widgets.Display
     import org.eclipse.swt.widgets.Event
     import org.eclipse.swt.widgets.DirectoryDialog
     import org.eclipse.swt.widgets.FileDialog
+    import org.eclipse.swt.widgets.Label
     import org.eclipse.swt.widgets.List
     import org.eclipse.swt.widgets.Menu
     import org.eclipse.swt.widgets.MenuItem
     import org.eclipse.swt.widgets.MessageBox
     import org.eclipse.swt.widgets.Sash
+    import org.eclipse.swt.widgets.Shell
     import org.eclipse.swt.widgets.TabFolder
     import org.eclipse.swt.widgets.TabItem
     import org.eclipse.swt.widgets.Text
@@ -23,6 +48,15 @@ module Swt
     import org.eclipse.swt.widgets.TableItem
   end
   
+  def self.display
+    if defined?(SWT_APP_NAME)
+      Swt::Widgets::Display.app_name = SWT_APP_NAME
+    end
+    @display ||= (Swt::Widgets::Display.getCurrent || Swt::Widgets::Display.new)
+  end
+
+  display # must be created before we import the Clipboard class.
+
   module Custom
     import org.eclipse.swt.custom.CTabFolder
     import org.eclipse.swt.custom.CTabItem
@@ -35,10 +69,7 @@ module Swt
   
   module DND
     import org.eclipse.swt.dnd.DND
-    
-    # Only load Clipboard in full running mode.
-    import org.eclipse.swt.dnd.Clipboard unless Redcar.no_gui_mode?
-
+    import org.eclipse.swt.dnd.Clipboard
     import org.eclipse.swt.dnd.Transfer
     import org.eclipse.swt.dnd.TextTransfer
     import org.eclipse.swt.dnd.FileTransfer
@@ -55,6 +86,9 @@ module Swt
   
   module Layout
     import org.eclipse.swt.layout.FillLayout
+    import org.eclipse.swt.layout.FormAttachment
+    import org.eclipse.swt.layout.FormLayout
+    import org.eclipse.swt.layout.FormData
     import org.eclipse.swt.layout.GridLayout
     import org.eclipse.swt.layout.GridData
     import org.eclipse.swt.layout.RowLayout
@@ -66,6 +100,7 @@ module Swt
     import org.eclipse.swt.graphics.Device
     import org.eclipse.swt.graphics.Font
     import org.eclipse.swt.graphics.GC
+    import org.eclipse.swt.graphics.Image
     import org.eclipse.swt.graphics.Point
   end
   
@@ -116,5 +151,3 @@ module JFace
     import org.eclipse.jface.dialogs.InputDialog
   end
 end
-
-require 'swt/grid_data'

data/plugins/application_swt/plugin.rb

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