redcar 0.3.0dev → 0.3.1dev

data/lib/redcar/boot.rb

@@ -15,6 +15,7 @@ require 'redcar/ruby_extensions'
 require 'redcar/usage'
 
 require 'forwardable'
+require 'yaml'
 
 # ## Loading and Initialization
 #
@@ -57,10 +58,6 @@ require 'forwardable'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.0dev'
-  VERSION_MAJOR   = 0
-  VERSION_MINOR   = 3
-  VERSION_RELEASE = 0
   
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
 
@@ -86,7 +83,7 @@ module Redcar
     @freebase_core.load_plugins
   end
   
-  def self.require
+  def self.require_files
     @freebase_core = FreeBASE::Core.new(*freebase_core_args)
     @freebase_core.require_files
   end

data/lib/redcar/{install.rb → installer.rb}

@@ -1,26 +1,24 @@
 
-require 'rbconfig'
 require 'open-uri'
 require 'fileutils'
 
 module Redcar
-  # Methods used in gem installation hooks
-  #
-  # Cribbed from the zerg and zerg_support gems by Victor Costan (big woop!)
-  class Install
-    
-    # tricks rubygems into believeing that the extension compiled and worked out
-    def emulate_extension_install(extension_name)
-      File.open('Makefile', 'w') { |f| f.write "all:\n\ninstall:\n\n" }
-      File.open('make', 'w') do |f|
-        f.write '#!/bin/sh'
-        f.chmod f.stat.mode | 0111
-      end
-      File.open(extension_name + '.so', 'w') {}
-      File.open(extension_name + '.dll', 'w') {}
-      File.open('nmake.bat', 'w') { |f| }
-    end
-    
+  class Installer
+  
+  	def install
+  	  unless File.writable?(JRUBY_JAR_DIR)
+  	    puts "Don't have permission to write to #{JRUBY_JAR_DIR}. Please rerun with sudo."
+  	    exit 1
+  	  end
+  	  puts "Downloading >10MB of jar files. This may take a while."
+  	  grab_jruby
+  	  grab_common_jars
+  	  grab_platform_dependencies
+  	  grab_redcar_jars
+  	  puts
+  	  puts "Done! You're ready to run Redcar."
+  	end
+  
     def plugins_dir
       File.expand_path(File.join(File.dirname(__FILE__), %w(.. .. plugins)))
     end
@@ -38,21 +36,23 @@ module Redcar
       /jface/org.eclipse.text_3.5.0.v20090513-2000.jar
     )
     
+    JRUBY_JAR_DIR = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+    
     JRUBY = %w(
-      /jruby/jruby-complete-1.4.0.jar
+      http://jruby.kenai.com/downloads/1.4.0/jruby-complete-1.4.0.jar
       /jruby/jcodings.jar
       /jruby/jdom.jar
       /jruby/joni.jar
     )
 
     REDCAR_JARS = {
-      "/java-mateview.jar" => "plugins/edit_view_swt/vendor/java-mateview.jar"
+      "/java-mateview-#{Redcar::VERSION}.jar" => "plugins/edit_view_swt/vendor/java-mateview.jar"
     }
 
     def grab_jruby
       puts "* Downloading JRuby"
       JRUBY.each do |jar_url|
-        download(jar_url, File.expand_path(File.join(File.dirname(__FILE__), "..", File.basename(jar_url))))
+        download(jar_url, File.join(JRUBY_JAR_DIR, File.basename(jar_url)))
       end
     end
     
@@ -86,7 +86,9 @@ module Redcar
     end
     
     def download(uri, path)
-      uri = ASSET_HOST + uri
+      if uri =~ /^\//
+        uri = ASSET_HOST + uri
+      end
       FileUtils.mkdir_p(File.dirname(path))
       write_out = open(path, "wb")
       write_out.write(open(uri).read)

data/lib/redcar/ruby_extensions.rb

@@ -7,6 +7,10 @@ class Object
   def meta_class
     class << self; self; end
   end
+  
+  def __calling_method__
+    caller[1][/`(.*)'$/, 1].to_sym
+  end
 end
 
 def ARGV.option(name)

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

@@ -19,3 +19,15 @@ Then /^the "([^\"]*)" menu should contain a "([^\"]*)" entry$/ do |menu_text, en
   menu_texts.detect {|t| t == entry_text}.should_not be_nil
 end
 
+Then /^the menu item "([^\"]*)\|([^\"]*)" should be (active|inactive)$/ do |menu_name, menu_item, active|
+  items = main_menu.get_items.to_a
+  menu = items.detect {|i| i.text == menu_name}
+  items = menu.get_menu.get_items.to_a
+  item = items.detect {|i| i.text.split("\t").first == menu_item }
+  case active
+  when "active"
+    item.enabled.should be_true
+  when "inactive"
+    item.enabled.should be_false
+  end
+end

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

@@ -1,6 +1,18 @@
-Then /^I should see "([^\"]*)" in the tree$/ do |rows|
+
+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
+  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|
-    top_tree.items.include?(row).should be_true
+    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
   end
 end

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

@@ -26,6 +26,10 @@ module SwtHelper
   
   module TreeHelpers
     def items
+      getItems.to_a
+    end
+    
+    def item_texts
       getItems.to_a.map {|item| item.getText}
     end
   end

data/plugins/application/lib/application.rb

@@ -5,6 +5,7 @@ require 'application/sensitive'
 require 'application/sensitivity'
 require 'application/command'
 require 'application/dialog'
+require 'application/dialogs/filter_list_dialog'
 require 'application/menu'
 require 'application/menu/item'
 require 'application/menu/builder'
@@ -41,8 +42,26 @@ module Redcar
     def self.start
       Redcar.app     = Application.new
       Redcar.history = Command::History.new
-      Sensitivity.new(:open_tab, Redcar.app, false, [:tab_focussed]) do |tab|
-        tab
+      Sensitivity.new(:open_tab, Redcar.app, false, [:focussed_window, :tab_focussed]) do |tab|
+        if win = Redcar.app.focussed_window
+          win.focussed_notebook.focussed_tab
+        end
+      end
+      Sensitivity.new(:single_notebook, Redcar.app, true, [:focussed_window, :notebook_change]) do
+        if win = Redcar.app.focussed_window
+          win.notebooks.length == 1
+        end
+      end
+      Sensitivity.new(:multiple_notebooks, Redcar.app, false, [:focussed_window, :notebook_change]) do
+        if win = Redcar.app.focussed_window
+          win.notebooks.length > 1
+        end
+      end
+      Sensitivity.new(:other_notebook_has_tab, Redcar.app, false, 
+                      [:focussed_window, :focussed_notebook, :notebook_change, :tab_closed]) do
+        if win = Redcar.app.focussed_window and notebook = win.nonfocussed_notebook
+          notebook.tabs.any?
+        end
       end
     end
     
@@ -102,7 +121,9 @@ module Redcar
     
     attr_reader :menu
     
-    # The main menu.
+    # Set the main menu. Causes a redraw of the GUI menu.
+    #
+    # @param [Menu]
     def menu=(menu)
       @menu = menu
       windows.each do |window|
@@ -110,6 +131,12 @@ module Redcar
       end
     end
     
+    # Redraw the main menu. Useful if you have modified the main menu
+    # instead of setting it afresh.
+    def refresh_menu!
+      self.menu = @menu
+    end
+    
     def attach_window_listeners(window)
       h1 = window.add_listener(:tab_focussed) do |tab|
         notify_listeners(:tab_focussed, tab)
@@ -120,7 +147,24 @@ module Redcar
       h3 = window.add_listener(:focussed) do |win|
         self.focussed_window = win
       end
-      @window_handlers[window] << h1 << h2 << h3
+      h4 = window.add_listener(:new_notebook) do |win|
+        notify_listeners(:notebook_change)
+      end
+      h5 = window.add_listener(:notebook_removed) do |win|
+        notify_listeners(:notebook_change)
+      end
+      h6 = window.add_listener(:notebook_focussed) do |win|
+        notify_listeners(:focussed_notebook)
+      end
+      h7 = window.add_listener(:tab_closed) do |win|
+        notify_listeners(:tab_closed)
+      end
+      h8 = window.add_listener(:focussed_tab_changed) do |tab|
+        if window == focussed_window
+          notify_listeners(:focussed_tab_changed, tab)
+        end
+      end
+      @window_handlers[window] << h1 << h2 << h3 << h4 << h5 << h6 << h7 << h8
     end
   end
 end

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

@@ -66,5 +66,9 @@ module Redcar
     def win
       env[:win]
     end
+    
+    def tab
+      env[:tab]
+    end
   end
 end

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

@@ -5,7 +5,10 @@ module Redcar
       include Redcar::Core::HasLogger
       
       def self.current_environment
-        { :win => Redcar.app.focussed_window }
+        win = Redcar.app.focussed_window
+        tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
+        { :win => win,
+          :tab => tab }
       end
       
       def initialize(command_instance, options={})

data/plugins/application/lib/application/dialogs/filter_list_dialog.rb

@@ -0,0 +1,45 @@
+module Redcar
+  # A type of dialog containing a textbox and a list, where the list can be updated
+  # based on the contents of the textbox. For example, the Find File dialog box in
+  # the Project plugin.
+  #
+  # Subclasses should implement the 'update_list' method and the 'selected' method.
+  class FilterListDialog
+    include Redcar::Model
+    include Redcar::Observable
+    
+    def initialize
+      self.controller = Redcar.gui.controller_for(self).new(self)
+    end
+    
+    def open
+      notify_listeners(:open)
+    end
+    
+    def close
+      notify_listeners(:close)
+    end
+    
+    # Called by the controller when the user changes the filter.
+    #
+    # @param [String] the filter entered by the user
+    # @return [Array<String>] the new list to display
+    def update_list(filter)
+      if filter == ""
+        %w(foo bar baz qux quux corge)
+      else
+        a = []
+        5.times {|i| a << filter + " " + i.to_s }
+        a
+      end
+    end
+    
+    # Called by the controller when the user selects a row in the list.
+    #
+    # @param [String] the list row text selected by the user
+    # @param [Integer] the index of the row in the list selected by the user
+    def selected(text, ix)
+      puts "Hooray! You selected #{text} at index #{ix}"
+    end
+  end
+end

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

@@ -1,11 +1,13 @@
 
 module Redcar
   class Menu
+    include Enumerable
+    
     attr_reader :text, :entries
   
     # A Menu will initially have nothing in it.
-    def initialize(text="")
-      @text, @entries = text, []
+    def initialize(text=nil)
+      @text, @entries = text || "", []
     end
   
     # Iterate over each entry
@@ -23,5 +25,18 @@ module Redcar
     def length
       @entries.length
     end
+    
+    # Fetch the sub_menu with the given name
+    #
+    # @param [String]
+    # @return [Menu]
+    def sub_menu(text)
+      detect {|e| e.text == text and e.is_a?(Menu) }
+    end
+    
+    # Append items and sub_menus using the same syntax as Menu::Builder
+    def build(&block)
+      Menu::Builder.new(self, &block)
+    end
   end
 end

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

@@ -2,29 +2,32 @@ module Redcar
   class Menu
     # A DSL for building menus simply. An example of usage
     #
-    #     builder = Menu::Builder.new do
-    #       sub_menu "File" do
-    #         item "New", NewCommand
-    #       end
-    #       sub_menu "Help" do
-    #         item "Website", WebsiteCommand
+    #     builder = Menu::Builder.new "Edit" do
+    #       item "Select All", SelectAllCommand
+    #       sub_menu "Indent" do
+    #         item "Increase", IncreaseIndentCommand
+    #         item "Decrease", DecreaseIndentCommand
     #       end
     #     end
     #
     # This is equivalent to:
     # 
-    #     menu = Redcar::Menu.new
-    #     file_menu = Redcar::Menu.new("File") 
-    #     help_menu = Redcar::Menu.new("Help")
-    #     menu << file_menu
-    #     menu << help_menu
-    #     file_menu << Redcar::Menu::Item.new("New", NewCommand)
-    #     help_menu << Redcar::Menu::Item.new("Website", WebsiteCommand)
+    #     menu = Redcar::Menu.new("Edit")
+    #     menu << Redcar::Menu::Item.new("Select All", SelectAllCommand)
+    #     indent_menu = Redcar::Menu.new("Indent") 
+    #     indent_menu << Redcar::Menu::Item.new("Increase", IncreaseIndentCommand)
+    #     indent_menu << Redcar::Menu::Item.new("Decrease", DecreaseIndentCommand)
+    #     menu << indent_menu
     class Builder
       attr_reader :menu
       
-      def initialize(&block)
-        @menu = Redcar::Menu.new
+      def initialize(menu_or_text=nil, &block)
+        case menu_or_text
+        when String, nil
+          @menu = Redcar::Menu.new(menu_or_text||"")
+        when Menu
+          @menu = menu_or_text
+        end
         @current_menu = @menu
         instance_eval(&block)
       end

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

@@ -62,6 +62,24 @@ module Redcar
       notify_listeners(:tab_focussed, tab)
     end
     
+    # Focus the next tab to the right from the currently focussed tab.
+    # Does not wrap.
+    def switch_up
+      current_ix = @tabs.index(@focussed_tab)
+      unless current_ix == @tabs.length - 1
+        @tabs[current_ix+1].focus
+      end
+    end
+    
+    # Focus the next tab to the left from the currently focussed tab.
+    # Does not wrap.
+    def switch_down
+      current_ix = @tabs.index(@focussed_tab)
+      unless current_ix == 0
+        @tabs[current_ix-1].focus
+      end
+    end
+    
     def inspect
       "#<Redcar::Notebook #{object_id}>"
     end
@@ -69,9 +87,18 @@ module Redcar
     private
     
     def attach_tab_listeners(tab)
-      @tab_handlers[tab] << tab.add_listener(:focussed) do
+      @tab_handlers[tab] << tab.add_listener(:focus) do
         select_tab!(tab)
       end
+      @tab_handlers[tab] << tab.add_listener(:close) do
+        remove_tab!(tab)
+        notify_listeners(:tab_closed)
+      end
+      @tab_handlers[tab] << tab.add_listener(:changed) do
+        if tab == focussed_tab
+          notify_listeners(:focussed_tab_changed, tab)
+        end
+      end
     end
   end
 end