redcar 0.3.10.1dev → 0.4

data/plugins/edit_view/features/step_definitions/tab_steps.rb

@@ -85,4 +85,8 @@ Then /^I should (not )?see "(.*)" in the edit tab$/ do |bool, content|
   focussed_tab.edit_view.document.to_s.include?(content).should matcher
 end
 
+Then /^my active tab should be "([^"]*)"$/ do |name|
+  focussed_tab.title.should == name
+end
+
 

data/plugins/edit_view/features/step_definitions/window_steps.rb

@@ -52,7 +52,7 @@ When /I close the window(?: "(.*)")?( with a command| through the gui)?/ do |tit
     win = nil
   end
   if how =~ /command/
-    Redcar::Top::CloseWindowCommand.new.run(win)
+    Redcar::Top::CloseWindowCommand.new(win).run
   else
     unless win
       display = Swt::Widgets::Display.get_current

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

@@ -14,6 +14,11 @@ module SwtTabHelpers
     get_tab_folders.first
   end
 
+  def get_browser_contents
+    live_document = "document.getElementsByTagName('html')[0].innerHTML"
+    focussed_tab.html_view.controller.execute("return #{live_document};").join('')
+  end
+
   def get_tab(tab_folder)
     item1 = tab_folder.getItems.to_a.first
     tab = Redcar.app.windows.first.notebooks.map{|n| n.tabs}.flatten.detect{|t| t.controller.item == item1}

data/plugins/edit_view/lib/edit_view.rb

@@ -256,6 +256,9 @@ module Redcar
     def self.theme=(theme)
       EditView.storage["theme"] = theme
       all_edit_views.each {|ev| ev.refresh_theme }
+      Redcar.plugin_manager.objects_implementing(:theme_changed_update).each do |object|
+        @cursor = object.theme_changed_update
+      end
     end
 
     def self.themes
@@ -478,7 +481,6 @@ module Redcar
             document.update_from_mirror
           end
         else
-          puts "updating document as has changed since #{@last_checked}"
           document.update_from_mirror
         end
       end

data/plugins/edit_view/lib/edit_view/document.rb

@@ -42,6 +42,16 @@ module Redcar
           end
         end
       end
+      Redcar.plugin_manager.objects_implementing(:document_cursor_listener).each do |object|
+        controller = object.document_cursor_listener
+        controller.document = self
+        @controllers.each do |key, value|
+          if controller.is_a?(key)
+            value << controller
+          end
+        end
+      end
+
     end
     
     def controllers(klass)

data/plugins/edit_view/lib/edit_view/document/mirror.rb

@@ -5,7 +5,7 @@ module Redcar
     # some other resource. They have methods for loading the contents from the 
     # resource and commiting changes.
     #
-    # Events: changed
+    # Events: change
     module Mirror
       include Redcar::Observable
       

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -44,6 +44,9 @@ module Redcar
       @handlers = []
       create_mate_text
       create_document
+      Redcar.plugin_manager.objects_implementing(:edit_view_gui_update).each do |object|
+        object.edit_view_gui_update(@mate_text)
+      end
       attach_listeners
       @mate_text.set_grammar_by_name("Plain Text")
       @model.set_grammar("Plain Text")

data/plugins/find-in-project/README.md

@@ -0,0 +1,9 @@
+## INSTALLATION
+
+    cd ~/.redcar/plugins
+    git clone git://github.com/jablkopp/find-in-project.git
+
+## USAGE
+
+    Ctrl + Shift + F (Linux)
+    Cmd + Shift + F (OSX)

data/plugins/find-in-project/TODO.md

@@ -0,0 +1,8 @@
+* Properly support search terms like <table>  (currently breaks search and views)
+* Better handle long lines
+* A line to summarize results, e.g. 18 lines matched in 5 files
+* Remember match case and with context values
+* Get grep to flush output for live search result display
+* Bring ack search up to date with grep features
+* Figure out why ack searching is failing (ack won't return results)
+* Per-project settings

data/plugins/find-in-project/lib/find_in_project.rb

@@ -0,0 +1,58 @@
+require 'find_in_project/controllers'
+require 'find_in_project/commands'
+require 'find_in_project/engines/ack'
+require 'find_in_project/engines/grep'
+
+module Redcar
+  class FindInProject
+    def self.keymaps
+      osx = Keymap.build('main', :osx) do
+        link "Cmd+Shift+F", FindInProject::OpenSearch
+      end
+
+      linwin = Keymap.build('main', [:linux, :windows]) do
+        link "Ctrl+Shift+F", FindInProject::OpenSearch
+      end
+
+      [linwin, osx]
+    end
+
+    def self.menus
+      Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "Find In Project", :priority => 64 do
+            item "Find In Project!", Redcar::FindInProject::OpenSearch
+            item "Edit Preferences", Redcar::FindInProject::EditPreferences
+          end
+        end
+      end
+    end
+
+    def self.storage
+      @storage ||= begin
+        storage = Plugin::Storage.new('find_in_project')
+        unless storage['search_engine']
+          engines = Array.new
+
+          # TODO: Ack search engine is broken, don't auto detect it yet
+          #ack = Redcar::FindInProject::Engines::Ack.detect
+          #if ack
+          #  storage.set_default('ack_path', ack)
+          #  engines << 'ack'
+          #end
+
+          grep = Redcar::FindInProject::Engines::Grep.detect
+          if grep
+            storage.set_default('grep_path', grep)
+            engines << 'grep'
+          end
+
+          storage.set_default('search_engine', engines.first)
+        end
+        storage.set_default('recent_queries', %w{})
+        storage.set_default('recent_options', %w{})
+        storage.save
+      end
+    end
+  end
+end

data/plugins/find-in-project/lib/find_in_project/commands.rb

@@ -0,0 +1,43 @@
+module Redcar
+  class FindInProject
+    class OpenSearch < Redcar::Command
+      def execute
+        if Project::Manager.focussed_project
+          if (tab = find_open_instance)
+            tab.html_view.controller = tab.html_view.controller # refresh
+          else
+            tab = win.new_tab(Redcar::HtmlTab)
+            tab.html_view.controller = Redcar::FindInProject::Controller.new
+          end
+          tab.focus
+        else
+          # warning
+          Application::Dialog.message_box("You need an open project to be able to use Find In Project!", :type => :error)
+        end
+      end
+
+      private
+
+      def find_open_instance
+        all_tabs = Redcar.app.focussed_window.notebooks.map { |nb| nb.tabs }.flatten
+        all_tabs.find do |t|
+          t.is_a?(Redcar::HtmlTab) && t.title == Redcar::FindInProject::Controller.new.title
+        end
+      end
+    end
+
+    class EditPreferences < Redcar::Command
+      def execute
+        Redcar.app.make_sure_at_least_one_window_open # open a new window if needed
+
+        Redcar::FindInProject.storage # populate the file if it isn't already
+
+        tab  = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
+        mirror = Project::FileMirror.new(File.join(Redcar.user_dir, "storage", "find_in_project.yaml"))
+        tab.edit_view.document.mirror = mirror
+        tab.edit_view.reset_undo
+        tab.focus
+      end
+    end
+  end
+end

data/plugins/find-in-project/lib/find_in_project/controllers.rb

@@ -0,0 +1,108 @@
+require 'erb'
+require 'cgi'
+
+module Redcar
+  class FindInProject
+    class Controller
+      include Redcar::HtmlController
+
+      def title
+        "Find In Project"
+      end
+
+      def index
+        @plugin_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+        @settings = Redcar::FindInProject.storage
+        @query = doc.selected_text if doc && doc.selection?
+        render('index')
+      end
+
+      def search(query, options, match_case, with_context)
+        @query = query
+        @options = options
+        @match_case = (match_case == 'true')
+        @with_context = (with_context == 'true')
+        Redcar::FindInProject.storage['recent_queries'] = add_or_move_to_top(@query, Redcar::FindInProject.storage['recent_queries'])
+        Redcar::FindInProject.storage['recent_options'] = add_or_move_to_top(@options, Redcar::FindInProject.storage['recent_options'])
+        search_in_background
+        nil
+      end
+
+      def open_file(file, line, query, match_case)
+        Project::Manager.open_file(File.join(Project::Manager.focussed_project.path, file))
+        doc.cursor_offset = doc.offset_at_line(line.to_i - 1)
+        regex = match_case ? /(#{query})/ : /(#{query})/i
+        index = doc.get_line(line.to_i - 1).index(regex)
+        if index
+          length = doc.get_line(line.to_i - 1).match(regex)[1].length
+          doc.set_selection_range(doc.cursor_line_start_offset + index, doc.cursor_line_start_offset + index + length)
+        end
+        doc.scroll_to_line(line.to_i)
+        nil
+      end
+
+      def close
+        @thread = nil # stop ant running searches
+      end
+
+      private
+
+      def render(action)
+        rhtml = ERB.new(File.read(File.join(File.dirname(__FILE__), "views", "#{action}.html.erb")))
+        rhtml.result(binding)
+      end
+
+      def doc
+        Redcar.app.focussed_window.focussed_notebook_tab.edit_view.document rescue false
+      end
+
+      def add_or_move_to_top(item, array)
+        return array if item.strip.empty?
+        array.delete_at(array.index(item)) if array.include?(item)
+        array.unshift(item)
+      end
+
+      def search_class
+        @search_class ||= case Redcar::FindInProject.storage['search_engine']
+        when 'grep'
+          Redcar::FindInProject::Engines::Grep
+        when 'ack'
+          Redcar::FindInProject::Engines::Ack
+        end
+      end
+
+      def search_in_background
+        execute("$('#results_container').html(\"<div id='searching'>Searching...</div>\");")
+
+        @thread = Thread.new do
+          begin
+            @results = search_class.search(@query, @options, @match_case, @with_context)
+            render_results
+          rescue => e
+            error = "<div id='errors'>
+              Opps! Something went wrong when trying to search!<br />
+              #{CGI.escapeHTML(e.message)}<br />
+              #{e.backtrace.collect { |b| CGI.escapeHTML(b) }.join('<br />')}
+            </div>"
+            execute("$('#results_container').html(\"#{escape_javascript(error)}\");")
+          end
+          @thread = nil
+        end
+      end
+
+      def render_results
+        if @results.nil? || @results.empty?
+          results = "<div id='no_results'>No results were found using the search terms you provided.</div>"
+        else
+          results = render('_results')
+        end
+        execute("$('#results_container').html(\"#{escape_javascript(results)}\");")
+      end
+
+      def escape_javascript(javascript)
+        escape_map = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
+        javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { escape_map[$1] }
+      end
+    end
+  end
+end

data/plugins/find-in-project/lib/find_in_project/engines/ack.rb

@@ -0,0 +1,42 @@
+module Redcar
+  class FindInProject
+    class Engines
+      class Ack
+        def self.detect
+          exe_path = `which ack`.strip
+          (exe_path =~ /^\//) ? exe_path : false
+        end
+
+        def self.exe_path
+          Redcar::FindInProject.storage['ack_path']
+        end
+
+        def self.version
+          `#{exe_path} --version`.split("\n")[0].split(' ').last
+        end
+
+        def self.search(query, options, match_case, with_context)
+          raise "Error: Trying to search using ack but ack has not been detected. Please edit the ack_path setting." if exe_path.empty?
+
+          args = ["--nocolor --nopager --nogroup -RH"] # no color, recursive, with filename
+          args[0] << 'i' unless match_case # case insensitive
+          args << options unless options.empty?
+
+          path = Project::Manager.focussed_project.path
+          organise_results(`cd #{path}; #{exe_path} #{args.join(' ')} "#{query}" .`)
+        end
+
+        def self.organise_results(raw)
+          results = Hash.new
+          raw.split("\n").each do |line|
+            parts = line.split(':')
+            file, line, text = parts.shift, parts.shift.to_i, parts.join(':')
+            results[file] ||= Array.new
+            results[file] << [line, text]
+          end
+          results.sort
+        end
+      end
+    end
+  end
+end

data/plugins/find-in-project/lib/find_in_project/engines/grep.rb

@@ -0,0 +1,52 @@
+module Redcar
+  class FindInProject
+    class Engines
+      class Grep
+        def self.detect
+          exe_path = `which grep`.strip
+          (exe_path =~ /^\//) ? exe_path : false
+        end
+
+        def self.exe_path
+          Redcar::FindInProject.storage['grep_path']
+        end
+
+        def self.version
+          `#{exe_path} --version`.split("\n")[0].split(' ').last
+        end
+
+        def self.search(query, options, match_case, with_context)
+          raise "Error: Trying to search using grep but grep has not been detected. Please edit the grep_path setting." if exe_path.empty?
+
+          args = ["-RHInE"] # recursive, with filename, no binaries, with line numbers, extended regex
+          args[0] << 'i' unless match_case # case insensitive
+          args << '--before-context=2 --after-context=2' if with_context # 2 lines before and after each result
+          args << options unless options.empty?
+
+          path = Project::Manager.focussed_project.path
+          organise_results(`cd #{path}; #{exe_path} #{args.join(' ')} "#{query}" .`)
+        end
+
+        def self.organise_results(raw)
+          results = Hash.new
+          raw.split("\n").each do |line|
+            if line == '--'
+              @divide_next = true
+            else
+              line =~ /^(.*)[\:\-](\d+)[\:\-](.*)$/
+              file, line, text = $1, $2.to_i, $3
+              results[file] ||= Array.new
+              if @divide_next
+                results[file] << [:divide, ''] if file == @last_file
+                @divide_next = false
+              end
+              results[file] << [line, text]
+              @last_file = file
+            end
+          end
+          results.sort
+        end
+      end
+    end
+  end
+end

data/plugins/find-in-project/lib/find_in_project/stylesheets/style.css

@@ -0,0 +1,205 @@
+* {
+  margin: 0;
+  padding: 0;
+  font-weight: normal;
+  font-size: 14px;
+}
+
+#search_container {
+  background-color: #eee;
+  width: 100%;
+  margin: -8px 0px 20px -8px;
+  padding: 16px 8px 10px 0;
+  border-bottom: 2px solid #ddd;
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+
+#search_container table {
+  width: 100%;
+}
+
+#search_container table td {
+  padding: 3px 0;
+  vertical-align: top;
+  padding-left: 10px;
+}
+
+#search_container .input .label {
+  width: 100px;
+  text-align: right;
+}
+
+#search_container .input .field input {
+  width: 100%;
+  height: 20px;
+}
+
+#search_container .input .expand {
+  width: 20px;
+  padding: 3px 0px;
+}
+
+#search_container .input .expand a {
+  color: black;
+  font-weight: bold;
+  text-decoration: none;
+  display: block;
+  width: 20px;
+  height: 18px;
+  background-color: #777;
+  border: 1px solid #000;
+  text-align: center;
+  color: #fff;
+}
+
+#search_container .controls label {
+  font-size: 13px;
+  margin-right: 10px;
+}
+
+#search_container .controls #search {
+  float: right;
+}
+
+#recent_queries {
+  position: absolute;
+  top: 41px;
+  left: 124px;
+  right: 34px;
+}
+
+#recent_options {
+  position: absolute;
+  top: 69px;
+  left: 124px;
+  right: 34px;
+}
+
+#recent_queries,
+#recent_options {
+  border: 1px solid #000;
+  background-color: #fff;
+}
+
+#recent_queries ul,
+#recent_options ul {
+  list-style: none;
+  height: 100px;
+  overflow: auto;
+}
+
+#recent_queries ul li,
+#recent_options ul li {
+  padding: 3px 10px;
+}
+
+#recent_queries ul li:hover,
+#recent_options ul li:hover {
+  background-color: #EDEDFD;
+  cursor: hand;
+}
+
+#results_container {
+  margin-top: 130px;
+}
+
+#no_results,
+#searching {
+  font-weight: bold;
+  font-size: 16px;
+  text-align: center;
+}
+
+#results {
+  padding: 0 10px 10px 10px;
+}
+
+#results table {
+  width: 100%;
+  padding: 0px;
+  margin: 0px;
+  border-spacing: 0px;
+}
+
+#results .filename,
+#results .line_no {
+  background-color: #eee;
+  padding: 3px 10px;
+}
+
+#results .even {
+  background-color: #fff;
+}
+
+#results .odd {
+  background-color: #EDEDFD;
+}
+
+#results .file_heading {
+  background-color: #eee;
+  padding: 4px;
+}
+
+#results .file_heading img {
+  float: left;
+  margin-right: 2px;
+}
+
+#results .file_heading a {
+  font-weight: bold;
+}
+
+#results .expand_collapse img {
+  width: 16px;
+  height: 16px;
+}
+
+#results .line_no {
+  text-align: right;
+  padding: 0 5px;
+  min-width: 20px;
+  cursor: hand;
+  font-size: 13px;
+}
+
+#results .divider .line_no {
+  text-align: center;
+  background-color: #fff;
+}
+
+#results .text {
+  padding: 3px 10px;
+  width: 100%;
+  cursor: hand;
+}
+
+#results .text span {
+  background-color: yellow;
+  font-weight: bold;
+}
+
+#results .text pre {
+  font-size: 13px;
+}
+
+#results .divider .text {
+  background-color: #fff;
+}
+
+#results .nomatch .line_no,
+#results .nomatch .text {
+  color: #aaa;
+}
+
+#results .break {
+  height: 20px;
+}
+
+#errors {
+  color: red;
+  border: 1px solid red;
+  margin: 0 30px;
+  padding: 15px;
+}