redcar 0.12.1 → 0.13

data/plugins/project/lib/project/find_recent_dialog.rb

@@ -4,11 +4,14 @@ module Redcar
     class FindRecentDialog < FilterListDialog
       def update_list(filter)
         recent = Project::Recent.storage['list']
-        recent = recent.map {|path| path.gsub(/^#{Regexp.escape(Redcar.home_dir)}\/?/, "")}
-        filter_and_rank_by(recent, filter)
+        recent = recent.map do |path| 
+          {:name => path.gsub(/^#{Regexp.escape(Redcar.home_dir)}\/?/, ""), :icon => :dir}
+        end
+        filter_and_rank_by(recent, filter) {|h| h[:name] }
       end
 
-      def selected(path, ix)
+      def selected(item, ix)
+        path = item[:name]
         unless path[0..0] == "/" or path =~ /^[A-Z]:\//
           path = Redcar.home_dir + "/" + path
         end

data/plugins/project/lib/project/{adapters/local.rb → local_filesystem.rb}

@@ -1,36 +1,40 @@
 module Redcar
   class Project
-    module Adapters
-      class Local
-        def touch(new_file_path)
+    module LocalFilesystem
+      def fs
+        Methods
+      end
+      
+      class Methods
+        def self.touch(new_file_path)
           FileUtils.touch(new_file_path)
         end
-
-        def mkdir(new_dir_path)
+  
+        def self.mkdir(new_dir_path)
           FileUtils.mkdir(new_dir_path)
         end
-
-        def mv(path, new_path)
+  
+        def self.mv(path, new_path)
           FileUtils.mv(path, new_path)
           new_path = File.join(new_path, File.basename(path)) unless File.file?(new_path)
           Manager.update_tab_for_path(path,new_path)
         end
-
-        def file?(path)
+  
+        def self.file?(path)
           File.file?(path)
         end
-
-        def directory?(path)
+  
+        def self.directory?(path)
           # JRuby's File.directory? seems to have a problem with multi-byte strings
           f = java.io.File.new(path.to_java)
           f.directory?
         end
-
-        def empty_directory?(path)
+  
+        def self.empty_directory?(path)
           Dir.glob("#{path}/*", File::FNM_DOTMATCH).length <= 2
         end
-
-        def fetch_contents(path, force=false)
+  
+        def self.fetch_contents(path, force=false)
           Dir.glob("#{path}/*", File::FNM_DOTMATCH).map do |fn|
             is_dir = directory?(fn)
             hash = {
@@ -43,40 +47,36 @@ module Redcar
             hash
           end
         end
-
-        def load(file)
-          File.open(file, 'rb') do |f|; f.read; end
+  
+        def self.load(file)
+          File.read(file)
         end
-
-        def save(file, contents)
+  
+        def self.save(file, contents)
           File.open(file, "wb") {|f| f.print contents }
         end
-
-        def mtime(file)
+  
+        def self.mtime(file)
           File.mtime(file)
         end
-
-        def exists?(file)
+  
+        def self.exists?(file)
           File.exists?(file)
         end
-
-        def delete(file)
+  
+        def self.delete(file)
           FileUtils.rm_rf(file) unless Trash.recycle(file)
           Manager.update_tab_for_path(file)
         end
-
-        def load_contents(file)
+  
+        def self.load_contents(file)
           File.open(file, 'rb') do |f|; f.read; end
         end
-
-        def save_contents(file)
+  
+        def self.save_contents(file)
           File.open(file, "wb") {|f| f.print contents }
         end
-
-        def refresh_operation(tree)
-          yield
-        end
       end
     end
   end
-end
+end

data/plugins/project/lib/project/manager.rb

@@ -3,58 +3,12 @@ module Redcar
   class Project
     class Manager
 
-      def self.connect_to_remote(protocol, host, user, path, private_key_files = [])
-        if protocol == "SFTP" and private_key_files.any?
-          begin
-            adapter = open_adapter(protocol, host, user, nil, private_key_files)
-            open_remote_project(adapter, path)
-          rescue Net::SSH::AuthenticationFailed
-            if pw = get_password
-              adapter = open_adapter(protocol, host, user, pw, [])
-              open_remote_project(adapter, path)
-            end
-          end
-        else
-          if pw = get_password
-            adapter = open_adapter(protocol, host, user, pw, [])
-            open_remote_project(adapter, path)
-          end
-        end
-      rescue => e
-        puts "Error connecting: #{e.class}: #{e.message}"
-        puts e.backtrace
-        Application::Dialog.message_box("Error connecting: #{e.message}", :type => :error)
-      end
-
-      def self.get_password
-        result = Redcar::Application::Dialog.password_input("Remote Connection", "Enter password")
-        result[:value] if result
-      end
-
-      # Opens a new Tree with a DirMirror and DirController for the given
-      # path, in a new window.
-      #
-      # @param [String] path  the path of the directory to view
-      def self.open_remote_project(adapter, path)
-        win = Redcar.app.focussed_window
-        win = Redcar.app.new_window if !win or Manager.in_window(win)
-        project = Project.new(path, adapter)
-        project.open(win) if project.ready?
-      end
-
-      def self.open_adapter(protocol, host, user, password, private_key_files)
-        Adapters::Remote.new(protocol.downcase.to_sym, host, user, password, private_key_files)
-      rescue Errno::ECONNREFUSED
-        raise "connection refused connecting to #{host}"
-      rescue SocketError
-        raise "Cannot connect to #{host}. Error: #{$!.message}."
-      end
-
       def self.open_projects
         Project.window_projects.values
       end
 
       # Returns the project in the given window
+      #
       # @param [Window] window
       # @return Project or nil
       def self.in_window(window)
@@ -65,14 +19,8 @@ module Redcar
         Redcar.app.windows.reject {|w| in_window(w) }
       end
 
-      # this will restore open files unless other files or dirs were passed
-      # as command line parameters
       def self.start(args)
-        unless handle_startup_arguments(args)
-          unless Redcar.environment == :test
-            #restore_last_session
-          end
-        end
+        handle_startup_arguments(args)
         init_current_files_hooks
         init_window_closed_hooks
         init_drb_listener
@@ -163,13 +111,14 @@ module Redcar
       #
       # @path  [String] path the path of the file to be edited
       # @param [Window] win  the Window to open the File in
-      def self.open_file_in_window(path, win, adapter)
+      def self.open_file_in_window(path, win)
         return unless large_file_airbag(path)
         tab = win.new_tab(Redcar::EditTab)
-        mirror = FileMirror.new(path, adapter)
+        mirror = FileMirror.new(path)
         tab.edit_view.document.mirror = mirror
         tab.edit_view.reset_undo
         tab.focus
+        tab
       end
 
       def self.file_too_large?(path)
@@ -194,10 +143,10 @@ module Redcar
         }.sort_by {|p| path.split(//).length-p.path.split(//).length}
       end
 
-      def self.open_file(path, adapter=Adapters::Local.new)
+      def self.open_file(path)
         if tab = find_open_file_tab(path)
           tab.focus
-          return
+          return tab
         end
         if project = find_projects_containing_path(path).first
           window = project.window
@@ -205,8 +154,9 @@ module Redcar
           window = windows_without_projects.first || Redcar.app.new_window
           Project::Recent.store_path(path)
         end
-        open_file_in_window(path, window, adapter)
+        tab = open_file_in_window(path, window)
         window.focus
+        tab
       end
 
       def self.pop_first_line_option(args)
@@ -266,6 +216,7 @@ module Redcar
           win = Redcar.app.focussed_window
           win = Redcar.app.new_window(false) if !win or Manager.in_window(win)
           project.open(win) if project.ready?
+          p project
           Redcar.app.show_window(win)
           project
         end
@@ -373,20 +324,6 @@ module Redcar
         end
       end
 
-      # restores the directory/files in the last open window
-      def self.restore_last_session
-        if path = storage['last_open_dir']
-          s = Time.now
-          open_project_for_path(path)
-        end
-
-        if files = storage['files_open_last_session']
-          files.each do |path|
-            open_file(path)
-          end
-        end
-      end
-
       def self.refresh_modified_file(path)
         path = File.expand_path(path)
         find_projects_containing_path(path).each do |project|
@@ -414,11 +351,20 @@ module Redcar
               item "Find File", Project::FindFileCommand
               # item "Refresh Directory", Project::RefreshDirectoryCommand
             end
-            item "Reveal Open File in Tree", :command => Project::ToggleRevealInProject, :type => :check, :active => Project::Manager.reveal_files?
+            item "Reveal Open File in Tree", :command => Project::ToggleRevealInProject, :type => :check, :checked => lambda { Project::Manager.reveal_files? }
           end
         end
       end
 
+      def self.tab_context_menu(tab)
+        Menu::Builder.build do
+          if tab.is_a?(EditTab)
+            path = tab.edit_view.document.path
+            item("Copy path to clipboard", :enabled => !!path) { Redcar.app.clipboard << path if path }
+          end
+        end
+      end
+      
       # Uses our own context menu hook to provide context menu entries
       # @return [Menu]
       def self.project_context_menus(tree, node, controller)
@@ -452,7 +398,7 @@ module Redcar
               separator
               if tree.selection.length > 1
                 dirs = tree.selection.map {|node| node.parent_dir }
-                if dirs.uniq.length == 1 and node.adapter.is_a?(Adapters::Local)
+                if dirs.uniq.length == 1
                   item("Bulk Rename") { controller.rename(tree, node)   }
                 end
               else

data/plugins/project/lib/project/sub_project.rb

@@ -3,9 +3,9 @@ module Redcar
   class Project
     class SubProject < Project
 
-      def initialize(project_path, path, adapter=Adapters::Local.new)
-        super(path,adapter)
-        @project=project_path
+      def initialize(project_path, path)
+        super(path)
+        @project = project_path
       end
 
       def config_files(glob)

data/plugins/project/plugin.rb

@@ -6,6 +6,5 @@ Plugin.define do
   object  "Redcar::Project::Manager"
   dependencies "edit_view", ">0",
                "HTML View", ">0",
-               "connection_manager", ">0",
                "application", ">=1.1"
 end

data/plugins/project_search/lib/project_search/lucene_refresh.rb

@@ -11,7 +11,6 @@ class ProjectSearch
     end
     
     def execute
-      return if @project.remote?
       unless index = ProjectSearch.indexes[@project.path]
         index = ProjectSearch::LuceneIndex.new(@project)
         ProjectSearch.indexes[@project.path] = index

data/plugins/redcar/plugin.rb

@@ -11,7 +11,7 @@ Plugin.define do
                "auto_indenter",     ">0",
                "document_search",   ">0",
                "runnables",         ">0",
+               "sessions",          ">0",
                "HTML View",         ">=0.3.2",
-               "Plugin Manager UI", ">=0.3.2",
-               "outline_view",      ">0"
+               "Plugin Manager UI", ">=0.3.2"
 end

data/plugins/redcar/redcar.rb

@@ -41,61 +41,61 @@ module Redcar
       end
     end
 
-    class GenerateWindowsMenu < Command
-      def initialize(builder)
-        @builder = builder
-      end
-
-      def execute
+    class GenerateWindowsMenu
+      def self.on(builder)
         window = Redcar.app.focussed_window
         Redcar.app.windows.each do |win|
-          @builder.item(win.title, :type => :radio, :active => (win == window)) do
+          builder.item(win.title, :type => :radio, :checked => (win == window)) do
             Application::FocusWindowCommand.new(win).run
           end
         end
       end
     end
 
-    class GenerateTabsMenu < Command
-      def initialize(builder)
-        @builder = builder
-      end
-
-      def trim(title)
+    class GenerateTabsMenu
+      def self.trim(title)
         title = title[0,13]+'...' if title.length > 13
         title
       end
 
-      def execute
+      def self.on(builder)
         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
+          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),
+                :checked => (tab == focussed_tab),
                 :command => Redcar::Application.const_get("SelectTab#{num}Command")
               )
             else
               @builder.item("Tab #{num}: #{trim(tab.title)}",
-                :type => :radio,
-                :active => (tab == focussed_tab)) { tab.focus }
+                :type    => :radio,
+                :checked => (tab == focussed_tab)) { tab.focus }
             end
           end
           if book = win.nonfocussed_notebook and book.tabs.any?
-            @builder.separator
-            @builder.item "Nonfocussed Notebook", ShowTitle
+            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}
+              builder.item("Tab #{i+1}: #{trim(tab.title)}") {tab.focus}
             end
           end
         end
       end
     end
+    
+    class GenerateGrammarsMenu
+      def self.on(builder)
+        builder.item "Ruby", AboutCommand
+        builder.item "Java", AboutCommand
+        builder.item "Python", AboutCommand
+      end
+    end
 
     class AboutCommand < Command
       def execute
@@ -635,7 +635,6 @@ Redcar.environment: #{Redcar.environment}
 
         #link "Cmd+Return",   MoveNextLineCommand
 
-        link "Ctrl+Shift+E", EditView::InfoSpeedbarCommand
         link "Cmd+Z",        UndoCommand
         link "Cmd+Shift+Z",  RedoCommand
         link "Cmd+X",        CutCommand
@@ -679,6 +678,7 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+G",       EditView::OppositeCaseTextCommand
         link "Ctrl+_",       EditView::CamelSnakePascalRotateTextCommand
         link "Ctrl+=",       EditView::AlignAssignmentCommand
+        link "Cmd+Alt+Ctrl+L", EditView::ChangeLanguageCommand
         link "Ctrl+Shift+^", SortLinesCommand
 
         link "Cmd+T",           Project::FindFileCommand
@@ -734,7 +734,6 @@ Redcar.environment: #{Redcar.environment}
 
         link "Ctrl+Enter",   MoveNextLineCommand
 
-        link "Ctrl+Shift+E", EditView::InfoSpeedbarCommand
         link "Ctrl+Z",       UndoCommand
         link "Ctrl+Y",       RedoCommand
         link "Ctrl+X",       CutCommand
@@ -772,6 +771,7 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+Alt+Shift+U", EditView::OppositeCaseTextCommand
         link "Ctrl+_",           EditView::CamelSnakePascalRotateTextCommand
         link "Ctrl+=",           EditView::AlignAssignmentCommand
+        link "Ctrl+Alt+Shift+L", EditView::ChangeLanguageCommand
         link "Ctrl+Shift+^",     SortLinesCommand
 
         link "Ctrl+T",           Project::FindFileCommand
@@ -853,16 +853,12 @@ Redcar.environment: #{Redcar.environment}
 
         sub_menu "Edit", :priority => 5 do
           group(:priority => :first) do
-            item "Tab Info",  EditView::InfoSpeedbarCommand
-          end
-          group(:priority => 10) do
-            separator
             item "Undo", UndoCommand
             item "Redo", RedoCommand
+            separator
           end
 
           group(:priority => 15) do
-            separator
             item "Cut", CutCommand
             item "Copy", CopyCommand
             item "Paste", PasteCommand
@@ -870,19 +866,17 @@ Redcar.environment: #{Redcar.environment}
               item "Duplicate Region", DuplicateCommand
               item "Sort Lines in Region", SortLinesCommand
             end
+            separator
           end
 
           group(:priority => 30) do
-            separator
             sub_menu "Selection" do
               item "All", SelectAllCommand
               item "Line", SelectLineCommand
               item "Current Word", SelectWordCommand
               item "Toggle Block Selection", ToggleBlockSelectionCommand
             end
-          end
-
-          group(:priority => 40) do
+            
             sub_menu "Document Navigation" do
               item "Goto Line", GotoLineCommand
               item "Top",     MoveTopCommand
@@ -909,9 +903,7 @@ Redcar.environment: #{Redcar.environment}
               item "Backward Navigation", BackwardNavigationCommand
               item "Forward Navigation", ForwardNavigationCommand
             end
-          end
-
-          group(:priority => 50) do
+            
             sub_menu "Formatting" do
               item "Increase Indent", IncreaseIndentCommand
               item "Decrease Indent", DecreaseIndentCommand
@@ -938,7 +930,7 @@ Redcar.environment: #{Redcar.environment}
           end
           group(:priority => 10) do
             separator
-            item "Toggle Fullscreen", :command => Application::ToggleFullscreen, :type => :check, :active => window ? window.fullscreen : false
+            item "Toggle Fullscreen", :command => Application::ToggleFullscreen, :type => :check, :checked => window ? window.fullscreen : false
           end
           group(:priority => 15) do
             separator
@@ -952,7 +944,7 @@ Redcar.environment: #{Redcar.environment}
               item "Next Tree", Application::SwitchTreeDownCommand
             end
             lazy_sub_menu "Windows" do
-              GenerateWindowsMenu.new(self).run
+              GenerateWindowsMenu.on(self)
             end
             sub_menu "Notebooks" do
               item "New Notebook", Application::OpenNewNotebookCommand
@@ -979,9 +971,9 @@ Redcar.environment: #{Redcar.environment}
           end
           group(:priority => :last) do
             separator
-            item "Show Toolbar", :command => Application::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?
+            item "Show Toolbar", :command => Application::ToggleToolbar, :type => :check, :checked => lambda { Redcar.app.show_toolbar? }
+            item "Show Invisibles", :command => ToggleInvisibles, :type => :check, :checked => lambda { EditView.show_invisibles? }
+            item "Show Line Numbers", :command => ToggleLineNumbers, :type => :check, :checked => lambda { EditView.show_line_numbers? }
           end
         end
         sub_menu "Bundles", :priority => 45 do
@@ -1002,7 +994,7 @@ Redcar.environment: #{Redcar.environment}
             separator
             item "Check for Updates", :command => Application::ToggleCheckForUpdatesCommand, 
                                       :type => :check, 
-                                      :active => Application::Updates.check_for_updates?
+                                      :checked => lambda { Application::Updates.check_for_updates? }
             item "Update Available",  Application::OpenUpdateCommand
           end
         end