redcar 0.5.5dev → 0.5.6dev

data/plugins/edit_view_swt/vendor/java-mateview.rb

@@ -1,4 +1,3 @@
-
 require "java-mateview-#{Redcar::VERSION}"
 
 module JavaMateView
@@ -34,4 +33,4 @@ module JavaMateView
   end
 end
 
- 
+ 

data/plugins/file_parser/lib/file_parser.rb

@@ -15,6 +15,7 @@ module Redcar
     end
 
     def each_file(&block)
+      file_index = 0
       Find.find(root_path) do |path|
         fullpath = File.expand_path(path)
         path = Pathname.new(fullpath)
@@ -22,24 +23,87 @@ module Redcar
         if path.directory?
           Find.prune if excluded_dirs.include?(path.basename.to_s) || is_excluded_pattern
         else
-          if path.readable? && !skip_types.find { |st| path.send("#{st}?") }
-            yield(path) unless path.read.is_binary_data? || excluded_files.include?(path.basename.to_s) || is_excluded_pattern
+          skipped = skip_types.find { |st| path.send("#{st}?") }
+          excluded = excluded_files.include?(path.basename.to_s) || is_excluded_pattern
+          unless !path.readable? || path.read.is_binary_data? || skipped || excluded
+            yield(FileResult.new(path, file_index))
+            file_index += 1
           end
         end
       end
     end
 
     def each_line(&block)
-      file_no = 0
       each_file do |file|
-        file_no += 1
-        line_no = 0
         file.each_line do |line|
-          line_no += 1
-          yield(line, line_no, file, file_no)
+          yield(line)
         end
       end
     end
 
+    class FileResult
+
+      attr_reader :path, :index, :lines
+
+      def initialize(path, index)
+        @path, @index = path, index
+        @lines = @path.read.split("\n")
+      end
+
+      def num
+        index + 1
+      end
+
+      def name
+        @project_path ||= Project::Manager.focussed_project.path
+        path.realpath.to_s.gsub("#{@project_path}/", '')
+      end
+
+      def each_line(&block)
+        lines.each_with_index do |text, index|
+          yield(LineResult.new(self, index, text))
+        end
+      end
+
+      def inspect
+        "#<FileResult path=#{path.to_s} index=#{index} lines=#{lines.size}>"
+      end
+
+    end
+
+    class LineResult
+
+      attr_reader :file, :index, :text
+
+      def initialize(file, index, text)
+        @file, @index, @text = file, index, text
+      end
+
+      def num
+        index + 1
+      end
+
+      def context(amount = 5)
+        before, after = Array.new, Array.new
+        if index > 0
+          from = (index - amount)
+          from = 0 if from < 0
+          before = ((from)..(index - 1)).collect { |b_index| LineResult.new(file, b_index, file.lines[b_index]) }
+        end
+        last_line_index = (file.lines.size - 1)
+        if index < last_line_index
+          to = (index + amount)
+          to = last_line_index if to > last_line_index
+          after = ((index + 1)..(to)).collect { |a_index| LineResult.new(file, a_index, file.lines[a_index]) }
+        end
+        { :before => before, :after => after }
+      end
+
+      def inspect
+        "#<LineResult index=#{index} file=#{file.to_s}>"
+      end
+
+    end
+
   end
 end

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

@@ -1,5 +1,3 @@
-* Reimplement with_context functionality in new ruby search
-* A line to summarize results, e.g. 18 lines matched in 5 files
 * Remember literal match, match case, and with context settings
 * Better handle long lines
 * Add stop searching functionality

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

@@ -21,6 +21,7 @@ module Redcar
         storage.set_default('excluded_dirs', ['.git', '.svn', '.redcar'])
         storage.set_default('excluded_files', [])
         storage.set_default('excluded_patterns', [/tags$/, /\.log$/])
+        storage.set_default('context_lines', 2)
         storage.save
       end
     end

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

@@ -26,6 +26,9 @@ module Redcar
 
         execute("$('#cached_query').val(\"#{escape_javascript(@query)}\");")
         execute("$('#results').html(\"<div id='no_results'>Searching...</div>\");")
+        execute("$('#results_summary').hide();")
+        execute("$('#file_results_count').html(0);")
+        execute("$('#line_results_count').html(0);")
         search_in_background
 
         nil
@@ -78,33 +81,43 @@ module Redcar
         @thread = nil
 
         @thread = Thread.new do
-          found_lines = false
-          last_file = nil
+          matched_lines = false
+          last_matching_line = nil
 
-          @file_index, @line_index = 0, 0
-
-          Redcar::FileParser.new(@project_path, @settings).each_line do |line, line_no, file, file_no|
+          Redcar::FileParser.new(@project_path, @settings).each_line do |line|
             next unless matching_line?(line)
 
             # Add an initial <tr></tr>  so that tr:last can be used
             execute("if ($('#results table').size() == 0) { $('#results').html(\"<table><tr></tr></table>\"); }")
+            execute("if ($('#results_summary').first().is(':hidden')) { $('#results_summary').show(); }")
+
+            parsing_new_file = (!last_matching_line || last_matching_line.file != line.file)
 
-            if last_file != file # new file
-              file_name = file.realpath.to_s.gsub("#{@project_path}/", '')
-              @file_index, @file_name = ((@file_index || 0) + 1), file_name
-              execute("$('#results table tr:last').after(\"<tr><td class='break' colspan='2'></td></tr>\");") unless last_file.nil?
+            if parsing_new_file
+              execute("$('#file_results_count').html(parseInt($('#file_results_count').html()) + 1);")
+              execute("$('#results table tr:last').after(\"<tr><td class='break' colspan='2'></td></tr>\");") if matched_lines
+              @file = line.file
               execute("$('#results table tr:last').after(\"#{escape_javascript(render('_file_heading'))}\");")
               @line_index = 0 # reset line row styling
             end
 
-            @line_index, @line_no, @line = ((@line_index || 0) + 1), line_no, line
-            execute("$('#results table tr:last').after(\"#{escape_javascript(render('_file_line'))}\");")
+            if @with_context && !parsing_new_file && (line.num - last_matching_line.num) > (@settings['context_lines'] * 2)
+              divider = "<tr class='divider'><td class='line_num file_#{@line.file.num}'>...</td><td></td></tr>"
+              execute("$('#results table tr:last').after(\"#{divider}\");")
+            end
+
+            context = line.context(@settings['context_lines']) if @with_context
+            context[:before].each { |b_line| render_line(b_line) } if @with_context
+            render_line(line)
+            context[:after].each { |a_line| render_line(a_line) } if @with_context
 
-            found_lines = true
-            last_file = file
+            execute("$('#line_results_count').html(parseInt($('#line_results_count').html()) + 1);")
+
+            matched_lines = true
+            last_matching_line = line
           end
 
-          if found_lines
+          if matched_lines
             # Remove the blank tr we added initially
             execute("$('#results table tr:first').remove();")
           else
@@ -120,12 +133,20 @@ module Redcar
       def matching_line?(line)
         regexp_text = @literal_match ? Regexp.escape(@query) : @query
         regexp = @match_case ? /#{regexp_text}/ : /#{regexp_text}/i
-        line =~ regexp
+        line.text =~ regexp
       end
 
-      def escape_javascript(javascript)
+      def escape_javascript(text)
         escape_map = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
-        javascript.to_s.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { escape_map[$1] }
+        text.to_s.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { escape_map[$1] }
+      end
+
+      def render_line(line)
+        @line_index += 1
+        @line, @file = line, line.file
+        execute("if ($('#results tr.file_#{@file.num}.line_#{@line.num}').size() == 0) {
+          $('#results table tr:last').after(\"#{escape_javascript(render('_file_line'))}\");
+        }")
       end
     end
   end

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

@@ -92,6 +92,7 @@
 
 #results_container {
   margin-top: 95px;
+  margin-bottom: 25px;
 }
 
 #no_results,
@@ -113,7 +114,7 @@
 }
 
 #results .filename,
-#results .line_no {
+#results .line_num {
   background-color: #eee;
   padding: 3px 10px;
 }
@@ -145,7 +146,7 @@
   height: 16px;
 }
 
-#results .line_no {
+#results .line_num {
   text-align: right;
   padding: 0 5px;
   min-width: 20px;
@@ -153,7 +154,11 @@
   font-size: 13px;
 }
 
-#results .divider .line_no {
+#results .divider .line_num {
+  cursor: default;
+}
+
+#results .divider .line_num {
   text-align: center;
   background-color: #fff;
 }
@@ -173,11 +178,7 @@
   font-size: 13px;
 }
 
-#results .divider .text {
-  background-color: #fff;
-}
-
-#results .nomatch .line_no,
+#results .nomatch .line_num,
 #results .nomatch .text {
   color: #aaa;
 }
@@ -192,3 +193,21 @@
   margin: 0 30px;
   padding: 15px;
 }
+
+#results_summary {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+#results_summary .text {
+  width: 300px;
+  margin: 0 auto;
+  background-color: #eee;
+  border: 1px solid #ddd;
+  text-align: center;
+  border-top-left-radius: 1em;
+  border-top-right-radius: 1em;
+  padding: 3px 5px;
+}

data/plugins/find-in-project/lib/find_in_project/views/_file_heading.html.erb

@@ -2,9 +2,9 @@
 
 <tr>
   <td class="file_heading" colspan="2">
-    <a class="expand_collapse" data-file_index="<%= @file_index %>">
+    <a class="expand_collapse" data-file_num="<%= @file.num %>">
       <img src="<%= image_path %>/expanded.png" />
-      <%= CGI::escapeHTML(@file_name) %>
+      <%= CGI::escapeHTML(@file.name) %>
     </a>
   </td>
 </tr>

data/plugins/find-in-project/lib/find_in_project/views/_file_line.html.erb

@@ -1,6 +1,6 @@
-<tr class="result line_for_<%= @file_index %> <%= (@line_index % 2 == 0 ? 'even' : 'odd') %>" data-href='<%= CGI::escapeHTML(@file_name) %>' data-line_no='<%= @line_no %>'>
-  <td class='line_no'><%= @line_no %></td>
+<tr class="result file_<%= @file.num %> line_<%= @line.num %> <%= (@line_index % 2 == 0 ? 'even' : 'odd') %>" data-href='<%= CGI::escapeHTML(@file.name) %>' data-line_num='<%= @line.num %>'>
+  <td class='line_num'><%= @line.num %></td>
   <% regexp_text = CGI.escapeHTML((@literal_match ? Regexp.escape(@query) : @query)) %>
-  <% text = CGI.escapeHTML(@line.strip).gsub((@match_case ? /(#{regexp_text})/ : /(#{regexp_text})/i)) { "<span>#{$1}</span>" } %>
+  <% text = CGI.escapeHTML(@line.text).gsub((@match_case ? /(#{regexp_text})/ : /(#{regexp_text})/i)) { "<span>#{$1}</span>" } %>
   <td class='text'><pre><%= text %></pre></td>
 </tr>

data/plugins/find-in-project/lib/find_in_project/views/index.html.erb

@@ -37,8 +37,8 @@
           <label for="literal_match">Literal Match</label>
           <input type="checkbox" id="match_case" <%="checked=checked" if @match_case %>>
           <label for="match_case">Match case</label>
-          <!-- <input type="checkbox" id="with_context" <%="checked=checked" if @with_context %>>
-          <label for="with_context">With context</label> -->
+          <input type="checkbox" id="with_context" <%="checked=checked" if @with_context %>>
+          <label for="with_context">With context</label>
         </td>
         <td></td>
       </tr>
@@ -54,6 +54,12 @@
   </div>
 </div>
 
+<div id="results_summary" style="display: none;">
+  <div class="text">
+    <span id="line_results_count">0</span> lines matched in <span id="file_results_count">0</span> files
+  </div>
+</div>
+
 <script type="text/javascript">
   $(document).ready(function() {
     $('#query').trigger('focus');
@@ -108,7 +114,7 @@
       try {
         if ($("#literal_match").attr('checked')) { var literal_match = 'true'; } else { var literal_match = 'false'; }
         if ($("#match_case").attr('checked')) { var match_case = 'true'; } else { var match_case = 'false'; }
-        Controller.openFile($(this).attr('data-href'), $(this).attr('data-line_no'), $("#cached_query").val(), literal_match, match_case);
+        Controller.openFile($(this).attr('data-href'), $(this).attr('data-line_num'), $("#cached_query").val(), literal_match, match_case);
       } catch(e) {
         alert(e.message);
       }
@@ -117,13 +123,13 @@
     // need to use live here so that results added will be caught
     $('.expand_collapse').live('click', function(ev) {
       ev.preventDefault();
-      var file_index = $(this).attr('data-file_index');
-      if ($(".line_for_" + file_index).first().is(":visible")) {
+      var file_num = $(this).attr('data-file_num');
+      if ($(".file_" + file_num).first().is(":visible")) {
         $('img', this).attr('src', '<%= image_path %>/collapsed.png');
-        $(".line_for_" + file_index).hide();
+        $(".file_" + file_num).hide();
       } else {
         $('img', this).attr('src', '<%= image_path %>/expanded.png');
-        $(".line_for_" + file_index).show();
+        $(".file_" + file_num).show();
       }
     });
   });

data/plugins/redcar/redcar.rb

@@ -5,9 +5,10 @@ module Redcar
       yield
     rescue => e
       message = "Error in: " + (text || e.message)
-      puts message
-      puts e.class.to_s + ": " + e.message
-      puts e.backtrace
+      $stderr.puts message
+      $stderr.puts e.class.to_s + ": " + e.message
+      $stderr.puts e.backtrace
+      return if Redcar.no_gui_mode?
       Application::Dialog.message_box(
         message,
         :type => :error, :buttons => :ok)

data/plugins/scm/lib/scm/scm_changes_mirror/change.rb

@@ -38,6 +38,8 @@ module Redcar
         #
         # Possible values and their implications:
         #   :new - can be passed to index_add, index_ignore
+        #   :unmerged - The file is in a conflicted state. 
+        #               Can be passed to index_save or index_delete
         #   :indexed - can be passed to index_revert, index_unsave
         #   :deleted - can be passed to index_restore, index_unsave
         #   :missing - can be passed to index_restore, index_delete

data/plugins/swt/lib/swt/full_swt.rb

@@ -35,7 +35,10 @@ module Swt
   
   module DND
     import org.eclipse.swt.dnd.DND
-    import org.eclipse.swt.dnd.Clipboard
+    
+    # Only load Clipboard in full running mode.
+    import org.eclipse.swt.dnd.Clipboard unless Redcar.no_gui_mode?
+
     import org.eclipse.swt.dnd.Transfer
     import org.eclipse.swt.dnd.TextTransfer
     import org.eclipse.swt.dnd.FileTransfer

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcar
 version: !ruby/object:Gem::Version 
-  hash: -769080784
+  hash: 35899764
   prerelease: true
   segments: 
   - 0
   - 5
-  - 5dev
-  version: 0.5.5dev
+  - 6dev
+  version: 0.5.6dev
 platform: ruby
 authors: 
 - Daniel Lucraft
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +01:00
+date: 2010-09-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency