redcar 0.9.2 → 0.10

data/CHANGES

@@ -1,8 +1,38 @@
-Version 0.9.2 (13 December 2010)
-===============================
+Version 0.10 (17 January 2011)
+==============================
+
+Enhancements:
+
+ * Add "Close others" and "Close all" commands to the File menu (Clinton R Nixon)
+ * Syntax checking for Java (Delisa Mason)
+ * Git integration is now available when the current project is a subdirectory of a repository (Delisa Mason)
+ * Ctrl+A/E (home and end) added for Linux (Tomasz Wegrzanowski)
+ * Trim line deletes newline if rest of line is empty (Tomasz Wegrzanowski)
+ * Fuzzy finders (e.g. find file) ignore spaces. (Tomasz Wegrzanowski)
+ * Highlighting the current file in the project tree is now optional and is in the Project menu (Delisa Mason)
+ * Document Search is now incremental (Delisa Mason)
+ * REPL Enhancements, including commit on Return (Delisa Mason)
+ * Mirah syntax checking (Michal Hantl)
+ * Mirah REPL (Delisa Mason)
+ * More keybindings for adjusting views, such as changing font size, notebook width, and focussed tree (Delisa Mason)
+ * New look! (Max Hawkins)
+ * 3+ notebooks allowed at once (Dotan J. Nahum)
+ * Configurable test runner plugin (Chris Nelson)
+ * Added menu mnemonics for Linux and Windows (Delisa Mason)
+ * Much improved search and replace behaviour (Tom Murray)
+
+Bugfixes:
+
+ * TitleCase now works when the selected text has capital letters in it (Delisa Mason)
+ * Go to Declaration is only available when a project is open (Delisa Mason)
+ * Saving a file prompts before overwriting (Delisa Mason)
+ * Encrypt/Decrypt does not happen if a user cancels (Utkarsh Kukreti)
+ * Fix the "Index out of bounds" errors in the pair highlighter (Delisa Mason)
+ * Searching will now scroll the window horizontally (#400) (Delisa Mason)
+
+New APIs:
 
- * Stop using ibiblio mirrors. (Dan Lucraft)
- * Groovy syntax checking is now broken. (Dan Lucraft)
+ * Non-modal text, list, and browser dialogs in Application::Dialog (Delisa Mason)
 
 Version 0.9.1 (2 December 2010)
 ===============================

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.9.2" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.10" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
@@ -228,6 +228,7 @@ task :release => :gem do
   }
   
   s3_uploads.each do |source, target|
+    p [source, target]
     AWS::S3::S3Object.store(target, open(source), 'redcar', :access => :public_read)
   end
 end

data/lib/redcar.rb

@@ -51,10 +51,10 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.9.2' # also change in the Rakefile!
+  VERSION         = '0.10' # also change in the Rakefile!
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 9
-  VERSION_RELEASE = 2
+  VERSION_MINOR   = 10
+  VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]
   

data/lib/redcar/installer.rb

@@ -61,10 +61,9 @@ module Redcar
           "http://redcar.s3.amazonaws.com/clojure-1.2beta1.jar" => "/clojure.jar",
           "http://redcar.s3.amazonaws.com/clojure-contrib-1.2beta1.jar" => "/clojure-contrib.jar",
           "http://redcar.s3.amazonaws.com/org-enclojure-repl-server.jar" => nil,
-          #"http://mirrors.ibiblio.org/pub/mirrors/maven2/org/codehaus/groovy/groovy-all/1.7.4/groovy-all-1.7.4.jar" => "/groovy-all.jar",
-          #"http://mirrors.ibiblio.org/pub/mirrors/maven2/org/tmatesoft/svnkit/svnkit/1.3.4/svnkit-1.3.4.jar" => "/svnkit.jar",
+          "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/codehaus/groovy/groovy-all/1.7.4/groovy-all-1.7.4.jar" => "/groovy-all.jar",
+          "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/tmatesoft/svnkit/svnkit/1.3.4/svnkit-1.3.4.jar" => "/svnkit.jar",
           # "http://mirrors.ibiblio.org/pub/mirrors/maven2/rhino/js/1.7R2/js-1.7R2.jar" => "/js.jar",
-          "http://redcar.s3.amazonaws.com/deps/svnkit-1.3.4.jar" => "/svnkit.jar",
           "http://redcar.s3.amazonaws.com/deps/rhino-js-1.7R2.jar" => "/js.jar"
         },
         :windows => {

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

@@ -16,3 +16,10 @@ Then /^I should see a message box containing "([^"]*)"$/ do |arg1|
   Redcar.gui.dialog_adapter.should_get_message(arg1)
 end
 
+Then /^I should see a popup text box with title "([^"]*)" and containing "([^"]*)"$/ do |title,text|
+  Redcar.gui.dialog_adapter.should_get_popup_message(title,text)
+end
+
+Then /^I should see a popup html box containing "([^"]*)"$/ do |text|
+  Redcar.gui.dialog_adapter.should_get_popup_html(text)
+end

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

@@ -0,0 +1,18 @@
+key_presses = {
+  "ARROW_UP" => "up arrow",
+  "ARROW_DOWN" => "down arrow",
+  "ARROW_LEFT" => "left arrow",
+  "ARROW_RIGHT" => "right arrow",
+  "CR" => "return",
+  "BS" => "backspace",
+  "HOME" => "home",
+  "DEL" => "delete"
+}
+key_presses.each do |const,text|
+  When "I press the #{text} key" do
+    tab = Redcar.app.focussed_window.focussed_notebook_tab
+    widget = tab.edit_view.controller.mate_text.get_control
+    key = Swt::SWT.const_get(const)
+    FakeKeyEvent.new(key,widget)
+  end
+end

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

@@ -8,12 +8,12 @@ Then /^the main menu should contain "([^\"]*)" entries$/ do |entries|
   items = main_menu.get_items.to_a
   items.should_not be_empty
   texts = items.map {|item| item.get_text }
-  entries.all? {|e| texts.include?(e)}.should be_true
+  entries.all? {|e| texts.include?(get_menu_name(e))}.should be_true
 end
 
 Then /^the "([^\"]*)" menu should contain a "([^\"]*)" entry$/ do |menu_text, entry_text|
   items = main_menu.get_items.to_a
-  menu = items.detect {|i| i.text == menu_text}
+  menu = items.detect {|i| i.text == get_menu_name(menu_text)}
   items = menu.get_menu.get_items.to_a
   menu_texts = items.map{|i| i.text.split("\t").first}
   menu_texts.detect {|t| t == entry_text}.should_not be_nil
@@ -21,7 +21,7 @@ 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}
+  menu = items.detect {|i| i.text == get_menu_name(menu_name)}
   items = menu.get_menu.get_items.to_a
   item = items.detect {|i| i.text.split("\t").first == menu_item }
   case active
@@ -34,10 +34,9 @@ end
 
 When /^I (?:open the|click) "([^"]*)" from the "([^"]*)" menu$/ do |menu_item, menu_name|
   menu_items = menu_name.split("/").inject(main_menu.get_items.to_a.dup) do |items, item_name|
-    m = items.detect {|i| i.text == item_name }
+    m = items.detect {|i| i.text == get_menu_name(item_name)}
     items = m.get_menu.get_items.to_a
   end
   item = menu_items.detect {|i| i.text.split("\t").first == menu_item }
   FakeEvent.new(Swt::SWT::Selection, item)
-end
-
+end

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

@@ -3,10 +3,10 @@ Then /^the (.*) speedbar should be open$/ do |class_name|
   Redcar.app.focussed_window.speedbar.class.to_s.should == class_name
 end
 
-def get_speedbar_text_field(field_name)
-  speedbar = Redcar.app.focussed_window.speedbar
-  item = speedbar.__get_item_by_label(field_name) || 
-          speedbar.__get_item_by_label(field_name + ":") || 
+def get_speedbar_text_field(field_name, speedbar=nil)
+  speedbar ||= Redcar.app.focussed_window.speedbar
+  item = speedbar.__get_item_by_label(field_name) ||
+          speedbar.__get_item_by_label(field_name + ":") ||
           speedbar.__get_item(field_name)
   expected_klass = Redcar::Speedbar::TextBoxItem
   unless item.is_a?(expected_klass)
@@ -15,6 +15,15 @@ def get_speedbar_text_field(field_name)
   item
 end
 
+def get_speedbar_field(field_name, expected_klass, speedbar=nil)
+  speedbar ||= Redcar.app.focussed_window.speedbar
+  item = speedbar.__get_item_by_text_or_name(field_name)
+  unless item.is_a?(expected_klass)
+    raise "expected #{item} to be a #{expected_klass}"
+  end
+  item
+end
+
 When /^I type "([^"]*)" into the "([^"]*)" field in the speedbar$/ do |text, field_name|
   get_speedbar_text_field(field_name).edit_view.document.text = text
 end
@@ -38,6 +47,13 @@ When /^I uncheck "([^"]*)" in the speedbar$/ do |checkbox_name|
   speedbar.controller.execute_listener_in_model(item, false)
 end
 
+When /^I choose "([^"]*)" in the "([^"]*)" field in the speedbar$/ do |value, combo_name|
+  speedbar = Redcar.app.focussed_window.speedbar
+  item = get_speedbar_field(combo_name, Redcar::Speedbar::ComboItem)
+  item.set_value(value)
+  speedbar.controller.execute_listener_in_model(item, value)
+end
+
 When /^I close the speedbar$/ do
   Redcar.app.focussed_window.close_speedbar
 end
@@ -46,16 +62,20 @@ Then /^the "([^"]*)" field in the speedbar should have text "([^"]*)"$/ do |fiel
   get_speedbar_text_field(field_name).edit_view.document.to_s.should == text
 end
 
-Then /^"([^"]*)" should be checked in the speedbar$/ do |checkbox_name|
+Then /^"([^"]*)" should( not)? be checked in the speedbar$/ do |checkbox_name, negate|
   speedbar = Redcar.app.focussed_window.speedbar
   item = speedbar.__get_item_by_text_or_name(checkbox_name)
-  item.value.should be_true
+  if negate
+    item.value.should be_false
+  else
+    item.value.should be_true
+  end
 end
 
-Then /^"([^"]*)" should not be checked in the speedbar$/ do |checkbox_name|
+Then /^"([^"]*)" should be chosen in the "([^"]*)" field in the speedbar$/ do |value, combo_name|
   speedbar = Redcar.app.focussed_window.speedbar
-  item = speedbar.__get_item_by_text_or_name(checkbox_name)
-  item.value.should be_false
+  item = get_speedbar_field(combo_name, Redcar::Speedbar::ComboItem, speedbar)
+  item.value.should == value
 end
 
 Then /^there should( not)? be an open speedbar$/ do |negate|

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

@@ -14,6 +14,15 @@ When "I close the tree" do
   Redcar::Top::CloseTreeCommand.new.run
 end
 
+When /^I switch (up|down) a tree$/ do |type|
+  case type
+  when "down"
+    Redcar::Top::SwitchTreeDownCommand.new.run
+  when "up"
+    Redcar::Top::SwitchTreeUpCommand.new.run
+  end
+end
+
 When "I click the close button" do
   vtabitem = focussed_window.treebook.controller.tab_folder.selection
   swtlabel = swt_label_for_item(vtabitem)
@@ -60,6 +69,10 @@ Then /^there should (not )?be a tree titled "([^\"]*)"$/ do |negate,title|
   end
 end
 
+Then /^the focussed tree should be titled "([^\"]*)"$/ do |title|
+  focussed_tree.title.should == title
+end
+
 Then /^the tree width should be (the default|\d+ pixels|the minimum size)$/ do |w|
   width = focussed_treebook_width
   if w == "the default"

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

@@ -3,6 +3,10 @@ require File.expand_path("../fake_event", __FILE__)
 class TestingError < StandardError
 end
 
+def get_menu_name text
+  Redcar::Menu.parse(text)
+end
+
 module SwtHelper
   def main_menu
     display = Redcar::ApplicationSWT.display
@@ -22,7 +26,7 @@ module SwtHelper
   def focussed_window
     Redcar.app.focussed_window
   end
-  
+
   def focussed_treebook_width
     Redcar.app.focussed_window.controller.treebook_width
   end
@@ -30,11 +34,11 @@ module SwtHelper
   def focussed_tree
     focussed_window.treebook.focussed_tree
   end
-  
+
   def default_treebook_width
     Redcar.app.focussed_window.controller.default_treebook_width
   end
-  
+
   def tree_with_title(title)
     focussed_window.treebook.trees.detect {|t| t.tree_mirror.title == title }
   end
@@ -100,6 +104,36 @@ class FakeDialogAdapter
     @message = message
   end
 
+  def should_get_popup_message(title,text)
+    @popup_message = text
+    @popup_title   = title
+  end
+
+  def should_get_popup_html(text)
+    @popup_html = text
+  end
+
+  def popup_html(*args)
+    unless @popup_text
+      raise TestingError.new("got a popup html dialog with text #{@popup_html.inspect} where I didn't expect one")
+    end
+    unless @popup_text == args.first.inspect
+      raise TestingError.new("expected text #{@popup_text.inspect}, got #{args.first.inspect}")
+    end
+  end
+
+  def popup_text(*args)
+    unless @popup_title and @popup_message
+      raise TestingError.new("got a popup dialog titled #{@popup_title.inspect} with text #{@popup_message.inspect} where I didn't expect one")
+    end
+    unless @popup_title == args.first
+      raise TestingError.new("expected title #{@popup_title.inspect}, got #{args.first.inspect}")
+    end
+    unless @popup_message == args[1]
+      raise TestingError.new("expected text #{@popup_message.inspect}, got #{args[1].inspect}")
+    end
+  end
+
   def open_file(*args)
     check_for_raise(@responses[:open_file])
   end
@@ -131,7 +165,7 @@ class FakeDialogAdapter
     end
     val = @inputs[0]
     @inputs.delete_at(0)
-    {:value => val} # no button to speak of...
+    {:value => val, :button => :ok}
   end
 
   def add_input(value)
@@ -160,7 +194,7 @@ end
 
 World(SwtHelper)
 
-def close_everything  
+def close_everything
   Redcar.app.task_queue.cancel_all
   Swt.sync_exec do
     dialogs.each {|d| d.controller.model.close }

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

@@ -12,3 +12,15 @@ class FakeEvent
     widget.notify_listeners(event_type, untyped_event)
   end
 end
+
+class FakeKeyEvent
+  def initialize(key_code, widget)
+    event = Swt::Widgets::Event.new
+    event.display = Swt.display
+    event.widget  = widget
+    event.type    = Swt::SWT::KeyDown
+    event.keyCode = key_code
+
+    widget.notify_listeners(event.type,event)
+  end
+end

data/plugins/application/lib/application.rb

@@ -10,6 +10,7 @@ require 'application/clipboard'
 require 'application/command'
 require 'application/dialog'
 require 'application/dialogs/filter_list_dialog'
+require 'application/dialogs/modeless_list_dialog'
 require 'application/event_spewer'
 require 'application/keymap'
 require 'application/keymap/builder'
@@ -265,6 +266,10 @@ module Redcar
         keymap = Keymap.new("main", Redcar.platform)
         Redcar.plugin_manager.objects_implementing(:keymaps).each do |object|
           maps = object.keymaps
+          unless maps
+            puts "#{object.inspect} implements :keymaps but :keymaps returns nil"
+            maps = []
+          end
           keymaps = maps.select do |map|
             map.name == "main" and map.platforms.include?(Redcar.platform)
           end
@@ -378,9 +383,3 @@ module Redcar
     end
   end
 end
-
-
-
-
-
-

data/plugins/application/lib/application/dialog.rb

@@ -5,7 +5,7 @@ module Redcar
       def self.in_dialog?
         @in_dialog
       end
-      
+
       # Do not call
       def self.in_dialog
         @in_dialog = true
@@ -13,12 +13,12 @@ module Redcar
         @in_dialog = false
         r
       end
-      
+
       # Prompt the user with an open file dialog. Returns a path.
       def self.open_file(options)
         in_dialog { Redcar.gui.dialog_adapter.open_file(options) }
       end
-      
+
       # Prompt the user with an open directory dialog. Returns a path.
       def self.open_directory(options)
         in_dialog { Redcar.gui.dialog_adapter.open_directory(options) }
@@ -28,7 +28,7 @@ module Redcar
       def self.save_file(options)
         in_dialog { Redcar.gui.dialog_adapter.save_file(options) }
       end
-      
+
       # Show a message to the user. Requires a message and
       # options can be:
       #
@@ -39,7 +39,7 @@ module Redcar
       #
       # For example:
       #
-      # >> Application::Dialog.message_box("YO!", :type => :info, 
+      # >> Application::Dialog.message_box("YO!", :type => :info,
       # >>                                        :buttons => :yes_no_cancel)
       # => :yes
       def self.message_box(text, options={})
@@ -51,19 +51,19 @@ module Redcar
         end
         in_dialog { Redcar.gui.dialog_adapter.message_box(text, options) }
       end
-      
+
       # Returns the list of valid button combos that can be passed
       # as an option to message_box.
       def self.available_message_box_button_combos
         in_dialog { Redcar.gui.dialog_adapter.available_message_box_button_combos }
       end
-      
+
       # Returns the list of valid message box types that can be passed
       # as an option to message_box
       def self.available_message_box_types
         in_dialog { Redcar.gui.dialog_adapter.available_message_box_types }
       end
-      
+
       # Show a dialog containing a text entry box to the user, and blocks
       # until they dismiss it.
       #
@@ -94,12 +94,14 @@ module Redcar
       def self.password_input(title, message)
         in_dialog { Redcar.gui.dialog_adapter.password_input(title, message) }
       end
-      
+
       # Shows a tool tip to the user, at the cursor location.
       #
       # Allowed locations:
       #  * :cursor - the location of the text cursor in the focussed text widget
+      #  * :below_cursor - on the line directly below :cursor
       #  * :pointer - the location of the mouse pointer
+      #  * character offset - a position in the text
       #
       # If :cursor is specified with no open tab, it will default to :pointer.
       #
@@ -108,12 +110,14 @@ module Redcar
       def self.tool_tip(message, location)
         Redcar.gui.dialog_adapter.tool_tip(message, location)
       end
-      
+
       # Shows a popup menu to the user.
       #
       # Allowed locations:
       #  * :cursor - the location of the text cursor in the focussed text widget
+      #  * :below_cursor - on the line directly below :cursor
       #  * :pointer - the location of the mouse pointer
+      #  * character offset - a position in the text
       #
       # If :cursor is specified with no open tab, it will default to :pointer.
       #
@@ -122,6 +126,45 @@ module Redcar
       def self.popup_menu(menu, location)
         Redcar.gui.dialog_adapter.popup_menu(menu, location)
       end
+
+      # Shows a non-modal popup text box to the user which closes
+      # on keyboard input or lost focus
+      #
+      # Allowed locations:
+      #  * :cursor - the location of the text cursor in the focussed text widget
+      #  * :below_cursor - on the line directly below :cursor
+      #  * :pointer - the location of the mouse pointer
+      #  * character offset - a position in the text
+      #
+      # If :cursor is specified with no open tab, it will default to :pointer.
+      #
+      # @param [String] title
+      # @param [String] message
+      # @param [Symbol] location
+      # @param [Array<Integer>] dimensions - The width and height of the text box
+      # the width is measured in pixels and the height in rows
+      def self.popup_text(title, message, location,dimensions=nil)
+        Redcar.gui.dialog_adapter.popup_text(title,message,location,dimensions)
+      end
+
+      # Shows a non-modal popup html text box to the user which closes
+      # on keyboard input
+      #
+      # Allowed locations:
+      #  * :cursor - the location of the text cursor in the focussed text widget
+      #  * :below_cursor - on the line directly below :cursor
+      #  * :pointer - the location of the mouse pointer
+      #  * character offset - a position in the text
+      #
+      # If :cursor is specified with no open tab, it will default to :pointer.
+      #
+      # @param [String] text
+      # @param [Symbol] location
+      # @param [Array<Integer>] dimensions - The width and height of the text box
+      # in pixels
+      def self.popup_html(text, location, dimensions=nil)
+        Redcar.gui.dialog_adapter.popup_html(text,location,dimensions)
+      end
     end
   end
 end