redcar 0.3.4.3 → 0.3.5

data/plugins/edit_view_swt/lib/edit_view_swt/document.rb

@@ -57,9 +57,9 @@ module Redcar
       def replace(offset, length, text)
         @model.verify_text(offset, offset+length, text)
         jface_document.replace(offset, length, text)
-        if length > text.length
-          @swt_mate_document.mateText.redraw
-        end
+        #if length > text.length
+        #  @swt_mate_document.mateText.redraw
+        #end
         @model.modify_text
       end
       

data/plugins/edit_view_swt/lib/edit_view_swt/word_movement.rb

@@ -9,7 +9,7 @@ module Redcar
       end
       
       def get_next_offset(e)
-        if e.movement == Swt::SWT::MOVEMENT_WORD
+        if [Swt::SWT::MOVEMENT_WORD, Swt::SWT::MOVEMENT_WORD_END].include? e.movement
           e.newOffset = next_offset(e.offset, e.lineOffset, e.lineText)
           # SWT gets pissy without this:
           if e.newOffset == e.lineOffset + e.lineText.length + 1
@@ -36,7 +36,7 @@ module Redcar
       end
       
       def get_previous_offset(e)
-        if e.movement == Swt::SWT::MOVEMENT_WORD
+        if [Swt::SWT::MOVEMENT_WORD, Swt::SWT::MOVEMENT_WORD_START].include? e.movement
           e.newOffset = previous_offset(e.offset, e.lineOffset, e.lineText)
           # SWT gets pissy without this:
           if e.newOffset == e.lineOffset - 1

data/plugins/edit_view_swt/vendor/java-mateview.rb

@@ -6,6 +6,7 @@ module JavaMateView
   import com.redcareditor.mate.Grammar
   import com.redcareditor.mate.MateText
   import com.redcareditor.mate.Parser
+  import com.redcareditor.mate.ParserScheduler
   import com.redcareditor.mate.Pattern
   import com.redcareditor.mate.Scope
   import com.redcareditor.mate.ScopeMatcher
@@ -26,9 +27,9 @@ module JavaMateView
     end
     
     def delay_parsing
-      parser.deactivate
+      parser.parserScheduler.deactivate
       yield
-      parser.reactivate
+      parser.parserScheduler.reactivate
     end
   end
 end

data/plugins/encryption/encryption.rb

@@ -1,7 +1,4 @@
 
-require 'openssl'
-require File.dirname(__FILE__) + "/jarmor-1.1"
-require File.dirname(__FILE__) + "/ezcrypto"
 
 module Encryption
   def self.menus
@@ -15,21 +12,31 @@ module Encryption
     end
   end
 
+  def self.lazy_load
+    $:.push File.expand_path(File.join(Redcar.root, "openssl", "lib"))
+    require 'openssl'
+
+    require File.dirname(__FILE__) + "/jarmor-1.1"
+    require File.dirname(__FILE__) + "/ezcrypto"
+  end
+
   class DecryptDocumentCommand < Redcar::EditTabCommand
     def execute
-      result = Redcar::Application::Dialog.input(win, "Password", "Enter password")
+      Encryption.lazy_load
+      result = Redcar::Application::Dialog.input("Password", "Enter password")
       pw = result[:value]
       begin
         doc.text = EncryptionTools.dearmour_and_decrypt(doc.to_s, pw)
       rescue => e
-        Redcar::Application::Dialog.message_box(win, "Couldn't decrypt!", :type => :error)
+        Redcar::Application::Dialog.message_box("Couldn't decrypt!", :type => :error)
       end
     end
   end
   
   class EncryptDocumentCommand < Redcar::EditTabCommand
     def execute
-      result = Redcar::Application::Dialog.input(win, "Password", "Enter password")
+      Encryption.lazy_load
+      result = Redcar::Application::Dialog.input("Password", "Enter password")
       pw = result[:value]
       doc.text = EncryptionTools.encrypt_and_armour(doc.to_s, pw)
     end

data/plugins/execute_current_tab/lib/execute_current_tab.rb

@@ -19,33 +19,43 @@ module Redcar
       }]
     end
 
-    class Execute < Command
+    class Execute < EditTabCommand
 
       def execute
-        doc = win.focussed_notebook_tab_document
-        path = doc.path if doc
+        path = doc.path
         if path
-          command = "ruby #{path} 2>&1"
-          out = `#{command}`
-          new_tab = Top::NewCommand.new.run          
-          new_tab.document.text = "***** generated output from #{command} ***\n" + out
-          new_tab.title= 'exec output'
+          execute_file(path)
         else
-          puts 'unable to execute--maybe you need to save it first, so it has a filename?'
+          path = File.join(Redcar.tmp_dir, "execute_file.rb")
+          File.open(path, "w") { |file| file.puts doc.to_s }
+          execute_file(path)
+          FileUtils.rm(path)
         end
       end
 
+      def execute_file(path)
+        command = "ruby \"#{path}\" 2>&1"
+        output = `#{command}`
+        new_tab = Top::NewCommand.new.run          
+        title = "Output from #{command}"
+        new_tab.document.text = title + "\n" + "="*title.length + "\n\n" + output
+        new_tab.title = 'Output'
+      end
     end
 
-    class EmbeddedExecute < Command
+    class EmbeddedExecute < EditTabCommand
 
       def execute
-        doc = win.focussed_notebook_tab_document
-        out = doc.get_all_text if doc
+        out = doc.get_all_text
         if out
-          eval out, TOPLEVEL_BINDING, doc.path || doc.title || ''
-        else
-          puts 'unable to eval embedded'
+          begin
+            eval(out, TOPLEVEL_BINDING, doc.path || doc.title || '')
+          rescue Object => e
+            Application::Dialog.message_box(
+							"#{e.class}\n#{e.message}",
+							:type => :error )
+              
+          end
         end
       end
 

data/plugins/html_view/assets/redcar.css

@@ -9,4 +9,35 @@ td.plugin {
 
 td.links {
   text-align: right;
-} 
+} 
+
+body {
+  font-family: sans-serif;
+}
+
+h1, h2, h3, h4, h5 {
+  border-bottom: 1px solid black;
+}
+
+table {
+  border-collapse: collapse;
+  font-size: 0.8em;
+}
+
+th {
+  padding: 7px 12px;
+  border: 1px solid #bbb;
+}
+
+td {
+  padding: 7px 12px;
+  border: 1px solid #bbb;
+}
+
+tr.error {
+  background-color: #FCC;
+}
+
+tr.cancelled {
+  background-color: #EEE;
+}

data/plugins/html_view/lib/html_view.rb

@@ -7,6 +7,7 @@ module Redcar
   
     def initialize(html_tab)
       @html_tab = html_tab
+      @html_tab.add_listener(:controller_action, &method(:controller_action))
     end
     
     def controller=(new_controller)
@@ -14,9 +15,28 @@ module Redcar
       @html_tab.title = controller.title
       func = RubyFunc.new(@html_tab.controller.browser, "rubyCall")
       func.controller = @controller
-      text = controller.index + setup_javascript_listeners
-     # puts text
-      @html_tab.controller.browser.set_text(text)
+      controller_action("index")
+    end
+    
+    def controller_action(action_name, path=nil)
+      action_method_arity = controller.method(action_name).arity
+      begin
+        text = if action_method_arity == 0
+                 controller.send(action_name)
+               elsif action_method_arity == 1
+                 controller.send(action_name, path)
+               end
+      rescue => e
+        text = <<-HTML
+          Sorry, there was an error.<br />
+          #{e.message}
+        HTML
+      end
+      @html_tab.controller.browser.set_text(text + setup_javascript_listeners)
+    end
+    
+    def contents=(source)
+      @html_tab.controller.browser.set_text(source)
     end
     
     private

data/plugins/html_view/lib/html_view/html_tab.rb

@@ -12,5 +12,9 @@ module Redcar
     def create_html_view
       @html_view = HtmlView.new(self)
     end
+    
+    def controller_action(action, path)
+      notify_listeners(:controller_action, action, path)
+    end
   end
 end

data/plugins/my_plugin/lib/my_plugin.rb

@@ -20,7 +20,7 @@ module Redcar
     # Example command: showing a dialog box.
     class HelloWorldCommand < Redcar::Command
       def execute
-        Application::Dialog.message_box(win, "Hello World!")
+        Application::Dialog.message_box("Hello World!")
       end
     end
 
@@ -28,19 +28,11 @@ module Redcar
     # and open this file.
     class EditMyPluginCommand < Redcar::Command
       def execute
-        # Create a new window
-        new_window = Redcar.app.new_window
-        
-        # Create a new Tree. Tree's have mirrors for displaying data and controllers
-        # for reacting to events.
-        tree = Tree.new(Project::DirMirror.new(File.join(Redcar.root, "plugins", "my_plugin")),
-                        Project::DirController.new)
-                        
-        # Open the tree in the new window.
-        Project.open_tree(new_window, tree)
+        # Open the project in a new window
+        Project::Manager.open_project_for_path("plugins/my_plugin")
         
         # Create a new edittab
-        tab  = new_window.new_tab(Redcar::EditTab)
+        tab  = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
         
         # A FileMirror's job is to wrap up the file in an interface that the Document understands.
         mirror = Project::FileMirror.new(File.join(Redcar.root, "plugins", "my_plugin", "lib", "my_plugin.rb"))

data/plugins/plugin_manager_ui/lib/plugin_manager_ui.rb

@@ -40,6 +40,7 @@ module Redcar
         def plugin_table(plugins)
           str = "<table>\n"
           highlight = true
+          plugins = plugins.sort_by {|pl| pl.name.downcase }
           plugins.each do |plugin|
             name = plugin.is_a?(PluginManager::PluginDefinition) ? plugin.name : plugin
             str << "<tr class=\"#{highlight ? "grey" : ""}\">"

data/plugins/plugin_manager_ui/views/index.html.erb

@@ -1,40 +1,33 @@
-<br />
-<br />
-<div class="container">
-  <div class="span-8">
-    <% jquery_path = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets jquery-1.4.min.js))) %>
-    <script type="text/javascript" src="file://<%= jquery_path %>"></script>
-    <% blueprint_dir = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets blueprint))) %>
-    <% redcar_css = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets redcar.css))) %>
-    <link rel="stylesheet" href="file://<%= blueprint_dir %>/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="file://<%= blueprint_dir %>/print.css" type="text/css" media="print">
-    <link rel="stylesheet" href="file://<%= redcar_css %>" type="text/css" media="screen">
-    
-    <h3>Loaded Plugins</h3>
-    <%= plugin_table(Redcar.plugin_manager.loaded_plugins) %>
-
-    <h3>Unloaded Plugins</h3>
-    <%= plugin_table(Redcar.plugin_manager.unloaded_plugins) %>
-    
-    <h3>Unreadable definitions</h3>
-    <%= plugin_table(Redcar.plugin_manager.unreadable_definitions) %>
-    
-    <h3>Plugins with Errors</h3>
-    <%= plugin_table(Redcar.plugin_manager.plugins_with_errors) %>
-    
-    <script language="javascript">
-      $("a").click(function(e) {
-        e.preventDefault();
-        var pluginName = $(this).parent().parent().find(".plugin-name").text();
-        try {
-          Controller.reloadPlugin(pluginName);
-        } catch(e) {
-          alert(e.message);
-        }
-      });
-    </script>
-  </div>
-</div>
+<h3>Plugin Manager</h3>
+
+<% jquery_path = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets jquery-1.4.min.js))) %>
+<script type="text/javascript" src="file://<%= jquery_path %>"></script>
+<% redcar_css = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets redcar.css))) %>
+<link rel="stylesheet" href="file://<%= redcar_css %>" type="text/css" media="screen">
+
+<h4>Loaded Plugins</h4>
+<%= plugin_table(Redcar.plugin_manager.loaded_plugins) %>
+
+<h4>Unloaded Plugins</h4>
+<%= plugin_table(Redcar.plugin_manager.unloaded_plugins) %>
+
+<h4>Unreadable definitions</h4>
+<%= plugin_table(Redcar.plugin_manager.unreadable_definitions) %>
+
+<h4>Plugins with Errors</h4>
+<%= plugin_table(Redcar.plugin_manager.plugins_with_errors) %>
+
+<script language="javascript">
+  $("a").click(function(e) {
+    e.preventDefault();
+    var pluginName = $(this).parent().parent().find(".plugin-name").text();
+    try {
+      Controller.reloadPlugin(pluginName);
+    } catch(e) {
+      alert(e.message);
+    }
+  });
+</script>
 
 
 <script type="text/javascript">

data/plugins/project/features/find_file.feature

@@ -0,0 +1,75 @@
+Feature: Find file
+
+  Background:
+    Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
+    When I open a directory
+
+  Scenario: No files initially and with nothing typed
+    When I run the command Redcar::Project::FindFileCommand
+    Then there should be a filter dialog open
+    And the filter dialog should have no entries
+    
+  Scenario: No matching files
+    When I run the command Redcar::Project::FindFileCommand
+    And I set the filter to "xxx"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 0 entries
+    
+  Scenario: One matching file
+    When I run the command Redcar::Project::FindFileCommand
+    And I set the filter to "foo_spec"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 1 entry
+    And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
+
+  Scenario: Two matching files
+    When I run the command Redcar::Project::FindFileCommand
+    And I set the filter to "foo"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 2 entries
+    And I should see "foo_lib.rb (myproject/lib)" at 0 the filter dialog
+    And I should see "foo_spec.rb (myproject/spec)" at 1 the filter dialog
+    
+  Scenario: One matching file with arbitrary letters
+    When I run the command Redcar::Project::FindFileCommand
+    And I set the filter to "fsc"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 1 entry
+    And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
+
+  Scenario: Open a file
+    When I run the command Redcar::Project::FindFileCommand
+    And I set the filter to "fsc"
+    And I wait "0.4" seconds
+    And I select in the filter dialog
+    Then there should be no filter dialog open
+    And I should see "foo spec" in the edit tab
+
+  Scenario: Open a file then see the file in the initial list
+    When I run the command Redcar::Project::FindFileCommand
+    And I set the filter to "fsc"
+    And I wait "0.4" seconds
+    And I select in the filter dialog
+    And I run the command Redcar::Project::FindFileCommand
+    Then the filter dialog should have 1 entry
+    And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
+
+  Scenario: Open two files then see the files in the initial list
+    When I have opened "plugins/project/spec/fixtures/myproject/spec/foo_spec.rb"
+    And I have opened "plugins/project/spec/fixtures/myproject/lib/foo_lib.rb"
+    And I run the command Redcar::Project::FindFileCommand
+    Then the filter dialog should have 2 entries
+    And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
+    And I should see "foo_lib.rb (myproject/lib)" at 1 the filter dialog
+
+  Scenario: Open three files then see the files in the initial list
+    When I have opened "plugins/project/spec/fixtures/myproject/spec/foo_spec.rb"
+    And I have opened "plugins/project/spec/fixtures/myproject/lib/foo_lib.rb"
+    And I have opened "plugins/project/spec/fixtures/myproject/README"
+    And I run the command Redcar::Project::FindFileCommand
+    Then the filter dialog should have 3 entries
+    And I should see "foo_lib.rb (myproject/lib)" at 0 the filter dialog
+    And I should see "foo_spec.rb (myproject/spec)" at 1 the filter dialog
+    And I should see "README (fixtures/myproject)" at 2 the filter dialog
+
+

data/plugins/project/features/open_and_save_files.feature

@@ -1,13 +1,13 @@
 Feature: Open and save files
 
   Scenario: Open a file
-    Given I will choose "plugins/project/features/fixtures/winter.txt" from the "open_file" dialog
+    Given I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog
     When I open a file
     Then there should be one edit tab
     And I should see "Wintersmith" in the edit tab
 
   Scenario: Opening an already open file focusses the edit tab
-    Given I will choose "plugins/project/features/fixtures/winter.txt" from the "open_file" dialog
+    Given I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog
     When I open a file
     And I open a new edit tab
     And I replace the contents with "Jenny Green Eyes"
@@ -16,16 +16,16 @@ Feature: Open and save files
     And I should see "Wintersmith" in the edit tab
   
   Scenario: Save a file
-    Given I have opened "plugins/project/features/fixtures/winter.txt"
+    Given I have opened "plugins/project/spec/fixtures/winter.txt"
     When I replace the contents with "Hi!"
     And I save the tab
-    Then the file "plugins/project/features/fixtures/winter.txt" should contain "Hi!"
+    Then the file "plugins/project/spec/fixtures/winter.txt" should contain "Hi!"
     And I should see "Hi!" in the edit tab
 
   Scenario: Save a file As
-    Given I have opened "plugins/project/features/fixtures/winter.txt"
-    And I will choose "plugins/project/features/fixtures/winter2.txt" from the "save_file" dialog
+    Given I have opened "plugins/project/spec/fixtures/winter.txt"
+    And I will choose "plugins/project/spec/fixtures/winter2.txt" from the "save_file" dialog
     And I save the tab as
-    Then the file "plugins/project/features/fixtures/winter2.txt" should contain "Wintersmith"
+    Then the file "plugins/project/spec/fixtures/winter2.txt" should contain "Wintersmith"
     And I should see "Wintersmith" in the edit tab