redcar 0.7 → 0.8

data/plugins/project/lib/project/adapters/local.rb

@@ -5,27 +5,31 @@ module Redcar
         def touch(new_file_path)
           FileUtils.touch(new_file_path)
         end
-        
+
         def mkdir(new_dir_path)
           FileUtils.mkdir(new_dir_path)
         end
-        
+
         def 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)
           File.file?(path)
         end
-        
+
         def directory?(path)
-          File.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)
           Dir.glob("#{path}/*", File::FNM_DOTMATCH).length <= 2
         end
-        
+
         def fetch_contents(path, force=false)
           Dir.glob("#{path}/*", File::FNM_DOTMATCH).map do |fn|
             is_dir = directory?(fn)
@@ -47,31 +51,32 @@ module Redcar
         def save(file, contents)
           File.open(file, "wb") {|f| f.print contents }
         end
-        
+
         def mtime(file)
-          File.stat(file).mtime
+          File.mtime(file)
         end
-        
+
         def exists?(file)
           File.exists?(file)
         end
-        
+
         def delete(file)
-          FileUtils.rm_rf(file)
+          FileUtils.rm_rf(file) unless Trash.recycle(file)
+          Manager.update_tab_for_path(file)
         end
-        
+
         def load_contents(file)
           File.open(file, 'rb') do |f|; f.read; end
         end
-        
+
         def 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/adapters/remote.rb

@@ -4,14 +4,14 @@ module Redcar
     module Adapters
       class Remote
         class PathDoesNotExist < StandardError; end
-        
+
         PROTOCOLS = {
           :ftp  => RemoteProtocols::FTP,
           :sftp => RemoteProtocols::SFTP
         }
-          
+
         attr_accessor :protocol, :host, :user, :password, :private_key_files
-        
+
         def initialize(protocol, host, user, password, private_key_files)
           @protocol = protocol
           @host = host
@@ -20,7 +20,7 @@ module Redcar
           @private_key_files = private_key_files
           target
         end
-        
+
         def target
           @target ||= PROTOCOLS[protocol].new(host, user, password, private_key_files)
         end
@@ -35,8 +35,9 @@ module Redcar
 
         def mv(path, new_path)
           target.mv(path, new_path)
+          Manager.update_tab_for_path(path,new_path)
         end
-        
+
         def mtime(file)
           target.mtime(file)
         end
@@ -44,11 +45,11 @@ module Redcar
         def file?(path)
           target.file?(path)
         end
-        
+
         def directory?(path)
           target.directory?(path)
         end
-        
+
         def fetch_contents(path)
           target.fetch_contents(path)
         end
@@ -60,27 +61,28 @@ module Redcar
         def save(file, contents)
           target.save(file)
         end
-        
+
         def stat(file)
           target.stat(file)
         end
-        
+
         def delete(file)
           target.delete(file)
+          Manager.update_tab_for_path(file)
         end
 
         def exists?(path)
           target.exists?(path)
         end
-        
+
         def load(file)
           target.load(file)
         end
-        
+
         def save(file, contents)
           target.save(file, contents)
         end
-        
+
         def refresh_operation(tree)
           visible_paths = tree.visible_nodes.map {|n| n.path}
           visible_dirs = visible_paths.map {|path| File.dirname(path) }.uniq
@@ -91,4 +93,4 @@ module Redcar
       end
     end
   end
-end
+end

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

@@ -158,6 +158,7 @@ module Redcar
         else
           FileSaveAsCommand.new.run
         end
+        tab.update_for_file_changes
       end
     end
 
@@ -244,19 +245,22 @@ module Redcar
 
     class RevealInProjectCommand < ProjectCommand
       def execute
-        tab = Redcar.app.focussed_window.focussed_notebook_tab
-        return unless tab.is_a?(EditTab)
-
-        path = tab.edit_view.document.mirror.path
-        tree = project.tree
-        current = tree.tree_mirror.top
-        while current.any?
-          ancestor_node = current.detect {|node| path =~ /^#{node.path}($|\/)/}
-          tree.expand(ancestor_node)
-          current = ancestor_node.children
+        if project and project.window.trees_visible?
+          tab = Redcar.app.focussed_window.focussed_notebook_tab
+          return unless tab.is_a?(EditTab) && tab.edit_view.document.mirror
+
+          path = tab.edit_view.document.mirror.path
+          tree = project.tree
+          current = tree.tree_mirror.top
+          while current.any?
+            ancestor_node = current.detect {|node| path =~ /^#{node.path}($|\/)/}
+            return unless ancestor_node
+            tree.expand(ancestor_node)
+            current = ancestor_node.children
+          end
+          tree.select(ancestor_node)
+          project.window.treebook.focus_tree(project.tree)
         end
-        tree.select(ancestor_node)
-        project.window.treebook.focus_tree(project.tree)
       end
     end
 
@@ -286,8 +290,11 @@ module Redcar
           ::Spoon.spawn(app, *options)
         else
           # TODO: This really needs proper escaping.
-          options = options.map {|o| "\"#{o}\""}.join(' ')
-          puts "Running: #{app} #{options}"
+          if options
+            options = options.map {|o| "\"#{o}\""}.join(' ')
+          else
+            options = ""
+          end
           Thread.new do
             system("#{app} #{options}")
             puts "  Finished: #{app} #{options}"
@@ -303,7 +310,8 @@ module Redcar
         preferred = Manager.storage['preferred_file_browser']
         case Redcar.platform
         when :osx
-          run_application('open', '-a', 'finder', path)
+          # Spoon doesn't seem to like `open`
+          system('open', '-a', 'Finder', path)
         when :windows
           run_application('explorer.exe', path.gsub("/","\\"))
         when :linux
@@ -335,7 +343,20 @@ module Redcar
         preferred = Manager.storage['preferred_command_line']
         case Redcar.platform
         when :osx
-          run_application('open', path)
+          unless preferred
+            preferred = "Terminal"
+            Manager.storage['preferred_command_line'] = preferred
+          end
+          command = <<-BASH.gsub(/^\s{12}/, '')
+            osascript <<END
+              tell application "#{preferred}"
+                do script "cd \\\"#{path}\\\""
+                activate
+              end tell
+            END
+          BASH
+          # Spoon doesn't seem to work with `osascript`
+          system(command)
         when :windows
           run_application('start cmd.exe', '/kcd ' + path.gsub("/","\\"))
         when :linux

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

@@ -3,39 +3,39 @@ module Redcar
   class Project
     class DirController
       include Redcar::Tree::Controller
-      
+
       def self.adapter(node, tree=nil)
         node ? node.adapter : tree.tree_mirror.adapter
       end
-      
+
       def activated(tree, node)
         if node.leaf?
           FileOpenCommand.new(node.path, node.adapter).run
         end
       end
-      
+
       def handle_error(tree, error)
         tree.close
         Application::Dialog.message_box(error.message, :type => :error)
       end
-      
+
       class DragController
         include Redcar::Tree::Controller::DragController
-        
+
         attr_reader :tree
-        
+
         def initialize(tree)
           @tree = tree
         end
-        
+
         def reorderable?
           false
         end
-        
+
         def can_drop?(nodes, target, position)
           nodes.all? {|node| droppable?(node, target)}
         end
-        
+
         def do_drop(nodes, target, position)
           paths = nodes.map {|node| node.path }
           non_nested_paths = remove_nested_paths(paths)
@@ -48,24 +48,24 @@ module Redcar
           end
           tree.refresh
         end
-        
+
         private
-        
+
         def droppable?(from_node, target_node)
           # you can always drop into the top level of the tree
           return true if target_node == nil
-          
+
           # can't drop a file/dir onto itself
           return false if from_node.path == target_node.path
-          
+
           # can't drop a directory into its children
           !child_of?(from_node.path, target_node.path)
         end
-        
+
         def child_of?(path, possible_child_path)
           possible_child_path =~ /^#{Regexp.escape(path)}\//
         end
-        
+
         # Removes paths which are children of higher level paths also being
         # dragged.
         def remove_nested_paths(paths)
@@ -79,14 +79,14 @@ module Redcar
           keep
         end
       end
-      
+
       def drag_controller(tree)
         DragController.new(tree)
       end
-      
+
       def right_click(tree, node)
         controller = self
-        
+
         menu = Menu.new
         Redcar.plugin_manager.objects_implementing(:project_context_menus).each do |object|
           # a lot of plugins will only really care about the node that was clicked
@@ -101,15 +101,15 @@ module Redcar
             puts("Invalid project_context_menus hook detected in "+object.class.name)
           end
         end
-        
+
         Application::Dialog.popup_menu(menu, :pointer)
       end
-      
+
       def new_file(tree, node)
         enclosing_dir = node ? node.directory : tree.tree_mirror.path
         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)
         tree.refresh
@@ -117,7 +117,7 @@ module Redcar
         new_file_node = DirMirror::Node.cache[new_file_path]
         tree.edit(new_file_node)
       end
-      
+
       def new_dir(tree, node)
         enclosing_dir = node ? node.directory : tree.tree_mirror.path
         new_dir_name = uniq_name(enclosing_dir, "New Directory")
@@ -129,7 +129,7 @@ module Redcar
         new_dir_node = DirMirror::Node.cache[new_dir_path]
         tree.edit(new_dir_node)
       end
-      
+
       def rename(tree, node)
         nodes = tree.selection
         if nodes.length == 1
@@ -138,7 +138,7 @@ module Redcar
           bulk_rename(tree, nodes)
         end
       end
-      
+
       def single_rename(tree, node)
         if node.text =~ /^(.*)\.[^\.]+$/
           tree.edit(node, 0, $1.length)
@@ -146,19 +146,19 @@ module Redcar
           tree.edit(node)
         end
       end
-      
+
       def bulk_rename(tree, nodes)
         tab = Redcar.app.focussed_window.new_tab(HtmlTab)
         controller = BulkRenameController.new(tab, tree, nodes)
         tab.html_view.controller = controller
         tab.focus
       end
-      
+
       class BulkRenameController
         include Redcar::HtmlController
-        
+
         attr_reader :pairs, :match_pattern, :replace_pattern
-        
+
         def initialize(tab, tree, nodes)
           @tab = tab
           @tree = tree
@@ -167,16 +167,16 @@ module Redcar
           @replace_pattern = ""
           @adapter = DirController.adapter(nodes.first, tree)
         end
-        
+
         def title
           "Bulk Rename"
         end
-      
+
         def index
           rhtml = ERB.new(File.read(File.join(File.dirname(__FILE__), "..", "..", "views", "bulk_rename.html.erb")))
           rhtml.result(binding)
         end
-        
+
         def refresh(new_match_pattern, new_replace_pattern)
           begin
             @match_pattern   = /#{new_match_pattern}/
@@ -198,29 +198,28 @@ module Redcar
           puts e.message
           puts e.backtrace
         end
-        
+
         def submit(params)
           @pairs.each do |node, _|
             old_name = File.basename(node.path)
             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)
           end
           @tab.close
           @tree.refresh
         end
-        
+
         private
-        
+
         def transform_name(old_name)
           old_name.sub(match_pattern, replace_pattern)
         end
-        
+
         def legal_path?(path)
           return true if File.exist?(path)
-          
+
           begin
             FileUtils.touch(path)
             FileUtils.rm(path)
@@ -230,7 +229,7 @@ module Redcar
           end
         end
       end
-      
+
       def delete(tree, _)
         nodes = tree.selection
         basenames = nodes.map {|node| File.basename(node.path) }
@@ -243,7 +242,7 @@ module Redcar
           tree.refresh
         end
       end
-      
+
       def edited(tree, node, text)
         new_path = File.expand_path(File.join(File.dirname(node.path), text))
         return if node.path == new_path
@@ -254,9 +253,9 @@ module Redcar
         new_node = DirMirror::Node.create_from_path(adapter, {:fullname => new_path, :type => node.type})
         tree.select(new_node)
       end
-      
+
       private
-      
+
       def uniq_name(path, name)
         return name unless File.exist?(File.join(path, name))
         i = 1
@@ -270,4 +269,4 @@ module Redcar
   end
 end
 
-    
+