redcar 0.6.1 → 0.7

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

@@ -19,7 +19,7 @@ module Redcar
         if command.class.record?
           self << command
         end
-        prune
+        truncate
       end
     
       # Adds a command to the command history if CommandHistory.recording is
@@ -32,7 +32,7 @@ module Redcar
             self << command
           end
         end
-        prune
+        truncate
       end
     
       # Set the maximum length of the history
@@ -42,7 +42,7 @@ module Redcar
       
       private
       
-      def prune #:nodoc:
+      def truncate #:nodoc:
         (length - @max).times { delete_at(0) }
       end
     end

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

@@ -70,6 +70,10 @@ module Redcar
       false
     end
     
+    def lazy_text?
+      false
+    end
+    
     # Merge two Menu trees together. Modifies this Menu.
     #
     # @param [Menu] another Menu

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

@@ -12,7 +12,7 @@ module Redcar
         end
       end
       
-      attr_reader :text, :command, :priority, :value, :type, :active
+      attr_reader :command, :priority, :value, :type, :active
   
       # Create a new Item, with the given text to display in the menu, and
       # either:
@@ -54,6 +54,14 @@ module Redcar
         @type
       end
       
+      def text
+        @text.is_a?(Proc) ? @text.call : @text
+      end
+      
+      def lazy_text?
+        @text.is_a?(Proc)
+      end
+      
       def merge(other)
         @command = other.command
         @priority = other.priority

data/plugins/application/lib/application/tab.rb

@@ -3,6 +3,8 @@ module Redcar
     include Redcar::Model
     include Redcar::Observable
     
+    DEFAULT_ICON = :file
+    
     attr_reader :notebook
     
     def initialize(notebook)
@@ -37,6 +39,15 @@ module Redcar
       @title = title
       notify_listeners(:changed_title, title)
     end
+    
+    def icon
+      @icon || DEFAULT_ICON
+    end
+    
+    def icon=(value)
+      @icon = value
+      notify_listeners(:changed_icon, icon)
+    end
 
     def inspect
       "#<#{self.class.name} \"#{title}\">"

data/plugins/application/spec/application/command/executor_spec.rb

@@ -7,7 +7,7 @@ class Redcar::Command
     end
     
     before do
-      Executor.stub!(:current_environment).and_return(:current_environment)
+      Executor.stub!(:current_environment).and_return({:current_environment => 1})
       Redcar.app = FakeApp.new
       Redcar.app.history = History.new
     end
@@ -15,7 +15,7 @@ class Redcar::Command
     describe "executing a command" do
       class MyCommand < Redcar::Command
         def environment(env)
-          $spec_executor_env = env
+          $spec_executor_env = env if env
         end
 
         def execute
@@ -42,7 +42,7 @@ class Redcar::Command
     
       it "should set the command environment" do
         @executor.execute
-        $spec_executor_env.should == :current_environment
+        $spec_executor_env.should == {:current_environment => 1}
       end
     end
     

data/plugins/application/spec/application/command_spec.rb

@@ -48,6 +48,30 @@ describe Redcar::Command do
       SubSensitiveCommand.sensitivity_names.should == [:foo, :bar]
     end
   end
+  
+  describe "a command that implements _finished" do
+    class FinishableCommand < Redcar::Command
+      attr_reader :stuff
+      
+      def initialize
+        @stuff = []
+      end
+      
+      def execute
+        @stuff << :executed
+      end
+      
+      def _finished
+        @stuff << :finished
+      end
+    end
+    
+    it "should have _finished called after the command runs" do
+      command_instance = FinishableCommand.new
+      command_instance.run
+      command_instance.stuff.should == [:executed, :finished]
+    end
+  end
 end
 
 

data/plugins/application/spec/spec_helper.rb

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

data/plugins/application_swt/lib/application_swt.rb

@@ -6,8 +6,11 @@ require "application_swt/tab"
 require "application_swt/clipboard"
 require "application_swt/dialog_adapter"
 require "application_swt/dialogs/no_buttons_dialog"
+require "application_swt/dialogs/text_and_file_dialog"
 require "application_swt/dialogs/filter_list_dialog_controller"
+require "application_swt/dialogs/input_dialog"
 require "application_swt/html_tab"
+require "application_swt/icon"
 require "application_swt/menu"
 require "application_swt/menu/binding_translator"
 require "application_swt/toolbar"
@@ -24,9 +27,9 @@ require "application_swt-#{Redcar::VERSION}"
 module Redcar
   class ApplicationSWT
     include Redcar::Controller
-        
+
     def self.display
-      @display ||= Swt.display 
+      @display ||= Swt.display
     end
 
     def self.start
@@ -39,7 +42,7 @@ module Redcar
         Redcar.gui.register_dialog_adapter(ApplicationSWT::DialogAdapter.new)
       end
     end
-    
+
     def self.add_debug_key_filters
       display.add_filter(Swt::SWT::KeyDown) do |a|
         puts "type: #{a.type}, keyCode: #{a.keyCode}, character: #{a.character}, statemask: #{a.stateMask}"
@@ -48,11 +51,11 @@ module Redcar
         puts "type: #{a.type}, keyCode: #{a.keyCode}, character: #{a.character}, statemask: #{a.stateMask}"
       end
     end
-    
+
     def self.gui
       Redcar.gui
     end
-    
+
     class ShellListener
       def shell_deactivated(_)
         Swt.timer_exec(100) do
@@ -61,11 +64,11 @@ module Redcar
           end
         end
       end
-      
+
       def shell_activated(_)
         Redcar.app.gained_application_focus
       end
-      
+
       def shell_closed(_);      end
       def shell_deiconified(_); end
       def shell_iconified(_);   end
@@ -76,19 +79,19 @@ module Redcar
     def self.register_shell(shell)
       shell.add_shell_listener(ShellListener.new)
     end
-    
+
     def self.shell_dialogs
       @shell_dialogs ||= {}
     end
-    
+
     def self.register_dialog(shell, dialog)
       shell_dialogs[shell] = dialog
     end
-    
+
     def self.unregister_dialog(dialog)
       shell_dialogs.delete(shell_dialogs.invert[dialog])
     end
-    
+
     def initialize(model)
       @model = model
       add_listeners
@@ -96,11 +99,11 @@ module Redcar
       create_clipboard
       create_fake_window
     end
-    
+
     def fake_shell
       @fake_shell
     end
-    
+
     def create_fake_window
       if Redcar.platform == :osx
         @fake_shell = Swt::Widgets::Shell.new(ApplicationSWT.display, Swt::SWT::NO_TRIM)
@@ -108,12 +111,12 @@ module Redcar
         @fake_shell.set_size(0, 0)
       end
     end
-      
+
     class FakeWindow
       def initialize(shell)
         @shell = shell
       end
-      
+
       attr_reader :shell
     end
 
@@ -136,17 +139,17 @@ module Redcar
       @model.add_listener(:new_window, &method(:new_window))
       @model.add_listener(:refresh_menu, &method(:refresh_menu))
     end
-    
+
     class Listener
       def initialize(name)
         @name = name
       end
-      
+
       def handle_event(e)
         Application::Dialog.message_box("#{@name} menu is not hooked up yet")
       end
     end
-    
+
     class QuitListener
       def handle_event(e)
         unless Redcar.app.events.ignore?(:application_close, Redcar.app)
@@ -155,7 +158,7 @@ module Redcar
         end
       end
     end
-    
+
     def add_swt_listeners
       if Redcar.platform == :osx
         quit_listener  = Listener.new(:quit)
@@ -164,21 +167,21 @@ module Redcar
         enhancer = com.redcareditor.application_swt.CocoaUIEnhancer.new("Redcar")
         enhancer.hook_application_menu(
           ApplicationSWT.display,
-          QuitListener.new, 
-          about_listener, 
+          QuitListener.new,
+          about_listener,
           prefs_listener
         )
       end
     end
-    
+
     def create_clipboard
       ApplicationSWT::Clipboard.new(@model.clipboard)
     end
-    
+
     def new_window(win)
       win.controller = ApplicationSWT::Window.new(win)
     end
-    
+
     def menu_changed
       Menu.new(self, @model.menu)
     end

data/plugins/application_swt/lib/application_swt/dialog_adapter.rb

@@ -68,48 +68,19 @@ module Redcar
         MESSAGE_BOX_BUTTON_COMBOS.keys
       end
       
-      class PasswordDialog < JFace::Dialogs::Dialog
-        def initialize(parent_shell, title, message)
-          super(parent_shell)
-          @title, @message = title, message
-        end
-        
-        def createDialogArea(parent)
-          composite = super(parent)
-          
-          passwordLabel = Swt::Widgets::Label.new(composite, Swt::SWT::RIGHT)
-          passwordLabel.setText(@message)
-          
-          @passwordField = Swt::Widgets::Text.new(composite, Swt::SWT::SINGLE | Swt::SWT::PASSWORD)
-          data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_HORIZONTAL)
-          @passwordField.setLayoutData(data)
-          
-          getShell.setText(@title)
-        end
-        
-        def value
-          @password
-        end
-        
-        def close
-          @password = @passwordField.getText
-          super
-        end
-      end
-      
       def input(title, message, initial_value, &block)
-        dialog = JFace::Dialogs::InputDialog.new(
+        dialog = Dialogs::InputDialog.new(
                    parent_shell,
-                   title, message, initial_value) do |text|
+                   title, message, :initial_text => initial_value) do |text|
           block ? block[text] : nil
         end
         code = dialog.open
         button = (code == 0 ? :ok : :cancel)
-        {:button => button, :value => dialog.getValue}
+        {:button => button, :value => dialog.value}
       end
       
       def password_input(title, message)
-        dialog = PasswordDialog.new(parent_shell, title, message)
+        dialog = Dialogs::InputDialog.new(parent_shell, title, message, :password => true)
         code = dialog.open
         button = (code == 0 ? :ok : :cancel)
         {:button => button, :value => dialog.value}

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

@@ -0,0 +1,46 @@
+module Redcar
+  class ApplicationSWT
+    module Dialogs
+      class InputDialog < JFace::Dialogs::Dialog
+        def initialize(parent_shell, title, message, options={})
+          super(parent_shell)
+          @title, @message = title, message
+          @options = {:password => false, :initial_text => ""}.merge(options)
+        end
+        
+        def password?
+          @options[:password]
+        end
+        
+        def initial_text
+          @options[:initial_text]
+        end
+        
+        def createDialogArea(parent)
+          composite = super(parent)
+          
+          passwordLabel = Swt::Widgets::Label.new(composite, Swt::SWT::RIGHT)
+          passwordLabel.setText(@message)
+          
+          style = Swt::SWT::SINGLE
+          style = style | Swt::SWT::PASSWORD if password?
+          @inputField = Swt::Widgets::Text.new(composite, style)
+          data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_HORIZONTAL)
+          @inputField.setLayoutData(data)
+          @inputField.setText(initial_text)
+          
+          getShell.setText(@title)
+        end
+        
+        def value
+          @text
+        end
+        
+        def close
+          @text = @inputField.getText
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,118 @@
+
+module Redcar
+  class ApplicationSWT
+    module Dialogs
+      class TextAndFileDialog < JFace::Dialogs::Dialog
+
+        CONTINUE_BUTTON = "Continue"
+        BROWSE_BUTTON = "Browse"
+        # TODO: refactor this mess!
+        def set_text(title,message_1,message_2)
+          @title = title
+          @message_1 = message_1
+          @message_2 = message_2
+        end
+
+        def result
+          @result
+        end
+
+        def set_result(result)
+          @result = result
+        end
+
+        def createContents(parent)
+          composite = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
+          composite.setLayout(Swt::Layout::FormLayout.new)
+          composite.setSize(480,200)
+          composite.shell.setText(@title)
+
+          target_label = Swt::Widgets::Label.new(composite, Swt::SWT::NONE)
+          target_labelLData = Swt::Layout::FormData.new
+          target_labelLData.left =  Swt::Layout::FormAttachment.new(0, 1000, 12)
+          target_labelLData.top = Swt::Layout::FormAttachment.new(0, 1000, 78)
+          target_labelLData.width = 200
+          target_labelLData.height = 17
+          target_label.setLayoutData(target_labelLData)
+          target_label.setText(@message_2)
+
+          dialog_message = Swt::Widgets::Label.new(composite, Swt::SWT::NONE);
+          dialog_messageLData = Swt::Layout::FormData.new
+          dialog_messageLData.left =  Swt::Layout::FormAttachment.new(0, 1000, 12)
+          dialog_messageLData.top =  Swt::Layout::FormAttachment.new(0, 1000, 6)
+          dialog_messageLData.width = 200
+          dialog_messageLData.height = 17
+          dialog_message.setLayoutData(dialog_messageLData)
+          dialog_message.setText(@message_1)
+
+          continue_button = Swt::Widgets::Button.new(composite, Swt::SWT::PUSH | Swt::SWT::CENTER)
+          continueLData = Swt::Layout::FormData.new
+          continueLData.left =  Swt::Layout::FormAttachment.new(0, 1000, 146)
+          continueLData.top =  Swt::Layout::FormAttachment.new(0, 1000, 141)
+          continueLData.width = 70
+          continueLData.height = 30
+          continue_button.setLayoutData(continueLData)
+          continue_button.setText(CONTINUE_BUTTON)
+
+          browse_files = Swt::Widgets::Button.new(composite, Swt::SWT::PUSH | Swt::SWT::CENTER)
+          browse_files.setText(BROWSE_BUTTON)
+          browse_filesLData = Swt::Layout::FormData.new
+          browse_filesLData.width = 70
+          browse_filesLData.height = 30
+          browse_filesLData.left =  Swt::Layout::FormAttachment.new(0, 1000, 310)
+          browse_filesLData.top =  Swt::Layout::FormAttachment.new(0, 1000, 110)
+          browse_files.setLayoutData(browse_filesLData)
+
+          target_dirLData = Swt::Layout::FormData.new
+          target_dirLData.left =  Swt::Layout::FormAttachment.new(0, 1000, 12)
+          target_dirLData.top =  Swt::Layout::FormAttachment.new(0, 1000, 110)
+          target_dirLData.width = 300
+          target_dirLData.height = 22
+          target_dir = Swt::Widgets::Text.new(composite, Swt::SWT::NONE)
+          target_dir.setLayoutData(target_dirLData)
+
+          repo_urlLData = Swt::Layout::FormData.new
+          repo_urlLData.left =  Swt::Layout::FormAttachment.new(0, 1000, 12)
+          repo_urlLData.top =  Swt::Layout::FormAttachment.new(0, 1000, 38)
+          repo_urlLData.width = 300
+          repo_urlLData.height = 22
+          repo_url = Swt::Widgets::Text.new(composite, Swt::SWT::NONE)
+          repo_url.setLayoutData(repo_urlLData)
+
+          listener = SelectionListener.new(self,composite,repo_url,target_dir)
+          browse_files.addListener(Swt::SWT::Selection, listener)
+          continue_button.addListener(Swt::SWT::Selection, listener)
+
+          composite
+        end
+
+        def open
+          super
+          @result
+        end
+
+        class SelectionListener
+          def initialize(parent,dialog,repo_url,target_dir)
+            @dialog = dialog.shell
+            @repo_url = repo_url
+            @target_dir = target_dir
+            @parent = parent
+          end
+
+          def handleEvent(event)
+            if (event.widget.getText == BROWSE_BUTTON)
+              target_dir_path = Application::Dialog.open_directory({})
+              @target_dir.setText(target_dir_path) if target_dir_path
+            elsif (event.widget.getText == CONTINUE_BUTTON)
+              @parent.set_result({
+                :text => @repo_url.text,
+                :directory => @target_dir.text
+              })
+              @dialog.close
+            end
+          end
+        end
+      end
+    end
+  end
+end