redcar 0.6.1 → 0.7

data/CHANGES

@@ -1,3 +1,29 @@
+Version 0.7 (4 October 2010)
+============================
+
+Enhancements:
+
+ * Vertical tabs for the tree book on the left. (Tim Felgentreff)
+ * Runnables are grouped by type in the tree (Delisa Mason)
+ * Improved styling of the keyboard shortcuts help and todo list (Delisa Mason)
+ * Tidier Edit menu! (Delisa Mason)
+ * Record and run macros (Dan Lucraft)
+ * Name and save macros (Dan Lucraft)
+ * Macro manager to save, rename and delete macros (Dan Lucraft)
+ * Predictive macros that know what you want to do! (Dan Lucraft)
+ * Experimental Subversion integration (Delisa Mason)
+
+New internal APIs:
+
+ * DocumentHistory stream of changes to text (Dan Lucraft)
+ * Menus can have lazy text that is generated when you look at them (Dan Lucraft)
+ * Tab icons can change. (Dan Lucraft)
+
+Bugfixes
+
+ * Open in file browser and command line now works on Windows (Jeremy Wentworth, Delisa Mason)
+
+
 Version 0.6 (21 September 2010)
 ===============================
 

data/README.md

@@ -1,7 +1,6 @@
 {Redcar}
 ========
 
-by Daniel Lucraft  
 http://RedcarEditor.com/
 
 ## DESCRIPTION
@@ -15,64 +14,51 @@ You must have Java installed. You will also need to run these commands for each
     $ sudo gem install redcar
     $ redcar install
     
-NB the install will take a minute or so to complete as it has to download 
-about 15MB of jar files.
+NB the install will take a minute or so to complete as it has to download about 15MB of jar files.
 
 ## USAGE
 
 Run 
 
-    $ redcar --help
-    
-for a list of options.
+    $ redcar
+
+## PROBLEMS?
+
+* Irc at #redcar on irc.freenode.net
+* Mailing list at http://groups.google.com/group/redcar-editor
 
 ## INSTALLING FROM SOURCE
 
 If you want to contribute to Redcar, you can install it from the source code.
 
-If you're running Windows, as a prerequisite, you'll need to install the 
-rubyzip gem:
+If you're running Windows, as a prerequisite, you'll need to install the rubyzip gem:
 
     $ gem install rubyzip
 
-You will need Ant installed. You will also need RSpec, Cucumber and JSON-JRuby 
-installed as JRuby gems.
-
-    $ jruby -S gem install rspec cucumber json-jruby
-
-Download from github, checkout the submodules and build JavaMateView. 
+Download from github, checkout the submodules and install the jars.
 
     $ git clone git://github.com/redcar/redcar.git
     $ cd redcar
     $ git submodule init
     $ git submodule update
-    $ jruby bin/redcar install
-    $ jruby -S rake build
+    $ ruby bin/redcar install
 
-To run on Linux and Windows:
+To run:
 
-    $ jruby bin/redcar
-
-To run on OSX:
-
-    $ jruby -J-XstartOnFirstThread bin/redcar        
-
-You may also need to install the rake, rspec and cucumber gems.
+    $ ruby bin/redcar
 
 ## UPDATING A SOURCE BUILD
 
-If you are running a source version of Redcar and you have pulled changes from 
-master, then you may have to update your jars by updating and rebuilding:
+If you are running a source version of Redcar and you have pulled changes from master, then you may have to update your repo:
 
     $ git submodule update
-    $ jruby -S rake build
+    $ ruby bin/redcar install
 
-## PROBLEMS?
+## TESTS
 
-* Irc at #redcar on irc.freenode.net
-* Mailing list at http://groups.google.com/group/redcar-editor
+NB. Redcar features won't run with Cucumber 0.9.0 yet. They are known to work with 0.8.5.
 
-## TESTS
+To run the tests you need JRuby installed. You also need rspec and cucumber installed as Jruby gems. See jruby.org for this, or install with rvm.
 
 To run all specs and features:
 

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.6.1" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.7" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'

data/bin/redcar

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$KCODE='U'
+$KCODE='U' unless RUBY_VERSION > "1.9.0"
 $redcar_process_start_time = Time.now
 $VERBOSE = true if ARGV.find{|arg| arg == '--verbose'}
 

data/lib/redcar.rb

@@ -51,10 +51,10 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.6.1' # also change in the Rakefile!
+  VERSION         = '0.7' # also change in the Rakefile!
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 6
-  VERSION_RELEASE = 1
+  VERSION_MINOR   = 7
+  VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]
   
@@ -155,7 +155,11 @@ module Redcar
   end
   
   def self.no_gui_mode?
-    ARGV.include?("--no-gui")
+    @no_gui_mode || ARGV.include?("--no-gui")
+  end
+  
+  def self.no_gui_mode!
+    @no_gui_mode = true
   end
   
   def self.show_splash

data/lib/redcar/installer.rb

@@ -60,7 +60,8 @@ 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/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"
         },
         :windows => {
           "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/#{xulrunner_version}/runtimes/xulrunner-#{xulrunner_version}.en-US.win32.zip" => "xulrunner-#{xulrunner_version}.en-US.win32.zip",

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

@@ -4,6 +4,10 @@ Given /^I will choose "([^\"]*)" from the "([^\"]*)" dialog$/ do |path, type|
   Redcar.gui.dialog_adapter.set(type.to_sym, path)
 end
 
+Given /^I would type "([^"]*)" in an input box$/ do |params|
+  Redcar.gui.dialog_adapter.add_input(params)
+end
+
 Then /^I should not see a "([^\"]*)" dialog for the rest of the feature/ do |type|
   Redcar.gui.dialog_adapter.set(type.to_sym, :raise_error)
 end
@@ -11,3 +15,4 @@ end
 Then /^I should see a message box containing "([^"]*)"$/ do |arg1|
   Redcar.gui.dialog_adapter.should_get_message(arg1)
 end
+

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

@@ -18,7 +18,7 @@ Then /^I should (not )?see "([^\"]*)" in the tree$/ do |negate, rows|
 end
 
 Then /^the tree width should be the default$/ do
-  width = Redcar.app.focussed_window.treebook.trees.last.controller.viewer.control.bounds.width
+  width = Redcar.app.focussed_window.treebook.controller.tab_folder.bounds.width
   default = Redcar::ApplicationSWT::Window::TREEBOOK_WIDTH + Redcar::ApplicationSWT::Window::SASH_WIDTH - 5
   raise "The tree width was #{width}, expected #{default}" unless width == default
 end

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

@@ -8,11 +8,11 @@ module SwtHelper
     menu_bar = shell.get_menu_bar
     menu_bar
   end
-  
+
   def first_shell
     Redcar::ApplicationSWT.display.get_shells.to_a.first
   end
-  
+
   def active_shell
     focussed_window.controller.shell
   end
@@ -24,13 +24,13 @@ module SwtHelper
   def focussed_tree
     focussed_window.treebook.focussed_tree
   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.display.get_shells.to_a.map do |s|
       Redcar::ApplicationSWT.shell_dialogs[s]
     end.compact
   end
@@ -48,7 +48,7 @@ module SwtHelper
     tree.extend(TreeHelpers)
     tree
   end
-  
+
   def find_node_with_text(top, node_text)
     node = top.detect { |node| node.text == node_text }
     return node if node
@@ -60,38 +60,39 @@ module SwtHelper
     def items
       getItems.to_a
     end
-    
+
     def item_texts
       getItems.to_a.map {|item| item.getText}
     end
   end
 end
-    
+
 class FakeDialogAdapter
   def initialize
     @responses = {}
+    @inputs = []
   end
-  
+
   def set(method, value)
     @responses[method] = value
   end
-  
+
   def should_get_message(message)
     @message = message
   end
-  
+
   def open_file(*args)
     check_for_raise(@responses[:open_file])
   end
-  
+
   def open_directory(*args)
     check_for_raise(@responses[:open_directory])
   end
-  
+
   def save_file(*args)
     check_for_raise(@responses[:save_file])
   end
-  
+
   def message_box(*args)
     if @message == :any
     elsif @message
@@ -104,18 +105,35 @@ class FakeDialogAdapter
     end
     @responses[:message_box].to_sym if @responses[:message_box]
   end
-  
+
+  def input(*args)
+    if @inputs.length < 1
+      raise TestingError.new("No input added to complete this command.")
+    end
+    val = @inputs[0]
+    @inputs.delete_at(0)
+    {:value => val} # no button to speak of...
+  end
+
+  def add_input(value)
+    @inputs << value
+  end
+
+  def clear_input
+    @inputs = []
+  end
+
   def check_for_raise(result)
     if result == :raise_error
       raise TestingError.new("did not expect dialog")
     end
     result
   end
-  
+
   def available_message_box_button_combos
     Redcar::ApplicationSWT::DialogAdapter.new.available_message_box_button_combos
   end
-  
+
   def available_message_box_types
     Redcar::ApplicationSWT::DialogAdapter.new.available_message_box_types
   end
@@ -171,6 +189,9 @@ After do
     raise "Command errors #{errors.inspect}"
   end
   Redcar.app.history.clear
+  total_mem = java.lang.Runtime.getRuntime.totalMemory
+  free_mem  = java.lang.Runtime.getRuntime.freeMemory
+  p [:total, total_mem, :free, free_mem, :diff, total_mem - free_mem]
 end
 
 at_exit {

data/plugins/application/lib/application.rb

@@ -287,6 +287,10 @@ module Redcar
       r
     end
     
+    def repeat_event(type)
+      notify_listeners(type)
+    end
+    
     private
     
     def attach_window_listeners(window)

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

@@ -71,12 +71,18 @@ module Redcar
     end
     
     def environment(env)
-      @env = env
+      if env == nil
+        remove_instance_variable(:@env) if @env
+      else
+        @env = env
+      end
     end
     
     def run(opts = {})
       @executor = Executor.new(self, opts)
-      @executor.execute
+      result = @executor.execute
+      remove_instance_variable(:@executor)
+      result
     end
     
     private

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

@@ -4,11 +4,15 @@ module Redcar
     class Executor
       include Redcar::Core::HasLogger
       
+      attr_reader :options, :command_instance
+      
       def self.current_environment
-        win = Redcar.app.focussed_window        
-        tab = Redcar.app.focussed_notebook_tab
-        { :win => win,
-          :tab => tab }
+        if Redcar.app
+          win = Redcar.app.focussed_window        
+          tab = Redcar.app.focussed_notebook_tab
+          { :win => win,
+            :tab => tab }
+        end
       end
       
       def initialize(command_instance, options={})
@@ -17,25 +21,50 @@ module Redcar
       end
       
       def execute
-        @command_instance.environment(Executor.current_environment)
+        set_environment
         begin
           if not @options.empty?
             result = @command_instance.execute(@options) 
           else
             result = @command_instance.execute
           end
+          finish
+          clear_environment
         rescue Object => e
-          @command_instance.error = e
+          set_error(e)
           print_command_error(e)
         rescue java.lang.StackOverflowError => e
-          @command_instance.error = e
+          set_error(e)
           print_command_error(e)
         end
         record
         result
+      ensure
+        clear_environment
       end
       
       private
+      
+      def set_environment
+        env = Executor.current_environment || {}
+        env = env.merge(options.delete(:env) || {})
+        
+        @command_instance.environment(env)
+      end
+      
+      def clear_environment
+        @command_instance.environment(nil)
+      end
+      
+      def set_error(e)
+        @command_instance.error = e
+      end
+      
+      def finish
+        if @command_instance.respond_to?(:_finished)
+          @command_instance._finished
+        end
+      end
 
       def print_command_error(e)
         puts "Error in command #{@command_instance.class}"
@@ -44,7 +73,7 @@ module Redcar
       end
       
       def record
-        if Redcar.app.history
+        if Redcar.app.andand.history
           Redcar.app.history.record(@command_instance)
         end
       end