redcar 0.10 → 0.11.0dev

data/plugins/html_view/features/support/env.rb

@@ -24,3 +24,19 @@ end
 After do
   reset_htmlview_fixtures
 end
+
+$:.push("plugins/html_view/vendor/nokogiri/lib")
+require 'nokogiri'
+
+p Nokogiri::HTML("<h1>afso</h1>")
+
+$:.push("plugins/html_view/vendor/capybara/lib")
+require 'capybara'
+require 'capybara/dsl'
+
+$:.push("plugins/html_view/vendor/capybara-sweet/lib")
+require 'capybara/driver/sweet'
+
+Capybara.default_driver = :sweet
+
+World(Capybara)

data/plugins/html_view/lib/html_view.rb

@@ -78,9 +78,13 @@ module Redcar
       @html_tab.title = controller.title
       func = RubyFunc.new(@html_tab.controller.browser, "rubyCall")
       func.controller = @controller
-      controller_action("index")
+      refresh
       attach_controller_listeners
     end
+    
+    def refresh
+      controller_action("index")
+    end
 
     def attach_controller_listeners
       @controller.add_listener(:reload_index) { controller_action("index") }

data/plugins/line_tools/lib/line_tools.rb

@@ -127,6 +127,14 @@ module Redcar
         if doc.selection?
           first_line_ix = doc.line_at_offset(doc.selection_range.begin)
           last_line_ix  = doc.line_at_offset(doc.selection_range.end)
+
+          if doc.selection_range.begin == doc.offset_at_inner_end_of_line(first_line_ix)
+            first_line_ix += 1
+          end
+          if doc.selection_range.end == doc.offset_at_line(last_line_ix)
+            last_line_ix -= 1
+          end
+
           text = doc.get_slice(doc.offset_at_line(first_line_ix),
                                doc.offset_at_line_end(last_line_ix))
           keep_selection = true
@@ -171,6 +179,14 @@ module Redcar
         if doc.selection?
           first_line_ix = doc.line_at_offset(doc.selection_range.begin)
           last_line_ix  = doc.line_at_offset(doc.selection_range.end)
+          
+          if doc.selection_range.begin == doc.offset_at_inner_end_of_line(first_line_ix)
+            first_line_ix += 1
+          end
+          if doc.selection_range.end == doc.offset_at_line(last_line_ix)
+            last_line_ix -= 1
+          end
+          
           text = doc.get_slice(doc.offset_at_line(first_line_ix),
                                doc.offset_at_line_end(last_line_ix))
           keep_selection = true

data/plugins/project/features/find_file.feature

@@ -15,6 +15,12 @@ Feature: Find file
     And I wait "0.4" seconds
     Then the filter dialog should have 0 entries
 
+  Scenario: No matching files when typing a directory name only
+    When I open the find file dialog
+    And I set the filter to "vendor"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 0 entries
+
   Scenario: One matching file
     When I open the find file dialog
     And I set the filter to "foo_spec"
@@ -29,6 +35,13 @@ Feature: Find file
     Then the filter dialog should have 1 entry
     And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
 
+  Scenario: One matching file when specifying a directory
+    When I open the find file dialog
+    And I set the filter to "lib_sym/foo"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 1 entry
+    And I should see "foo_lib.rb (myproject/lib_symlink)" at 0 the filter dialog
+
   Scenario: Two matching files
     When I open the find file dialog
     And I set the filter to "foo"
@@ -47,6 +60,21 @@ Feature: Find file
     And I should see "foo_lib.rb (myproject/lib_symlink)" at 1 the filter dialog
     And I should see "foo_spec.rb (myproject/spec)" at 2 the filter dialog
 
+ Scenario: Three matching files in similar directories
+    When I open the find file dialog
+    And I set the filter to "ven/bar"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 2 entries
+    And I should see "bar.rb (myproject/vendor)" at 0 the filter dialog
+    And I should see "bar.rb (vendor/plugins)" at 1 the filter dialog
+
+ Scenario: Two matching files in similar nested directories
+    When I open the find file dialog
+    And I set the filter to "v/p/bar"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 1 entry
+    And I should see "bar.rb (vendor/plugins)" at 0 the filter dialog
+
   Scenario: One matching file with arbitrary letters
     When I open the find file dialog
     And I set the filter to "fsc"

data/plugins/project/features/open_and_save_files.feature

@@ -71,3 +71,14 @@ Feature: Open and save files
     When I open a file
     Then the window "fixtures" should have 1 tab
 
+  Scenario: Choosing to open a large file
+    Given I will open a large file from the "open_file" dialog
+    And I will choose "yes" from the "message_box" dialog
+    When I open a file
+    Then there should be 1 edit tab
+
+  Scenario: Choosing not to open a large file
+    Given I will open a large file from the "open_file" dialog
+    And I will choose "no" from the "message_box" dialog
+    When I open a file
+    Then there should be 0 edit tabs

data/plugins/project/features/step_definitions/file_steps.rb

@@ -3,6 +3,11 @@ Given /^I have open a file$/ do
   Redcar::Project::FileOpenCommand.new.run
 end
 
+Given /^I will open a large file from the "([^"]*)" dialog$/ do |arg1|
+  Given %Q|I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog|
+  Redcar::Project::Manager.file_size_limit = 1
+end
+
 When /^I open a file$/ do
   Redcar::Project::FileOpenCommand.new.run
 end
@@ -48,4 +53,4 @@ end
 
 After do
   remove_test_files
-end
+end

data/plugins/project/features/support/env.rb

@@ -51,6 +51,7 @@ end
 
 Before do
   reset_project_fixtures
+  @original_file_size_limit = Redcar::Project::Manager.file_size_limit
 end
 
 After do
@@ -58,4 +59,5 @@ After do
   reset_project_fixtures
   delete_subproject_fixtures
   DrbShelloutHelper.kill_thread
+  Redcar::Project::Manager.file_size_limit = @original_file_size_limit
 end

data/plugins/project/lib/project.rb

@@ -27,8 +27,9 @@ require "project/drb_service"
 require "project/file_list"
 require "project/file_mirror"
 require "project/find_file_dialog"
+require "project/find_recent_dialog"
 require "project/manager"
-require "project/recent_directories"
+require "project/recent"
 require "project/sub_project"
 
 module Redcar
@@ -69,6 +70,7 @@ module Redcar
     end
 
     def open(win)
+      lock
       @window = win
       if current_project = Project.window_projects[window]
         current_project.close
@@ -80,20 +82,56 @@ module Redcar
       Redcar.plugin_manager.objects_implementing(:project_loaded).each do |i|
         i.project_loaded(self)
       end
-      RecentDirectories.store_path(path)
+      Recent.store_path(path)
       Manager.storage['last_open_dir'] = path
       Project.window_projects[window] = self
     end
+    
+    def lock
+      File.open(lock_filename, "w") do |fout|
+        fout.puts "#{$$}: Locked by #{$$} at #{Time.now}"
+      end
+    end
+    
+    def lock_filename
+      File.join(config_dir, "redcar.lock")
+    end
+    
+    def locked?
+      File.exist?(lock_filename)
+    end
+    
+    def unlock
+      if locked?
+        if locked_by_this_process?
+          FileUtils.rm_rf(lock_filename)
+        else
+          raise "locked by another process"
+        end
+      else
+        raise "project not locked"
+      end
+    end
+    
+    def locked_by_this_process?
+      return false unless locked?
+      locking_pid = File.read(lock_filename).split(":").first
+      locking_pid == $$.to_s
+    end
 
     def close
-      window.treebook.remove_tree(@tree)
-      Project.window_projects.delete(window)
-      window.title = Window::DEFAULT_TITLE
+      return unless @window
+      this_window = window
+      @window = nil
+      this_window.treebook.remove_tree(@tree)
+      Project.window_projects.delete(this_window)
+      this_window.title = Window::DEFAULT_TITLE
       Manager.open_project_sensitivity.recompute
       Redcar.plugin_manager.objects_implementing(:project_closed).each do |i|
         i.project_closed(self)
       end
       listeners = {}
+      unlock
     end
 
     def attach_listeners
@@ -183,7 +221,12 @@ module Redcar
 
     def send_refresh_to_plugins
       Redcar.plugin_manager.objects_implementing(:project_refresh_task_type).each do |object|
-        Redcar.app.task_queue.submit(object.project_refresh_task_type.new(self))
+        task = object.project_refresh_task_type.new(self)
+        if Redcar::Resource.compute_synchronously
+          task.execute
+        else
+          Redcar::Resource.task_queue.submit(task)
+        end
       end
     end
 

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

@@ -224,6 +224,12 @@ module Redcar
       end
     end
 
+    class FindRecentCommand < Command
+      def execute
+        FindRecentDialog.new.open
+      end
+    end
+
     class RevealInProjectCommand < ProjectCommand
       def execute
         if Project::Manager.reveal_file?(project)
@@ -296,10 +302,13 @@ module Redcar
     end
 
     class OpenDirectoryInExplorerCommand < OpenCommand
-      LinuxApps = { 'Thunar' => '%s',
-        'nautilus' => '%s',
+      LinuxApps = {
+        'Thunar'    => '%s',
+        'nautilus'  => '%s',
         'konqueror' => '%s',
-        'kfm' => '%s' }
+        'pcmanfm'   => '%s',
+        'kfm'       => '%s'
+      }
 
       def explorer_osx
         ['open -a Finder', path]
@@ -332,9 +341,12 @@ module Redcar
     end
 
     class OpenDirectoryInCommandLineCommand < OpenCommand
-      LinuxApps = { 'xfce4-terminal' => "--working-directory=%s",
+      LinuxApps = {
+        'xfce4-terminal' => "--working-directory=%s",
         'gnome-terminal' => "--working-directory=%s",
-        'konsole' => "--workdir %s" }
+        'lxterminal'     => "--working-directory=%s",
+        'konsole'        => "--workdir %s"
+      }
 
       def osx_terminal_script(preferred)
         if preferred.start_with? "iTerm"
@@ -389,4 +401,4 @@ module Redcar
       end
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 require 'set'
 
 module Redcar
-  class Project
+  class Project    
 
     class FindFileDialog < FilterListDialog
       def self.storage
@@ -101,17 +101,28 @@ module Redcar
       end
 
       def find_files_from_list(text, file_list)
-        re = make_regex(text.gsub(/\s/, ""))
-        file_list.select { |fn|
-          fn.split('/').last =~ re and not ignore_file?(fn)
-        }.compact
+        re = make_regex(text)
+        file_list.select do |fn|
+          not ignore_file?(fn) and match_substring(fn) =~ re
+        end
       end
 
       def find_files(text, directories)
         files = project.all_files.sort.select {|fn| not ignore_file?(fn)}
-        filter_and_rank_by(files, text.gsub(/\s/, "")) do |fn|
-          fn.split("/").last
-        end
+        filter_and_rank_by(files, text) {|fn| match_substring(fn) }
+      end
+
+      def match_substring(filename)
+        @folder_search ? filename.sub(project.path, "") : filename.split("/").last
+      end
+
+      def make_regex(text)
+        path = text.gsub(/\s/, "").split("/")
+        @folder_search = path.size > 1
+        folders = path[0...-1].map {|f| "(#{Regexp.escape(f)}).*/" }
+        file = path.last.each_char.map {|c| "(#{Regexp.escape(c)})[^/]*?" }.join
+        re_src = "#{folders.join}#{file}$"
+        Regexp.new(re_src, :options => Regexp::IGNORECASE)
       end
     end
   end

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

@@ -0,0 +1,30 @@
+module Redcar
+  class Project
+
+    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)
+      end
+
+      def selected(path, ix)
+        unless path[0..0] == "/"
+          path = Redcar.home_dir + "/" + path
+        end
+        if File.exist?(File.expand_path(path))
+          if File.directory?(path)
+            Project::Manager.open_project_for_path(path)
+            close
+          elsif File.file?(File.expand_path(path))
+            Project::Manager.open_file(path)
+            close
+          else
+            Project::Recent.remove_path(path)
+          end
+        end
+      end
+    end
+    
+  end
+end

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

@@ -163,6 +163,7 @@ 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)
+        return unless large_file_airbag(path)
         tab = win.new_tab(Redcar::EditTab)
         mirror = FileMirror.new(path, adapter)
         tab.edit_view.document.mirror = mirror
@@ -170,6 +171,22 @@ module Redcar
         tab.focus
       end
 
+      def self.file_too_large?(path)
+        File.size(path) > file_size_limit
+      end
+
+      # Prompts the user before opening the given path if it's above self.file_size_limit.
+      def self.large_file_airbag(path)
+        if file_too_large?(path)
+          Application::Dialog.message_box(
+            "This file is larger than 10MB which may crash Redcar.\n\nAre you sure you want to open it?",
+            :type => :warning,
+            :buttons => :yes_no) == :yes
+        else
+          true
+        end
+      end
+
       def self.find_projects_containing_path(path)
         open_projects.select {|p|
           p.contains_path?(path)
@@ -185,6 +202,7 @@ module Redcar
           window = project.window
         else
           window = windows_without_projects.first || Redcar.app.new_window
+          Project::Recent.store_path(path)
         end
         open_file_in_window(path, window, adapter)
         window.focus
@@ -225,15 +243,28 @@ module Redcar
         tab.focus
       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.
       #
       # @param [String] path  the path of the directory to view
       def self.open_project_for_path(path)
-        win = Redcar.app.focussed_window
-        win = Redcar.app.new_window if !win or Manager.in_window(win)
-        project = Project.new(path).tap do |p|
-          p.open(win) if p.ready?
+        open_projects.each do |project|
+          if project.path == path
+            project.window.focus
+            return
+          end
+        end
+        project = Project.new(path)
+        should_open = true
+        if project.locked?
+          should_open = Application::Dialog.message_box(PROJECT_LOCKED_MESSAGE, :type => :warning, :buttons => :yes_no)
+        end
+        if should_open
+          win = Redcar.app.focussed_window
+          win = Redcar.app.new_window if !win or Manager.in_window(win)
+          project.open(win) if project.ready?
         end
       end
 
@@ -367,20 +398,18 @@ module Redcar
               item "Open", Project::FileOpenCommand
               item "Reload File", Project::FileReloadCommand
               item "Open Directory", Project::DirectoryOpenCommand
-              #item "Open Remote...", Project::OpenRemoteCommand
-              lazy_sub_menu "Open Recent" do
-                Project::RecentDirectories.generate_menu(self)
-              end
-
+              item "Open Recent...", Project::FindRecentCommand
+              
               separator
               item "Save", Project::FileSaveCommand
               item "Save As", Project::FileSaveAsCommand
             end
           end
+          
           sub_menu "Project", :priority => 15 do
             group(:priority => :first) do
               item "Find File", Project::FindFileCommand
-              item "Refresh Directory", Project::RefreshDirectoryCommand
+              # item "Refresh Directory", Project::RefreshDirectoryCommand
             end
             item "Reveal Open File in Tree", :command => Project::ToggleRevealInProject, :type => :check, :active => Project::Manager.reveal_files?
           end
@@ -449,8 +478,10 @@ module Redcar
       end
 
       class << self
+        attr_accessor :file_size_limit
         attr_reader :open_project_sensitivity
       end
+      self.file_size_limit = 5242880
     end
   end
 end