redcar 0.11.0dev → 0.11

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

@@ -8,7 +8,7 @@ module Redcar
   end
 
   class Project
-    class FileOpenCommand < Command
+    class OpenFileCommand < Command
       def initialize(path = nil, adapter = Adapters::Local.new)
         @path = path
         @adapter = adapter
@@ -17,7 +17,15 @@ module Redcar
       def execute
         path = get_path
         if path
-          Manager.open_file(path, @adapter)
+          if File.readable? path
+            Manager.open_file(path, @adapter)
+          else
+            Application::Dialog.message_box(
+              "Can't read #{path}, you don't have the permissions.",
+              :type => :error,
+              :buttons => :ok
+            )
+          end
         end
       end
 
@@ -134,23 +142,34 @@ module Redcar
     #  end
     #end
 
-    class FileSaveCommand < EditTabCommand
+    class SaveFileCommand < 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)
+          if File.writable? tab.edit_view.document.mirror.path
+            tab.edit_view.document.save!
+            Project::Manager.refresh_modified_file(tab.edit_view.document.mirror.path)
+          else
+            Application::Dialog.message_box(
+              "Can't save #{tab.edit_view.document.mirror.path}, you don't have the permissions.",
+              :type => :error,
+              :buttons => :ok
+            )
+            result = false
+          end
         else
-          FileSaveAsCommand.new.run
+          result = SaveFileAsCommand.new.run
         end
         tab.update_for_file_changes
+        result ||= true
+        return result
       end
     end
 
-    class FileSaveAsCommand < EditTabCommand
+    class SaveFileAsCommand < EditTabCommand
 
       def initialize(tab=nil, path=nil)
         @tab  = tab
@@ -160,12 +179,23 @@ module Redcar
       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)
+          if File.exists?(path) ? File.writable?(path) : File.writable?(File.dirname(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)
+          else
+            Application::Dialog.message_box(
+              "Can't save #{path}, you don't have the permissions.",
+              :type => :error,
+              :buttons => :ok
+            )
+            result = false
+          end
         end
+        result ||= true
+        return result
       end
 
       private
@@ -189,7 +219,7 @@ module Redcar
       def execute
         if path = get_path
           project = Manager.open_project_for_path(path)
-          project.refresh
+          project.refresh if project
         end
       end
 
@@ -232,9 +262,9 @@ module Redcar
 
     class RevealInProjectCommand < ProjectCommand
       def execute
-        if Project::Manager.reveal_file?(project)
+        if project
           tab = Redcar.app.focussed_window.focussed_notebook_tab
-          if tab.is_a?(EditTab)
+            if tab.is_a?(EditTab)
             return unless mirror = tab.edit_view.document.mirror and mirror.respond_to? :path
           else
             return
@@ -401,4 +431,4 @@ module Redcar
       end
     end
   end
-end
+end

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

@@ -10,7 +10,7 @@ module Redcar
 
       def activated(tree, node)
         if node.leaf?
-          FileOpenCommand.new(node.path, node.adapter).run
+          OpenFileCommand.new(node.path, node.adapter).run
         end
       end
 

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

@@ -78,9 +78,10 @@ module Redcar
 
         def self.create_all_from_path(adapter, path)
           fs = adapter.fetch_contents(path)
-          fs = fs.reject {|f| [".", ".."].include?(File.basename(f[:fullname]))}
+          fs.reject! { |f| [".", ".."].include?(File.basename(f[:fullname])) }
           unless DirMirror.show_hidden_files?
-            fs = fs.reject {|f| File.basename(f[:fullname]) =~ /^\./ }
+            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] }
           end
           fs.sort_by do |f|
             File.basename(f[:fullname]).downcase

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

@@ -3,7 +3,9 @@ module Redcar
     class DrbService
       def initialize
         address = "druby://127.0.0.1:#{DRB_PORT}"
-        @drb = DRb.start_service(address, self)
+        Redcar.log.benchmark("start drb service") do
+          @drb = DRb.start_service(address, self)
+        end
       rescue Errno::EADDRINUSE => e
         puts 'warning--not starting listener (perhaps theres another Redcar already open?)' + e + ' ' + address
       end

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

@@ -3,6 +3,77 @@ module Redcar
     class FileList
       attr_reader :path
     
+      def self.shared_storage
+        @shared_storage ||= begin
+          storage = Plugin::SharedStorage.new('shared__ignored_files')
+          storage.set_or_update_default('ignored_file_patterns', [/^\./, /\.rbc$/])
+          storage.set_or_update_default('not_hidden_files', ['.gitignore', '.gemtest'])
+          storage.set_or_update_default('ignored_directory_patterns', [/^\./, /^\.(git|yardoc|svn)$/])
+          storage.set_or_update_default('not_hidden_directories', ['.directory_that_should_not_be_hidden'])
+          storage.save
+        end
+      end
+
+      def self.hidden_files_pattern
+        ignored_file_patterns
+      end
+
+      def self.ignored_file_patterns
+        shared_storage['ignored_file_patterns']
+      end
+
+      def self.not_hidden_files
+        shared_storage['not_hidden_files']
+      end
+
+      def self.hide_file?(file)
+        file = File.basename(file)
+        return false if not_hidden_files.include?(file)
+        ignored_file_patterns.any? { |re| file =~ re }
+      end
+      
+      def self.ignored_directory_patterns
+        shared_storage['ignored_directory_patterns']
+      end
+
+      def self.not_hidden_directories
+        shared_storage['not_hidden_directories']
+      end
+
+      def self.hide_directory?(dir)
+        dir = File.basename(dir)
+        return false if not_hidden_directories.include?(dir)
+        ignored_directory_patterns.any? { |re| dir =~ re }
+      end
+      
+      def self.hide_file_path?(file_path)
+        basename = File.basename(file_path)
+        if ignored_file_patterns.any? { |re| basename =~ re } and
+          !not_hidden_files.include?(basename)
+          return true
+        end
+        
+        dirs = file_path.split("/")[0..-2]
+        if ignored_directory_patterns.any? { |re| dirs.any? { |dir| dir =~ re } }
+          return true
+        end
+        false
+      end
+      
+      # Adds a pattern to the ignored_file_patterns option
+      #
+      # @param [String] file_pattern pattern of the file
+      def self.add_hide_file_pattern(file_pattern)
+        shared_storage['ignored_file_patterns'] = shared_storage['ignored_file_patterns'] + [Regexp.new(file_pattern)]
+      end
+
+      # Adds a pattern to the ignored_directory_patterns option
+      #
+      # @param [String] directory_pattern pattern of the directory
+      def self.add_hide_directory_pattern(directory_pattern)
+        shared_storage['ignored_directory_patterns'] = shared_storage['ignored_directory_patterns'] + [Regexp.new(directory_pattern)]
+      end
+
       def initialize(path)
         @path = File.expand_path(path)
         @files = {}
@@ -48,28 +119,35 @@ module Redcar
             else
               stat = File.lstat(file)
             end
-            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
+            
+            if stat.directory?
+              next if FileList.hide_directory?(file)
+            else
+              next if FileList.hide_file?(file)
+            end
+            
+            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
-                ensure
-                  d.close
+                  paths.unshift f.untaint
                 end
+              ensure
+                d.close
               end
             end
           rescue Errno::ENOENT, Errno::EACCES
@@ -79,4 +157,4 @@ module Redcar
       end
     end
   end
-end
+end

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

@@ -1,19 +1,9 @@
 require 'set'
 
 module Redcar
-  class Project    
+  class Project
 
     class FindFileDialog < FilterListDialog
-      def self.storage
-        @storage ||= begin
-          storage = Plugin::Storage.new('find_file_dialog')
-          storage.set_default('ignore_file_patterns', false)
-          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
-
       attr_reader :project
 
       def initialize(project)
@@ -55,7 +45,7 @@ module Redcar
       def selected(text, ix, closing=false)
         if @last_list
           close
-          FileOpenCommand.new(@last_list[ix]).run
+          OpenFileCommand.new(@last_list[ix]).run
         end
       end
 
@@ -90,25 +80,19 @@ module Redcar
         end
       end
 
-      def ignore_regexes
-        self.class.storage['ignore_files_that_match_these_regexes']
-      end
-
-      def ignore_file?(filename)
-        if self.class.storage['ignore_file_patterns']
-          ignore_regexes.any? {|re| re =~ filename }
-        end
-      end
-
       def find_files_from_list(text, file_list)
         re = make_regex(text)
         file_list.select do |fn|
-          not ignore_file?(fn) and match_substring(fn) =~ re
+          match_substring(fn) =~ re
         end
       end
 
       def find_files(text, directories)
-        files = project.all_files.sort.select {|fn| not ignore_file?(fn)}
+        begin
+          files = project.all_files.sort
+        rescue => e
+          p e
+        end
         filter_and_rank_by(files, text) {|fn| match_substring(fn) }
       end
 

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

@@ -80,9 +80,10 @@ module Redcar
 
       def self.init_window_closed_hooks
         Redcar.app.add_listener(:window_about_to_close) do |win|
-          project = in_window(win)
-          project.close if project
-          self.save_file_list(win)
+          if project = in_window(win)
+            project.close
+            self.save_file_list(win)
+          end
         end
       end
 
@@ -113,7 +114,7 @@ module Redcar
       end
 
       def self.reveal_file?(project)
-        if project and tree = project.tree
+        if project and project.window and tree = project.tree
           if reveal_files? and project.window.trees_visible?
             ftree = project.window.treebook.focussed_tree
             unless tree != ftree and reveal_file_only_when_tree_focussed?
@@ -244,7 +245,7 @@ module Redcar
       end
 
       PROJECT_LOCKED_MESSAGE = "Project appears to be locked by another Redcar process!\nOpen anway?"
-      
+
       # Opens a new Tree with a DirMirror and DirController for the given
       # path, in a new window.
       #
@@ -257,11 +258,11 @@ module Redcar
           end
         end
         project = Project.new(path)
-        should_open = true
+        should_open = :yes
         if project.locked?
           should_open = Application::Dialog.message_box(PROJECT_LOCKED_MESSAGE, :type => :warning, :buttons => :yes_no)
         end
-        if should_open
+        if should_open == :yes
           win = Redcar.app.focussed_window
           win = Redcar.app.new_window if !win or Manager.in_window(win)
           project.open(win) if project.ready?
@@ -395,17 +396,17 @@ module Redcar
         Menu::Builder.build do
           sub_menu "File" do
             group(:priority => 0) do
-              item "Open", Project::FileOpenCommand
+              item "Open", Project::OpenFileCommand
               item "Reload File", Project::FileReloadCommand
               item "Open Directory", Project::DirectoryOpenCommand
               item "Open Recent...", Project::FindRecentCommand
-              
+
               separator
-              item "Save", Project::FileSaveCommand
-              item "Save As", Project::FileSaveAsCommand
+              item "Save", Project::SaveFileCommand
+              item "Save As", Project::SaveFileAsCommand
             end
           end
-          
+
           sub_menu "Project", :priority => 15 do
             group(:priority => :first) do
               item "Find File", Project::FindFileCommand
@@ -416,6 +417,32 @@ module Redcar
         end
       end
 
+      def self.close_tab_guard(tab)
+        if tab.respond_to?(:edit_view) && tab.edit_view.document.modified?
+          tab.focus
+          result = Application::Dialog.message_box(
+          "This tab has unsaved changes. \n\nSave before closing?",
+          :buttons => :yes_no_cancel
+          )
+          case result
+          when :yes
+            # check if the tab was saved properly,
+            # it would return false for example if the permission is not granted
+            if Project::SaveFileCommand.new(tab).run
+              true
+            else
+              false
+            end
+          when :no
+            true
+          when :cancel
+            false
+          end
+        else
+          true
+        end
+      end
+
       # Uses our own context menu hook to provide context menu entries
       # @return [Menu]
       def self.project_context_menus(tree, node, controller)
@@ -462,6 +489,35 @@ module Redcar
           end
           group(:priority => 75) do
             separator
+
+            if node and node.leaf?
+              item("Hide this file") do
+                input = Application::Dialog.input(
+                  "Hide file",
+                  "Please enter a pattern to hide this kind of files or press OK to hide this file only.",
+                  '^' + Regexp.escape(node.text) + '$'
+                )
+                if input[:button] == :ok
+                  Project::FileList.add_hide_file_pattern(input[:value])
+                  Project::Manager.focussed_project.refresh
+                end
+              end
+            end
+
+            if node and node.directory?
+              item('Hide this directory') do
+                input = Application::Dialog.input(
+                  'Hide directory',
+                  'Please enter a pattern to hide this kind of directories or press OK to hide this directory only.',
+                  '^' + Regexp.escape(node.text) + '$'
+                )
+                if input[:button] == :ok
+                  Project::FileList.add_hide_directory_pattern(input[:value])
+                  Project::Manager.focussed_project.refresh
+                end
+              end
+            end
+
             if DirMirror.show_hidden_files?
               item("Hide Hidden Files") do
                 DirMirror.show_hidden_files = false