redcar 0.3.4.3 → 0.3.5

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

@@ -0,0 +1,128 @@
+module Redcar
+  class ProjectCommand < Command
+    sensitize :open_project
+    
+    def project
+      Project::Manager.in_window(win)
+    end
+  end
+
+  class Project
+    class FileOpenCommand < Command
+      def initialize(path = nil)
+        @path = path
+      end
+    
+      def execute
+        path = get_path
+        if path
+          Manager.open_file(path)
+        end
+      end
+      
+      private
+      
+      def get_path
+        @path || begin
+          if path = Application::Dialog.open_file(:filter_path => Manager.filter_path)
+            Manager.storage['last_dir'] = File.dirname(File.expand_path(path))
+            path
+          end
+        end
+      end
+    end
+    
+    class FileSaveCommand < EditTabCommand
+      def initialize(tab=nil)
+        @tab = tab
+      end
+
+      def execute
+        if tab.edit_view.document.mirror
+          tab.edit_view.document.save!
+          Project::Manager.refresh_modified_file(tab.edit_view.document.mirror.path)
+        else
+          FileSaveAsCommand.new.run
+        end
+      end
+    end
+    
+    class FileSaveAsCommand < EditTabCommand
+      
+      def initialize(tab=nil, path=nil)
+        @tab  = tab
+        @path = path
+      end
+
+      def execute
+        path = get_path
+        if path
+          contents = tab.edit_view.document.to_s
+          new_mirror = FileMirror.new(path)
+          new_mirror.commit(contents)
+          tab.edit_view.document.mirror = new_mirror
+          Project::Manager.refresh_modified_file(tab.edit_view.document.mirror.path)
+        end
+      end
+      
+      private
+      
+      def get_path
+        @path || begin
+          if path = Application::Dialog.save_file(:filter_path => Manager.filter_path)
+            Manager.storage['last_dir'] = File.dirname(File.expand_path(path))
+            path
+          end
+        end
+      end
+    end
+    
+    class DirectoryOpenCommand < Command
+          
+      def initialize(path=nil)
+        @path = path
+      end
+      
+      def execute
+        if path = get_path
+          project = Manager.open_project_for_path(path)
+          project.refresh
+        end
+      end
+      
+      private
+
+      def get_path
+        @path || begin
+          if path = Application::Dialog.open_directory(:filter_path => Manager.filter_path)
+            Manager.storage['last_dir'] = File.dirname(File.expand_path(path))
+            path
+          end
+        end
+      end
+    end
+    
+    class DirectoryCloseCommand < ProjectCommand
+
+      def execute
+        project.close
+      end
+    end
+    
+    class RefreshDirectoryCommand < ProjectCommand
+    
+      def execute
+        project.refresh
+      end
+    end
+    
+    class FindFileCommand < ProjectCommand
+     
+      def execute
+        dialog = FindFileDialog.new(Manager.focussed_project)
+        dialog.open
+      end
+    end
+    
+  end
+end

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

@@ -33,7 +33,11 @@ module Redcar
       
       class Node
         def self.create_all_from_path(path)
-          Dir[path + "/*"].sort_by {|fn| fn.downcase }.map {|fn| create_from_path(fn) }
+          Dir[path + "/*"].sort_by do |fn|
+            File.basename(fn).downcase
+          end.sort_by do |path|
+            File.directory?(path) ? -1 : 1
+          end.map {|fn| create_from_path(fn) }
         end
         
         def self.create_from_path(path)

data/plugins/project/lib/project/drb_service.rb

@@ -2,65 +2,55 @@ module Redcar
   class Project
     class DrbService
       def initialize
-        # TODO choose a random port instead of hard coded
         begin
-          address = "druby://127.0.0.1:9999"
+          address = "druby://127.0.0.1:#{DRB_PORT}"
           @drb = DRb.start_service(address, self)
         rescue Errno::EADDRINUSE => e
           puts 'warning--not starting listener (perhaps theres another Redcar already open?)' + e + ' ' + address
         end
       end
     
-      # opens an item as if from the command line for use via drb
       def open_item_drb(full_path)
         begin
           puts 'drb opening ' + full_path if $VERBOSE
           if File.directory? full_path
-            Redcar::ApplicationSWT.sync_exec {
-            
-              # open in any existing window that already has that dir open as a tree
-              # else in a new window
-              # open the window that already has this dir open
-              if Redcar.app.windows.length == 0 && Application.storage['last_open_dir'] == full_path
-                Project.restore_last_session
+            Redcar::ApplicationSWT.sync_exec do
+              if Redcar.app.windows.length == 0 and Application.storage['last_open_dir'] == full_path
+                Project::Manager.restore_last_session
               end
               
               if Redcar.app.windows.length > 0
-                window = Redcar.app.windows.find{|win| 
-                  # XXXX how can win be nil here?
-                  win && win.treebook.trees.find{|t| 
-                    t.tree_mirror.is_a?(Redcar::Project::DirMirror) && t.tree_mirror.path == full_path
-                  }
-                }            
+                window = Redcar.app.windows.find do |win| 
+                  next unless win
+                  win.treebook.trees.find do |t| 
+                    t.tree_mirror.is_a?(Redcar::Project::DirMirror) and t.tree_mirror.path == full_path
+                  end
+                end        
               end
-              window ||= Redcar.app.new_window          
-              Project.open_dir(full_path, window)
+              Project::Manager.open_project_for_path(full_path)
               Redcar.app.focussed_window.controller.bring_to_front
-              
-            }
+            end
             'ok'
           elsif full_path == 'just_bring_to_front'          
-            Redcar::ApplicationSWT.sync_exec {
+            Redcar::ApplicationSWT.sync_exec do
               if Redcar.app.windows.length == 0
-                Project.restore_last_session
+                Project::Manager.restore_last_session
               end
               Redcar.app.focussed_window.controller.bring_to_front
-            }
+            end
             'ok'
-          else
-            # existing or not (yet) existing file
-            Redcar::ApplicationSWT.sync_exec {
+          elsif File.file?(full_path)
+            Redcar::ApplicationSWT.sync_exec do
               if Redcar.app.windows.length == 0
-                Project.restore_last_session
+                Project::Manager.restore_last_session
               end
-              FileOpenCommand.new(full_path).execute
+              Project::Manager.open_file(full_path)
               Redcar.app.focussed_window.controller.bring_to_front
-            }
+            end
             'ok'            
           end
         rescue Exception => e
-          # normally drb would swallow these
-          puts 'drb got exception:' + e, e.backtrace
+          puts 'drb got exception:' + e.class + " " + e.message, e.backtrace
           raise e
         end 
       end

data/plugins/project/lib/project/file_list.rb

@@ -0,0 +1,76 @@
+module Redcar
+  class Project
+    class FileList
+      attr_reader :path
+    
+      def initialize(path)
+        @path = File.expand_path(path)
+        @files = {}
+      end
+      
+      def all_files
+        @files.keys
+      end
+      
+      def contains?(file)
+        @files[file]
+      end
+      
+      def update(paths=nil)
+        if paths
+          @files = @files.merge(find(*paths))
+        else
+          @files = find(path)
+        end
+      end
+      
+      def changed_since(time)
+        result = {}
+        @files.each do |file, mtime|
+          if mtime.to_i >= time.to_i - 1
+            result[file] = mtime
+          end
+        end
+        result
+      end
+      
+      private
+      
+      def find(*paths)
+        files = {}
+        paths.collect!{|d| d.dup}
+        while file = paths.shift
+          begin
+            stat = File.lstat(file)
+            unless file =~ /\.git|\.yardoc|\.svn/
+              unless stat.directory?
+                files[file.dup] = stat.mtime
+              end
+              next unless File.exist? file
+              if stat.directory?
+                d = Dir.open(file)
+                begin
+                  for f in d
+                    next if f == "." or f == ".."
+                    if File::ALT_SEPARATOR and file =~ /^(?:[\/\\]|[A-Za-z]:[\/\\]?)$/
+                      f = file + f
+                    elsif file == "/"
+                      f = "/" + f
+                    else
+                      f = File.join(file, f)
+                    end
+                    paths.unshift f.untaint
+                  end
+                ensure
+                  d.close
+                end
+              end
+            end
+          rescue Errno::ENOENT, Errno::EACCES
+          end
+        end
+        files
+      end
+    end
+  end
+end

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

@@ -39,7 +39,19 @@ module Redcar
       #
       # @return [Boolean]
       def changed?
-        !@timestamp or @timestamp < File.stat(@path).mtime
+        begin
+          !@timestamp or @timestamp < File.stat(@path).mtime
+        rescue Errno::ENOENT
+          false
+        end
+      end
+      
+      def changed_since?(time)
+        begin
+          !@timestamp or (!time and changed?) or (time and time < File.stat(@path).mtime)
+        rescue Errno::ENOENT
+          false
+        end
       end
       
       # Save new file contents.

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

@@ -2,33 +2,21 @@ module Redcar
   class Project
   
     class FindFileDialog < FilterListDialog
-      def self.clear
-        if storage['clear_cache_on_refocus']
-          cached_dir_lists.clear 
-        end
-      end
-      
-      def self.storage
-        @storage ||= begin
-          storage = Plugin::Storage.new('find_file_dialog')
-          storage.set_default('clear_cache_on_refocus', true)
-          storage
-        end
-      end    
-      
-      def self.cached_dir_lists
-        @cached_dir_lists ||= {}
-      end
-
       def self.storage
         @storage ||= begin
           storage = Plugin::Storage.new('find_file_dialog')
-          storage.set_default('clear_cache_on_refocus', true)
           storage.set_default('ignore_files_that_match_these_regexes', [])
           storage.set_default('ignore_files_that_match_these_regexes_example_for_reference', [/.*\.class/i])
           storage
         end
-      end    
+      end
+      
+      attr_reader :project
+      
+      def initialize(project)
+        super()
+        @project = project
+      end
 
       def close
         super
@@ -36,10 +24,10 @@ module Redcar
       
       def update_list(filter)
         if filter.length < 2
-          paths = Project.recent_files_for(Project.focussed_project_path)
+          paths = recent_files
         else
-          paths = find_files_from_list(filter, Project.recent_files_for(Project.focussed_project_path)) + 
-                  find_files(filter, Project.focussed_project_path)             
+          paths = find_files_from_list(filter, recent_files) + 
+                  find_files(filter, project.path)
           paths.uniq! # in case there's some dupe's between the two lists
         end
                 
@@ -51,7 +39,7 @@ module Redcar
           duplicates = duplicates_as_hash(display_paths)
           display_paths.each_with_index do |dp, i|
             if duplicates[dp]
-              display_paths[i] = display_path(full_paths[i], Project.focussed_project_path.split('/')[0..-2].join('/'))
+              display_paths[i] = display_path(full_paths[i], project.path.split('/')[0..-2].join('/'))
             end
           end
         end
@@ -67,6 +55,11 @@ module Redcar
       
       private
           
+      def recent_files
+        files = project.recent_files
+        ((files[0..-2]||[]).reverse + [files[-1]]).compact
+      end
+    
       def duplicates_as_hash(enum)
         enum.inject(Hash.new(0)) {|h,v| h[v] += 1; h }.reject {|k,v| v == 1 }
       end
@@ -90,35 +83,12 @@ module Redcar
         end
       end
       
-      def files(directories)
-        FindFileDialog.cached_dir_lists[directories] ||= begin
-          files = []
-          s = Time.now
-          directories.each do |dir|
-            files += Dir[File.expand_path(dir + "/**/*")]
-          end
-          took = Time.now - s
-          puts "find files (#{directories.length} dirs) took #{took}s"
-          files.reject do |f|
-            begin
-              File.directory?(f)
-            rescue Errno::ENOENT
-              # File.directory? can throw no such file or directory even if File.exist?
-              # has returned true. For example this happens on some awful textmate filenames
-              # unicode in them.
-              true
-            end
-          end
-        end
+      def ignore_regexes
+        self.class.storage['ignore_files_that_match_these_regexes']
       end
       
-      def not_on_ignore_list(filename)
-        self.class.storage['ignore_files_that_match_these_regexes'].each do |re|
-          if re =~ filename
-            return false
-          end
-        end
-        true
+      def ignore_file?(filename)
+        ignore_regexes.any? {|re| re =~ filename }
       end
       
       def find_files_from_list(text, file_list)
@@ -129,7 +99,7 @@ module Redcar
       end
       
       def find_files(text, directories)
-        filter_and_rank_by(files(directories), text) do |fn|
+        filter_and_rank_by(project.all_files.sort, text) do |fn|
           fn.split("/").last
         end
       end