redcar 0.12.1 → 0.13

data/plugins/project/lib/project/commands.rb

@@ -9,16 +9,15 @@ module Redcar
 
   class Project
     class OpenFileCommand < Command
-      def initialize(path = nil, adapter = Adapters::Local.new)
+      def initialize(path = nil)
         @path = path
-        @adapter = adapter
       end
 
       def execute
         path = get_path
         if path
           if File.readable? path
-            Manager.open_file(path, @adapter)
+            Manager.open_file(path)
           else
             Application::Dialog.message_box(
               "Can't read #{path}, you don't have the permissions.",
@@ -42,7 +41,7 @@ module Redcar
     end
 
     class FileReloadCommand < EditTabCommand
-      def initialize(path = nil, adapter = Adapters::Local.new)
+      def initialize(path = nil)
         @path = path
       end
 
@@ -62,86 +61,6 @@ module Redcar
       end
     end
 
-    class OpenRemoteSpeedbar < Redcar::Speedbar
-
-      class << self
-        attr_accessor :connection
-
-        def connections
-          ConnectionManager::ConnectionStore.new.connections
-        end
-
-        def connection_names
-          if connections && connections.any?
-            ['Select...', connections.map { |c| c.name }].flatten
-          end
-        end
-      end
-
-      def initialize
-        connection.items = self.class.connection_names
-      end
-
-      label :connection_label, 'Connect to:'
-      combo :connection
-
-      button :connect, "Connect", "Return" do
-        selected = self.class.connections.find { |c| c.name == connection.value }
-
-        Manager.connect_to_remote(selected[:protocol], selected[:host],
-          selected[:user], selected[:path], ConnectionManager::PrivateKeyStore.paths)
-      end
-
-      button :quick, "Quick Connection", "Ctrl+Q" do
-        @speedbar = QuickOpenRemoteSpeedbar.new
-        Redcar.app.focussed_window.open_speedbar(@speedbar)
-      end
-
-      button :manage, "Connections Manager", "Ctrl+M" do
-        Redcar.app.focussed_window.close_speedbar
-        Redcar::ConnectionManager::OpenCommand.new.run
-      end
-    end
-
-    class QuickOpenRemoteSpeedbar < Redcar::Speedbar
-      class << self
-        attr_accessor :host
-        attr_accessor :user
-        attr_accessor :password
-        attr_accessor :path
-        attr_accessor :protocol
-      end
-
-      combo :protocol, %w(SFTP FTP), 'SFTP'
-
-      label :host_label, "Host:"
-      textbox :host
-
-      label :user_label, "User:"
-      textbox :user
-
-      label :path_label, "Path:"
-      textbox :path
-
-      button :connect, "Connect", "Return" do
-        Manager.connect_to_remote(protocol.value, host.value, user.value,
-          path.value, ConnectionManager::PrivateKeyStore.paths)
-      end
-    end
-
-    #class OpenRemoteCommand < Command
-    #  def initialize(url=nil)
-    #    @url = url
-    #  end
-    #
-    #  def execute
-    #    unless @url
-    #      @speedbar = OpenRemoteSpeedbar.new
-    #      win.open_speedbar(@speedbar)
-    #    end
-    #  end
-    #end
-
     class SaveFileCommand < EditTabCommand
       def initialize(tab=nil)
         @tab = tab
@@ -261,10 +180,6 @@ module Redcar
     class FindFileCommand < ProjectCommand
 
       def execute
-        if Manager.focussed_project.remote?
-          Application::Dialog.message_box("Find file doesn't work in remote projects yet :(")
-          return
-        end
         dialog = FindFileDialog.new(Manager.focussed_project)
         dialog.open
       end

data/plugins/project/lib/project/dir_controller.rb

@@ -3,14 +3,11 @@ module Redcar
   class Project
     class DirController
       include Redcar::Tree::Controller
-
-      def self.adapter(node, tree=nil)
-        node ? node.adapter : tree.tree_mirror.adapter
-      end
+      include LocalFilesystem
 
       def activated(tree, node)
         if node.leaf?
-          OpenFileCommand.new(node.path, node.adapter).run
+          OpenFileCommand.new(node.path).run
         end
       end
 
@@ -21,6 +18,7 @@ module Redcar
 
       class DragController
         include Redcar::Tree::Controller::DragController
+        include LocalFilesystem
 
         attr_reader :tree
 
@@ -43,8 +41,7 @@ module Redcar
           non_nested_paths.each do |path|
             dir = target ? target.directory : tree.tree_mirror.path
             unless File.dirname(path) == dir
-              adapter = DirController.adapter(target, tree)
-              adapter.mv(path, dir)
+              fs.mv(path, dir)
             end
           end
           tree.refresh
@@ -113,8 +110,7 @@ module Redcar
         new_file_name = uniq_name(enclosing_dir, "New File")
         new_file_path = File.join(enclosing_dir, new_file_name)
 
-        adapter = DirController.adapter(node, tree)
-        adapter.touch(new_file_path)
+        fs.touch(new_file_path)
         tree.refresh
         tree.expand(node)
         new_file_node = DirMirror::Node.cache[new_file_path]
@@ -125,8 +121,7 @@ module Redcar
         enclosing_dir = node ? node.directory : tree.tree_mirror.path
         new_dir_name = uniq_name(enclosing_dir, "New Directory")
         new_dir_path = File.join(enclosing_dir, new_dir_name)
-        adapter = DirController.adapter(node, tree)
-        adapter.mkdir(new_dir_path)
+        fs.mkdir(new_dir_path)
         tree.refresh
         tree.expand(node)
         new_dir_node = DirMirror::Node.cache[new_dir_path]
@@ -159,6 +154,7 @@ module Redcar
 
       class BulkRenameController
         include Redcar::HtmlController
+        include LocalFilesystem
 
         attr_reader :pairs, :match_pattern, :replace_pattern
 
@@ -168,7 +164,6 @@ module Redcar
           @pairs = nodes.map {|node| [node, File.basename(node.path)] }
           @match_pattern = ""
           @replace_pattern = ""
-          @adapter = DirController.adapter(nodes.first, tree)
         end
 
         def title
@@ -191,7 +186,7 @@ module Redcar
             old_name = File.basename(node.path)
             new_name = transform_name(old_name)
             new_path = File.join(File.dirname(node.path), new_name)
-            conflicts = (@adapter.exists?(new_path) and new_name != old_name)
+            conflicts = (fs.exists?(new_path) and new_name != old_name)
             legal     = (new_name != "" and legal_path?(new_path))
             [new_name, conflicts, legal]
           end
@@ -208,7 +203,7 @@ module Redcar
             new_name = transform_name(old_name)
             next if old_name == new_name
             new_path = File.join(File.dirname(node.path), new_name)
-            @adapter.mv(node.path, new_path)
+            fs.mv(node.path, new_path)
           end
           @tab.close
           @tree.refresh
@@ -240,7 +235,7 @@ module Redcar
         result = Application::Dialog.message_box(msg, :type => :question, :buttons => :yes_no)
         if result == :yes
           nodes.each do |node|
-            node.adapter.delete(node.path)
+            fs.delete(node.path)
           end
           tree.refresh
         end
@@ -250,10 +245,9 @@ module Redcar
         new_path = File.expand_path(File.join(File.dirname(node.path), text))
         return if node.path == new_path
 
-        adapter = DirController.adapter(node, tree)
-        adapter.mv(node.path, new_path)
+        fs.mv(node.path, new_path)
         tree.refresh
-        new_node = DirMirror::Node.create_from_path(adapter, {:fullname => new_path, :type => node.type})
+        new_node = DirMirror::Node.create_from_path(:fullname => new_path, :type => node.type)
         tree.select(new_node)
       end
 

data/plugins/project/lib/project/dir_mirror.rb

@@ -11,11 +11,12 @@ module Redcar
       end
         
       include Redcar::Tree::Mirror
-      attr_reader :path, :adapter
+      include LocalFilesystem
+      
+      attr_reader :path
       
       # @param [String] a path to a directory
-      def initialize(path, adapter=Adapters::Local.new)
-        @adapter = adapter
+      def initialize(path)
         @changed = true
         @path = path
       end
@@ -26,7 +27,7 @@ module Redcar
       
       # Does the directory exist?
       def exists?
-        @adapter.exists?(@path) && @adapter.directory?(@path)
+        fs.exists?(@path) && fs.directory?(@path)
       end
       
       # Have the toplevel nodes changed?
@@ -44,7 +45,7 @@ module Redcar
       # The files and directories in the top of the directory.
       def top
         @changed = false
-        Node.create_all_from_path(@adapter, @path)
+        Node.create_all_from_path(@path)
       end
       
       # We specify a :file data type to take advantage of OS integration.
@@ -56,7 +57,7 @@ module Redcar
       #
       # @return [Node]
       def from_data(path)
-        Node.create_from_path(@adapter, {:fullname => path})
+        Node.create_from_path(:fullname => path)
       end
       
       # Turn the nodes into data.
@@ -64,39 +65,34 @@ module Redcar
         nodes.map {|node| node.path }
       end
       
-      def refresh_operation(tree)
-        @adapter.refresh_operation(tree) do
-          yield
-        end
-      end
-      
       class Node
         include Redcar::Tree::Mirror::NodeMirror
+        extend LocalFilesystem
 
-        attr_reader :path, :adapter
+        attr_reader :path
         attr_accessor :type, :is_empty_directory
 
-        def self.create_all_from_path(adapter, path)
-          fs = adapter.fetch_contents(path)
-          fs.reject! { |f| [".", ".."].include?(File.basename(f[:fullname])) }
+        def self.create_all_from_path(path)
+          list = fs.fetch_contents(path)
+          list.reject! { |f| [".", ".."].include?(File.basename(f[:fullname])) }
           unless DirMirror.show_hidden_files?
-            fs.reject! { |f| f[:type] == :file and Project::FileList.hide_file?(f[:fullname]) }
-            fs.reject! { |f| f[:type] == :dir and Project::FileList.hide_directory? f[:fullname] }
+            list.reject! { |f| f[:type] == :file and Project::FileList.hide_file?(f[:fullname]) }
+            list.reject! { |f| f[:type] == :dir and Project::FileList.hide_directory? f[:fullname] }
           end
-          fs.sort_by do |f|
+          list.sort_by do |f|
             File.basename(f[:fullname]).downcase
           end.sort_by do |f|
             f[:type] == :dir ? -1 : 1
-          end.map {|f| create_from_path(adapter, f) }
+          end.map {|f| create_from_path(f) }
         end
         
-        def self.create_from_path(adapter, f)
+        def self.create_from_path(f)
           if result = cache[f[:fullname]]
             result.type               = f[:type]
             result.is_empty_directory = f[:empty]
             result
           else
-            cache[f[:fullname]] = Node.new(adapter, f[:fullname], f[:type], f[:empty])
+            cache[f[:fullname]] = Node.new(f[:fullname], f[:type], f[:empty])
           end
         end
 
@@ -104,8 +100,7 @@ module Redcar
           @cache ||= {}
         end
         
-        def initialize(adapter, path, type, is_empty_directory)
-          @adapter            = adapter
+        def initialize(path, type, is_empty_directory)
           @path               = path
           @type               = type
           @is_empty_directory = is_empty_directory
@@ -155,7 +150,7 @@ module Redcar
           if file? or @is_empty_directory
             []
           else
-            Node.create_all_from_path(adapter, @path)
+            Node.create_all_from_path(@path)
           end
         end
 

data/plugins/project/lib/project/file_mirror.rb

@@ -9,13 +9,13 @@ module Redcar
     # which reflects a file.
     class FileMirror
       include Redcar::Document::Mirror
+      include LocalFilesystem
       
-      attr_reader :path, :adapter, :timestamp
+      attr_reader :path, :timestamp
       
       # @param [String] a path to a file
-      def initialize(path, adapter=Adapters::Local.new)
+      def initialize(path)
         @path = path
-        @adapter = adapter
       end
       
       # Load the contents of the file from disk
@@ -24,7 +24,7 @@ module Redcar
       def read
         return "" unless exists?
         contents = load_contents
-        @timestamp = @adapter.mtime(@path)
+        @timestamp = fs.mtime(@path)
         contents
       end
       
@@ -32,7 +32,7 @@ module Redcar
       #
       # @return [Boolean]
       def exists?
-        @adapter.exists?(@path)
+        fs.exists?(@path)
       end
       
       # Has the file changed since the last time it was read or commited?
@@ -41,7 +41,7 @@ module Redcar
       # @return [Boolean]
       def changed?
         begin
-          !@timestamp or @timestamp < @adapter.mtime(@path)
+          !@timestamp or @timestamp < fs.mtime(@path)
         rescue Errno::ENOENT
           false
         end
@@ -49,7 +49,7 @@ module Redcar
       
       def changed_since?(time)
         begin
-          !@timestamp or (!time and changed?) or (time and time < @adapter.mtime(@path))
+          !@timestamp or (!time and changed?) or (time and time < fs.mtime(@path))
         rescue Errno::ENOENT
           false
         end
@@ -61,7 +61,7 @@ module Redcar
       # @return [unspecified]
       def commit(contents)
         save_contents(contents)
-        @timestamp = @adapter.mtime(@path)
+        @timestamp = fs.mtime(@path)
       end
       
       # The filename.
@@ -74,11 +74,11 @@ module Redcar
       private
       
       def load_contents
-        @adapter.load(@path)
+        fs.load(@path)
       end
       
       def save_contents(contents)
-        @adapter.save(@path, contents)
+        fs.save(@path, contents)
       end
     end
   end

data/plugins/project/lib/project/find_file_dialog.rb

@@ -21,34 +21,26 @@ module Redcar
         paths.uniq
       end
 
-      # search out and expand duplicates in shortened paths to their full length
-      def expand_duplicates(display_paths, full_paths)
-        duplicates = duplicates(display_paths)
-        display_paths.each_with_index do |dp, i|
-          if duplicates.include? dp
-            display_paths[i] = display_path(full_paths[i], project.path.split('/')[0..-2].join('/'))
-          end
-        end
-      end
-
-      def update_list(filter)
-        paths = paths_for filter
-        @last_list = paths
-        full_paths = paths
+      def update_list(filter) 
+        full_paths = paths_for(filter)
         display_paths = full_paths.map { |path| display_path(path) }
         if display_paths.uniq.length < full_paths.length
           display_paths = expand_duplicates(display_paths, full_paths)
         end
-        display_paths
+        result = []
+        display_paths.zip(full_paths) do |display_path, full_path|
+          result << {:name => display_path, :path => full_path, :icon => :file}
+        end
+        result
       end
 
-      def selected(text, ix, closing=false)
-        if @last_list
+      def selected(item, ix)
+        if item[:path] and File.exist?(item[:path])
           close
           if win = Redcar.app.focussed_window and tab = win.focussed_notebook_tab and doc = tab.document
             Redcar.app.navigation_history.save(doc)
           end
-          OpenFileCommand.new(@last_list[ix]).run
+          OpenFileCommand.new(item[:path]).run
           cur_doc = Redcar.app.focussed_window.focussed_notebook_tab.document
           Redcar.app.navigation_history.save(cur_doc) if cur_doc
         end
@@ -66,6 +58,16 @@ module Redcar
         Set[*enum.select {|k| enum.index(k) != enum.rindex(k) }]
       end
 
+      # search out and expand duplicates in shortened paths to their full length
+      def expand_duplicates(display_paths, full_paths)
+        duplicates = duplicates(display_paths)
+        display_paths.each_with_index do |dp, i|
+          if duplicates.include? dp
+            display_paths[i] = display_path(full_paths[i], project.path.split('/')[0..-2].join('/'))
+          end
+        end
+      end
+
       def display_path(path, first_remove_this_prefix = nil)
         n = -3
         if first_remove_this_prefix and path.index(first_remove_this_prefix) == 0