redcar 0.3.4.3 → 0.3.5

data/plugins/redcar_debug/views/history.html.erb

@@ -0,0 +1,33 @@
+<% 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">
+
+<h3>Command History</h3>
+
+<a href="controller/index">Refresh</a>
+<br /><br />
+<table>
+  <tr>
+    <th>Completed</th>
+    <th>Description</th>
+  </tr>
+  <% Redcar.app.history.reverse.each do |command| %>
+    <tr class="<%= "error" if command.error %>">
+      <td><%#= command.completed_time.strftime("%X") %></td>
+      <td><%= CGI.escapeHTML(command.class.to_s) %></td>
+    </tr>
+    <% if e = command.error %>
+      <tr>
+        <td colspan="3">
+          <strong><%= e.class %></strong> 
+          <%= CGI.escapeHTML(e.message) %>
+          <br /><br />
+          <% e.backtrace.each do |line| %>
+            <%= line %><br />
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  <% end %>
+</table>
+
+

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

@@ -0,0 +1,33 @@
+<% 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">
+
+<h3>Command History</h3>
+
+<a href="controller/index">Refresh</a>
+
+<table>
+  <tr>
+    <th>Completed</th>
+    <th>Description</th>
+  </tr>
+  <% Redcar.app.history.reverse.each do |command| %>
+    <tr class="<%= "error" if command.error %>">
+      <td><%#= command.completed_time.strftime("%X") %></td>
+      <td><%= CGI.escapeHTML(command.class.to_s) %></td>
+    </tr>
+    <% if e = command.error %>
+      <tr>
+        <td colspan="3">
+          <strong><%= e.class %></strong> 
+          <%= CGI.escapeHTML(e.message) %>
+          <br /><br />
+          <% e.backtrace.each do |line| %>
+            <%= line %><br />
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  <% end %>
+</table>
+
+

data/plugins/repl/lib/repl/internal_mirror.rb

@@ -5,7 +5,6 @@ module Redcar
       include Redcar::Document::Mirror
       
       POINTERS = {
-        :output => "",
         :result => "=> ",
         :error  => "x> "
       }
@@ -32,9 +31,9 @@ module Redcar
           results = entry.last
           str << prompt.to_s + command.to_s + "\n"
           results.each do |result|
-            output, entry_type = *result
+            text, entry_type = *result
             str << POINTERS[entry_type]
-            output.scan(/.{1,80}/).each do |output_line|
+            text.scan(/.{1,80}/).each do |output_line|
               str << output_line + "\n"
             end
           end
@@ -58,7 +57,6 @@ module Redcar
         rescue Object => e
           result, entry_type = format_error(e), :error
         end
-        @history.last[1] << [@instance.output, :output] if @instance.output
         @history.last[1] << [result, entry_type]
         notify_listeners(:change)
       end
@@ -103,17 +101,7 @@ module Redcar
         end
         
         def execute(command)
-          orig_stdout = $stdout
-          stdout_handler = StringIO.new
-          $stdout = stdout_handler
-          begin
-            result = eval(command, @binding)
-          ensure
-            $stdout.rewind
-            @output = $stdout.read
-            $stdout = orig_stdout
-          end
-          result
+          eval(command, @binding)
         end
       end
     end

data/plugins/repl/spec/repl/internal_mirror_spec.rb

@@ -157,14 +157,14 @@ RUBY
     describe "when executing" do
       it "should execute inside a main object" do
         @mirror.commit(prompt + ">> self")
-        @mirror.history.last.should == ["self", [["", :output], ["main", :result]] ]
+        @mirror.history.last.should == ["self", [["main", :result]] ]
       end
       
       it "should persist local variables" do
         sent = prompt + ">> a = 13"
         @mirror.commit(sent)
         @mirror.commit(sent + "\n>> a")
-        @mirror.history.last.should == ["a", [["", :output], ["13", :result]] ]
+        @mirror.history.last.should == ["a", [["13", :result]] ]
       end
     end
   end

data/plugins/snippets/lib/snippets.rb

@@ -19,7 +19,6 @@ module Redcar
         registry = Registry.new
         s = Time.now
         tm_snippets = Textmate.all_snippets
-        puts "took #{Time.now - s}s to load snippets"
         registry.add(tm_snippets)
         registry
       end

data/plugins/snippets/lib/snippets/document_controller.rb

@@ -104,7 +104,7 @@ module Redcar
         @stop_id = 0
         
         @env = Textmate::Environment.new
-        
+        fix_line_endings
         # Not sure what to do about backticks. Currently they don't work in Redcar.
         #@content = execute_backticks(@content, bundle ? bundle.dir : nil)
         selection_range = document.selection_range
@@ -130,6 +130,12 @@ module Redcar
         line[/^(\s*)([^\s]|$)/, 1].chomp
       end
       
+      def fix_line_endings
+        if document.delim != "\n" # textmate uses "\n" everywhere
+          @content = @content.gsub("\n", document.delim)
+        end
+      end
+      
       def compute_tab_stop(line, tab_width, soft_tabs)
         re = / {0,#{tab_width - 1}}\t|#{" "*tab_width}/
         sc = StringScanner.new(leading_whitespace(line))

data/plugins/task_manager/lib/task_manager.rb

@@ -0,0 +1,28 @@
+
+require 'erb'
+require 'cgi'
+
+module Redcar
+  class TaskManager
+    class OpenCommand < Redcar::Command
+      
+      def execute
+        controller = Controller.new
+        tab = win.new_tab(HtmlTab)
+        tab.html_view.controller = controller
+        tab.focus
+      end
+    end
+    
+    class Controller
+      def title
+        "Tasks"
+      end
+    
+      def index
+        rhtml = ERB.new(File.read(File.join(File.dirname(__FILE__), "..", "views", "index.html.erb")))
+        rhtml.result(binding)
+      end
+    end
+  end
+end

data/plugins/task_manager/plugin.rb

@@ -0,0 +1,11 @@
+
+Plugin.define do
+  name "task_manager"
+  version "0.3.5"
+  
+  object "Redcar::TaskManager"
+  file "lib", "task_manager"
+  
+  dependencies "core",      ">0",
+               "HTML View", ">=0.3.2"
+end

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

@@ -0,0 +1,67 @@
+<% 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">
+
+<h3>Task Manager</h3>
+
+<a href="controller/index">Refresh</a>
+
+<h4>Pending</h4>
+
+<table>
+  <tr>
+    <th>Enqueued</th>
+    <th>Description</th>
+  </tr>
+  <% Redcar.app.task_queue.pending.each do |task| %>
+    <tr>
+      <td><%= task.enqueue_time.strftime("%X") %></td>
+      <td><%= CGI.escapeHTML(task.description || task.class.to_s) %></td>
+    </tr>
+  <% end %>
+</table>
+
+<h4>In Process</h4>
+
+<table>
+  <tr>
+    <th>Started</th>
+    <th>Description</th>
+  </tr>
+  <% if task = Redcar.app.task_queue.in_process %>
+    <tr>
+      <td><%= task.start_time.strftime("%X") %></td>
+      <td><%= CGI.escapeHTML(task.description || task.class.to_s) %></td>
+    </tr>
+  <% end %>
+</table>
+
+<h4>Completed</h4>
+
+<table>
+  <tr>
+    <th>Completed</th>
+    <th>Description</th>
+    <th>Duration</th>
+  </tr>
+  <% Redcar.app.task_queue.completed.reverse.each do |task| %>
+    <tr class="<%= "error" if task.error %>">
+      <td><%= task.completed_time.strftime("%X") %></td>
+      <td><%= CGI.escapeHTML(task.description || task.class.to_s) %></td>
+      <td><%= task.completed_time - task.start_time %></td>
+    </tr>
+    <% if e = task.error %>
+      <tr>
+        <td colspan="3">
+          <strong><%= e.class %></strong> 
+          <%= CGI.escapeHTML(e.message) %>
+          <br /><br />
+          <% e.backtrace.each do |line| %>
+            <%= line %><br />
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  <% end %>
+</table>
+
+

data/plugins/textmate/lib/textmate.rb

@@ -11,25 +11,6 @@ module Redcar
       Dir[File.join(Redcar.root, "textmate", "Bundles", "*")]
     end
     
-    def self.attach_menus(builder)
-      s = Time.now
-      @menus ||= begin
-        Menu::Builder.build do |a|
-          all_bundles.sort_by {|b| (b.name||"").downcase}.each do |bundle|
-            bundle.build_menu(a)
-          end
-        end
-      end
-      @menus.entries.each {|i| builder.append(i) }
-      puts "took #{Time.now - s}s to attach bundle menus"
-    end
-    
-    #def self.attach_keybindings(builder)
-    #  s = Time.now
-    #  all_bundles
-    #  puts "took #{Time.now - s}s to attach bundle menus"
-    #end
-    
     def self.uuid_hash
       @uuid_hash ||= begin
         h = {}
@@ -42,6 +23,17 @@ module Redcar
       end
     end
     
+    def self.attach_menus(builder)
+      #@menus ||= begin
+      #  Menu::Builder.build do |a|
+      #    all_bundles.sort_by {|b| (b.name||"").downcase}.each do |bundle|
+      #      bundle.build_menu(a)
+      #    end
+      #  end
+      #end
+      #@menus.entries.each {|i| builder.append(i) }
+    end
+    
     def self.all_bundles
       @all_bundles ||= begin
         cache = PersistentCache.new("textmate_bundles")
@@ -63,8 +55,12 @@ module Redcar
       end
     end
     
-    # Translates a Textmate key equivalent into a Redcar
-    # keybinding. 
+    def self.settings(type=nil)
+      @all_settings_by_type ||= {}
+      @all_settings_by_type[type] ||= all_settings.select {|s| s.is_a?(type) }
+    end
+
+    # Translates a Textmate key equivalent into a Redcar keybinding. 
     def self.translate_key_equivalent(keyeq, name=nil)
       if keyeq
         key_str      = keyeq[-1..-1]

data/plugins/textmate/lib/textmate/plist.rb

@@ -1,6 +1,4 @@
 
-require 'rexml/document'
-
 module Redcar
   # An Apple Plist parser.
   class Plist
@@ -14,6 +12,7 @@ module Redcar
     end
 
     def self.plist_from_xml(xml_string) # :nodoc:
+      require 'rexml/document'
       xml = REXML::Document.new(xml_string)
       plist_from_xml1(xml.root.elements.first)
     end

data/plugins/textmate/lib/textmate/preference.rb

@@ -43,7 +43,7 @@ module Redcar
     end
     
     class Setting
-      attr_reader :scope
+      attr_reader :scope, :plist
     
       def initialize(scope, plist)
         @scope = scope
@@ -67,15 +67,19 @@ module Redcar
     end
     
     class IncreaseIndentPatternSetting < Setting
+      def pattern; @plist; end
     end
     
     class DecreaseIndentPatternSetting < Setting
+      def pattern; @plist; end
     end
     
     class UnIndentedLinePatternSetting < Setting
+      def pattern; @plist; end
     end
     
     class IndentNextLinePatternSetting < Setting
+      def pattern; @plist; end
     end
     
     class ShowInSymbolListSetting < Setting

data/plugins/textmate/lib/textmate/snippet.rb

@@ -35,7 +35,12 @@ module Redcar
       
       def to_menu_string
         r = name.clone
-        r << " (#{tab_trigger}↦)" if tab_trigger
+        # It doesn't seem to be possible to set accelerator text on OSX.
+        if Redcar.platform == :osx
+          r << " (#{tab_trigger}↦)" if tab_trigger
+        else
+          r << "\t#{tab_trigger}" if tab_trigger
+        end
         r
       end
     end

data/plugins/tree_view_swt/lib/tree_view_swt.rb

@@ -36,7 +36,6 @@ module Redcar
           puts e.message
           puts e.backtrace
         end
-        puts "tree refresh took #{Time.now - s} seconds"
       end
     end
     
@@ -50,27 +49,22 @@ module Redcar
     
     class TreeListener
       def tree_collapsed(e)
-        p [:collapsed, e]
       end
       
       def tree_expanded(e)
-        p [:expanded, e]
       end
     end
     
     class SelectionListener
       def widget_default_selected(e)
-        p [:def_selected, e]
       end
       
       def widget_selected(e)
-        p [:selected, e]
       end
     end
     
     class DoubleClickListener
       def double_click(e)
-        p [:double_click, e]
       end
     end
     

data/textmate/Bundles/Cucumber.tmbundle/Preferences/Comments.tmPreferences

@@ -5,7 +5,7 @@
 	<key>name</key>
 	<string>Comments</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>settings</key>
 	<dict>
 		<key>shellVariables</key>

data/textmate/Bundles/Cucumber.tmbundle/Preferences/next_Cucumber_Plain_Text_Feature_Completions.tmPreferences

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>Gherkin Completions</string>
+	<key>scope</key>
+	<string>text.gherkin.feature</string>
+	<key>settings</key>
+	<dict>
+		<key>completions</key>
+		<array>
+			<string>As a</string>
+			<string>As an</string>
+			<string>I want to</string>
+			<string>So that</string>
+			<string>Story:</string>
+			<string>Scenario:</string>
+			<string>Scenario Outline:</string>
+			<string>Given</string>
+			<string>Then</string>
+			<string>When</string>
+			<string>And</string>
+			<string>But</string>
+		</array>
+	</dict>
+	<key>uuid</key>
+	<string>8B547854-6A6A-4E45-B51E-9324F0E9D364</string>
+</dict>
+</plist>