redcar 0.8.1 → 0.9.0

data/plugins/project/lib/project/project_tree_controller.rb

@@ -0,0 +1,24 @@
+
+module Redcar
+  class Project
+    class ProjectTreeController
+      include Redcar::Tree::Controller
+
+      def initialize(project,title)
+        @project = project
+        @title   = title
+        attach_project_listener(@project.window)
+      end
+
+      def attach_project_listener(win)
+        win.treebook.add_listener(:tree_removed) do |tree|
+          if tree == @project.tree and r = win.treebook.trees.detect do |t|
+            t.tree_mirror.title == @title
+          end
+            r.close
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/project/lib/project/support/trash.rb

@@ -1,5 +1,6 @@
 module Redcar
   class Project
+    # FIXME: XXX: This is outright ugly. See the note on Redcar::Project::OpenCommand
     module Trash
       WINDOWS_SUPPORT_JS = File.expand_path("../recycle.js", __FILE__)
 

data/plugins/redcar/redcar.rb

@@ -164,6 +164,56 @@ module Redcar
       end
     end
 
+    class GenerateWindowsMenu < Command
+      def initialize(builder)
+        @builder = builder
+      end
+
+      def execute
+        window = Redcar.app.focussed_window
+        Redcar.app.windows.each do |win|
+          @builder.item(win.title, :type => :radio, :active => (win == window)) do
+            FocusWindowCommand.new(win).run
+          end
+        end
+      end
+    end
+
+    class GenerateTabsMenu < Command
+      def initialize(builder)
+        @builder = builder
+      end
+
+      def trim(title)
+        title = title[0,13]+'...' if title.length > 13
+        title
+      end
+
+      def execute
+        if win = Redcar.app.focussed_window and
+          book = win.focussed_notebook and book.tabs.any?
+          focussed_tab = book.focussed_tab
+          @builder.separator
+          @builder.item "Focussed Notebook", ShowTitle
+          book.tabs.each_with_index do |tab,i|
+            num = i + 1
+            if num < 10
+              @builder.item "Tab #{num}: #{trim(tab.title)}", :type => :radio, :active => (tab == focussed_tab), :command => Top.const_get("SelectTab#{num}Command")
+            else
+              @builder.item("Tab #{num}: #{trim(tab.title)}", :type => :radio, :active => (tab == focussed_tab)) {tab.focus}
+            end
+          end
+          if book = win.nonfocussed_notebook and book.tabs.any?
+            @builder.separator
+            @builder.item "Nonfocussed Notebook", ShowTitle
+            book.tabs.each_with_index do |tab,i|
+              @builder.item("Tab #{i+1}: #{trim(tab.title)}") {tab.focus}
+            end
+          end
+        end
+      end
+    end
+
     class FocusWindowCommand < Command
       def initialize(window=nil)
         @window = window
@@ -219,24 +269,18 @@ module Redcar
       end
     end
 
-    class CloseTreeCommand < Command
+    class CloseTreeCommand < TreeCommand
       def execute
         win = Redcar.app.focussed_window
         if win and treebook = win.treebook
           if tree = treebook.focussed_tree
-            if tree.tree_mirror.is_a?(Project::DirMirror)
-              Redcar::Application::Dialog.message_box(
-              "Use the \"Close Directory\" command to close this project"
-              )
-            else
-              treebook.remove_tree(tree)
-            end
+            treebook.remove_tree(tree)
           end
         end
       end
     end
 
-    class ToggleTreesCommand < Command
+    class ToggleTreesCommand < TreeCommand
       def execute
         win = Redcar.app.focussed_window
         if win and treebook = win.treebook
@@ -280,7 +324,7 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
-    class PrintScopeCommand < Command
+    class PrintScopeCommand < DocumentCommand
       def execute
         Application::Dialog.tool_tip(tab.edit_view.document.cursor_scope.gsub(" ", "\n"), :cursor)
       end
@@ -347,28 +391,28 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
-    class SwitchTabDownCommand < Command
+    class SwitchTabDownCommand < TabCommand
 
       def execute
         win.focussed_notebook.switch_down
       end
     end
 
-    class SwitchTabUpCommand < Command
+    class SwitchTabUpCommand < TabCommand
 
       def execute
         win.focussed_notebook.switch_up
       end
     end
 
-    class MoveTabUpCommand < Command
+    class MoveTabUpCommand < TabCommand
 
       def execute
         win.focussed_notebook.move_up
       end
     end
 
-    class MoveTabDownCommand < Command
+    class MoveTabDownCommand < TabCommand
 
       def execute
         win.focussed_notebook.move_down
@@ -717,7 +761,7 @@ Redcar.environment: #{Redcar.environment}
 
     # define commands from SelectTab1Command to SelectTab9Command
     (1..9).each do |tab_num|
-      const_set("SelectTab#{tab_num}Command", Class.new(Redcar::Command)).class_eval do
+      const_set("SelectTab#{tab_num}Command", Class.new(Redcar::TabCommand)).class_eval do
         define_method :execute do
           notebook = Redcar.app.focussed_window_notebook
           notebook.tabs[tab_num-1].focus if notebook.tabs[tab_num-1]
@@ -769,6 +813,11 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
+    class ShowTitle < Command
+      sensitize :always_disabled
+      def execute; end
+    end
+
     class SelectFontSize < Command
       def execute
         result = Application::Dialog.input("Font Size", "Please enter new font size", Redcar::EditView.font_size.to_s) do |text|
@@ -1034,33 +1083,47 @@ Redcar.environment: #{Redcar.environment}
           end
         end
         sub_menu "View", :priority => 30 do
-          sub_menu "Appearance" do
+          sub_menu "Appearance", :priority => 5 do
             item "Font", SelectNewFont
             item "Font Size", SelectFontSize
             item "Theme", SelectTheme
           end
-          item "Toggle Tree Visibility", :command => ToggleTreesCommand
-          item "Toggle Fullscreen", :command => ToggleFullscreen, :type => :check, :active => window ? window.fullscreen : false
-          separator
-          item "New Notebook", NewNotebookCommand
-          item "Close Notebook", CloseNotebookCommand
-          item "Rotate Notebooks", RotateNotebooksCommand
-          item "Move Tab To Other Notebook", MoveTabToOtherNotebookCommand
-          item "Switch Notebooks", SwitchNotebookCommand
-          separator
-          item "Previous Tab", SwitchTabDownCommand
-          item "Next Tab", SwitchTabUpCommand
-          item "Move Tab Left", MoveTabDownCommand
-          item "Move Tab Right", MoveTabUpCommand
-          sub_menu "Switch Tab" do
-             (1..9).each do |num|
-               item "Tab #{num}", Top.const_get("SelectTab#{num}Command")
-             end
+          group(:priority => 10) do
+            separator
+            item "Toggle Tree Visibility", :command => ToggleTreesCommand
+            item "Toggle Fullscreen", :command => ToggleFullscreen, :type => :check, :active => window ? window.fullscreen : false
+          end
+          group(:priority => 15) do
+            separator
+            lazy_sub_menu "Windows" do
+              GenerateWindowsMenu.new(self).run
+            end
+            sub_menu "Notebooks" do
+              item "New Notebook", NewNotebookCommand
+              item "Close Notebook", CloseNotebookCommand
+              item "Rotate Notebooks", RotateNotebooksCommand
+              item "Move Tab To Other Notebook", MoveTabToOtherNotebookCommand
+              item "Switch Notebooks", SwitchNotebookCommand
+            end
+            sub_menu "Tabs" do
+              item "Previous Tab", SwitchTabDownCommand
+              item "Next Tab", SwitchTabUpCommand
+              item "Move Tab Left", MoveTabDownCommand
+              item "Move Tab Right", MoveTabUpCommand
+              separator
+              # GenerateTabsMenu.new(self).run # TODO: find a way to maintain keybindings with lazy menus
+              item "Focussed Notebook", ShowTitle
+              (1..9).each do |num|
+                item "Tab #{num}", Top.const_get("SelectTab#{num}Command")
+              end
+            end
+          end
+          group(:priority => :last) do
+            separator
+            item "Show Toolbar", :command => ToggleToolbar, :type => :check, :active => Redcar.app.show_toolbar?
+            item "Show Invisibles", :command => ToggleInvisibles, :type => :check, :active => EditView.show_invisibles?
+            item "Show Line Numbers", :command => ToggleLineNumbers, :type => :check, :active => EditView.show_line_numbers?
           end
-          separator
-          item "Show Toolbar", :command => ToggleToolbar, :type => :check, :active => Redcar.app.show_toolbar?
-          item "Show Invisibles", :command => ToggleInvisibles, :type => :check, :active => EditView.show_invisibles?
-          item "Show Line Numbers", :command => ToggleLineNumbers, :type => :check, :active => EditView.show_line_numbers?
         end
         sub_menu "Bundles", :priority => 45 do
           group(:priority => :first) do

data/plugins/redcar_debug/lib/redcar_debug.rb

@@ -47,7 +47,7 @@ module Redcar
       def execute
         path = Redcar.user_dir + "/profile_output.html"
         JRubyProf.print_graph_html(Debug.profiling_result, path)
-        tab = win.new_tab(HtmlTab)
+        tab = win.new_tab(ConfigTab)
         tab.html_view.contents = File.read(path)
         tab.focus
         FileUtils.rm_f(path)
@@ -58,7 +58,7 @@ module Redcar
       def execute
         path = Redcar.user_dir + "/profile_output.html"
         JRubyProf.print_tree_html(Debug.profiling_result, path)
-        tab = win.new_tab(HtmlTab)
+        tab = win.new_tab(ConfigTab)
         tab.html_view.contents = File.read(path)
         tab.focus
         FileUtils.rm_f(path)
@@ -69,7 +69,7 @@ module Redcar
       
       def execute
         controller = Controller.new
-        tab = win.new_tab(HtmlTab)
+        tab = win.new_tab(ConfigTab)
         tab.html_view.controller = controller
         tab.focus
       end

data/plugins/repl/features/step_definitions/repl_steps.rb

@@ -0,0 +1,3 @@
+When /^I open a "([^"]*)" repl$/ do |repl|
+  Redcar::REPL.const_get(repl.camelize + "OpenREPL").new.run
+end

data/plugins/repl/lib/repl.rb

@@ -2,6 +2,7 @@ require 'repl/repl_mirror'
 require 'repl/ruby_mirror'
 require 'repl/clojure_mirror'
 require 'repl/groovy_mirror'
+require 'repl/repl_tab'
 
 module Redcar
   class REPL
@@ -37,7 +38,7 @@ module Redcar
       [
         Sensitivity.new(:open_repl_tab, Redcar.app, false, [:tab_focussed]) do |tab|
           tab and
-          tab.is_a?(EditTab) and
+          tab.is_a?(REPL::ReplTab) and
           tab.edit_view.document.mirror.is_a?(REPL::ReplMirror)
         end
       ]
@@ -46,17 +47,9 @@ module Redcar
     class OpenREPL < Command
 
       def open_repl(mirror)
-        tab = win.new_tab(Redcar::EditTab)
-        edit_view = tab.edit_view
-        edit_view.document.mirror = mirror
-        edit_view.cursor_offset = edit_view.document.length
-        edit_view.grammar = mirror.grammar_name
+        tab = win.new_tab(REPL::ReplTab)
+        tab.repl_mirror = mirror
         tab.focus
-
-        mirror.add_listener(:change) do
-          edit_view.cursor_offset = edit_view.document.length
-          edit_view.scroll_to_line(edit_view.document.line_count)
-        end
       end
     end
 

data/plugins/repl/lib/repl/repl_tab.rb

@@ -0,0 +1,26 @@
+module Redcar
+  class REPL
+    class ReplTab < Redcar::EditTab
+      
+      DEFAULT_ICON = :application_terminal
+      
+      def initialize(*args, &block)
+        super(*args,&block)
+      end
+      
+      def icon
+        DEFAULT_ICON
+      end
+      
+      def repl_mirror=(mirror)
+        edit_view.document.mirror = mirror
+        edit_view.cursor_offset = edit_view.document.length
+        edit_view.grammar = mirror.grammar_name
+        mirror.add_listener(:change) do
+          edit_view.cursor_offset = edit_view.document.length
+          edit_view.scroll_to_line(edit_view.document.line_count)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,4 @@
+After do
+  # Truncate the test file
+  File.open(File.expand_path("../../fixtures/test.rb", __FILE__), "w")
+end

data/plugins/ruby/features/syntax_check_ruby.feature

@@ -0,0 +1,25 @@
+Feature: Syntax Checking for Ruby
+  As a user
+  I want to get annotations on syntax errors in Ruby files
+
+  Background:
+    When I have opened "plugins/ruby/features/fixtures/test.rb"
+
+  Scenario: A syntax-clean Ruby file has no syntax error annotations
+    When I replace the contents with "def foo\n  bar\nend"
+    And I save the tab
+    Then the tab should not have annotations
+
+  Scenario: A syntax-error in a Ruby file should cause syntax error annotations
+    When I replace the contents with "def foo\n  => bar\nend"
+    And I save the tab
+    Then the tab should have annotations
+    And the tab should have an annotation on line 2
+
+  Scenario: Fixing a syntax-error in a Ruby file should cause syntax error annotations to vanish
+    When I replace the contents with "def foo\n  => bar\nend"
+    And I save the tab
+    Then the tab should have annotations
+    When I replace the contents with "def foo\n  bar\nend"
+    And I save the tab
+    Then the tab should not have annotations

data/plugins/runnables/features/command_tree.feature

@@ -29,6 +29,34 @@ Feature: Showing commands in a command tree
     And I expand the tree row "fixture_runnables"
     Then I should see "A changed app" in the tree
 
+  Scenario: I can switch forth and back between project and runnables tree
+    When I open the runnables tree
+    And I click the project tree tab
+    Then I should not see "fixture_runnables" in the tree
+    When I left-click the "Runnables" tree tab
+    Then I should see "fixture_runnables" in the tree
+
+  Scenario: Right-clicking the runnables tab does not activate it
+    When I open the runnables tree
+    And I click the project tree tab
+    Then I should not see "fixture_runnables" in the tree
+    When I right-click the "Runnables" tree tab
+    Then I should not see "fixture_runnables" in the tree
+    
+  Scenario: Closing the project via icon closes the runnables tree
+    And I open the runnables tree
+    And I click the project tree tab
+    And I click the close button
+    Then the tree width should be the minimum size
+    And there should not be a tree titled "Runnables"
+    
+  Scenario: Closing the project via menu item closes the runnables tree
+    And I open the runnables tree
+    And I click the project tree tab
+    And I close the tree
+    Then the tree width should be the minimum size
+    And there should not be a tree titled "Runnables"
+
   # TODO: Refresh on window changes
   # TODO: preserve expanding when refreshing
   # Example of these are available in refresh_directory_tree.feature

data/plugins/runnables/lib/runnables.rb

@@ -42,6 +42,7 @@ module Redcar
           end
           tab = window.new_tab(HtmlTab)
           tab.html_view.controller = controller
+          tab.icon = :cog
           tab.focus
         end
       end

data/plugins/runnables/lib/runnables/commands.rb

@@ -23,20 +23,20 @@ module Redcar
           project = Project::Manager.in_window(win)
           tree = Tree.new(
               TreeMirror.new(project),
-              TreeController.new(project)
+              TreeController.new(project,TREE_TITLE)
             )
           win.treebook.add_tree(tree)
         end
       end
     end
 
-    class RunEditTabCommand < Redcar::EditTabCommand
-      sensitize :open_project
+    class RunEditTabCommand < Redcar::DocumentCommand
+      sensitize :open_project, :focussed_committed_mirror
       def execute
         project = Project::Manager.in_window(win)
         f = Runnables.file_mappings(project).detect do |file_mapping|
           regex = Regexp.new(file_mapping["regex"])
-          tab.edit_view.document.mirror.path =~ regex
+          doc.mirror.path =~ regex
         end
         run_tab(project.home_dir,tab, f) if f
       end