redcar-dev 0.12.12dev-java → 0.12.13dev-java

data/Rakefile

@@ -8,7 +8,7 @@ require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 require "rake/gempackagetask"
 require "rake/rdoctask"
-Dir[File.expand_path("../tasks/*.rake", __FILE__)].each { |f| load f }
+Dir[File.expand_path("../lib/tasks/*.rake", __FILE__)].each { |f| load f }
 
 if RUBY_PLATFORM =~ /mswin|mingw/
   begin

data/lib/redcar.rb

@@ -57,7 +57,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.12dev' # also change in the gemspec!
+  VERSION         = '0.12.13dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 12
   VERSION_RELEASE = 0

data/lib/tasks/app-bundle.rake

@@ -0,0 +1,63 @@
+desc "Build a MacOS X App bundle"
+task :app_bundle do
+  require 'erb'
+
+  redcar_icon = "redcar-icon-beta.png"
+
+  bundle_contents = File.join("pkg", "Redcar.app", "Contents")
+  FileUtils.rm_rf bundle_contents if File.exist? bundle_contents
+  macos_dir = File.join(bundle_contents, "MacOS")
+  resources_dir = File.join(bundle_contents, "Resources")
+  FileUtils.mkdir_p macos_dir
+  FileUtils.mkdir_p resources_dir
+
+  info_plist_template = ERB.new <<-PLIST
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>redcar</string>
+	<key>CFBundleIconFile</key>
+	<string><%= redcar_icon %></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.redcareditor.Redcar</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string><%= Spec.version %></string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.5</string>
+</dict>
+</plist>
+  PLIST
+  File.open(File.join(bundle_contents, "Info.plist"), "w") do |f|
+    f << info_plist_template.result(binding)
+  end
+
+  File.open(File.join(macos_dir, "redcar"), "w") do |f|
+    f << '#!/bin/sh
+          MACOS=$(cd "$(dirname "$0")"; pwd)
+          RESOURCES="$(cd "${MACOS}/../Resources/"; pwd)"
+          BIN="${RESOURCES}/bin/redcar"
+          JRUBY="${RESOURCES}/.redcar/assets/jruby-complete-*.jar"
+          java -cp $JRUBY -Djruby.fork.enabled=true org.jruby.Main "$BIN" --home-dir="${RESOURCES}" --ignore-stdin $@'
+  end
+  File.chmod 0777, File.join(macos_dir, "redcar")
+
+  Spec.files.each do |f|
+    unless File.directory?(f)
+      FileUtils.mkdir_p File.join(resources_dir, File.dirname(f))
+      FileUtils.cp f, File.join(resources_dir, f)
+    end
+  end
+
+  FileUtils.cp_r File.join(resources_dir, "share", "icons", redcar_icon), resources_dir
+
+  puts(install_cmd = "#{File.expand_path("../../bin/redcar", __FILE__)} --home-dir=#{resources_dir} install")
+  system(install_cmd)
+end

data/plugins/application/lib/application.rb

@@ -60,6 +60,9 @@ module Redcar
 
     def self.start
       Redcar.app = Application.new
+      Redcar.plugin_manager.objects_implementing(:app_started).each do |object|
+        object.app_started
+      end
     end
 
     def self.sensitivities

data/plugins/project_search/lib/project_search/commands.rb

@@ -2,7 +2,7 @@
 class ProjectSearch
   class RefreshIndex < Redcar::Command
     sensitize :open_project
-    
+
     def execute
       if project = Redcar::Project::Manager.focussed_project
         if index = ProjectSearch.indexes[project.path]
@@ -12,17 +12,17 @@ class ProjectSearch
       end
     end
   end
-  
+
   class WordSearchCommand < Redcar::Command
     sensitize :open_project
-    
+
     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 == ProjectSearch::WordSearchController::TITLE
       end
     end
-    
+
     def execute
       if project = Redcar::Project::Manager.focussed_project
         if tab = find_open_instance
@@ -33,6 +33,7 @@ class ProjectSearch
           if index and index.has_content?
             tab = win.new_tab(Redcar::HtmlTab)
             tab.html_view.controller = ProjectSearch::WordSearchController.new
+            tab.icon = :blue_folder_search_result
             tab.focus
           else
             Redcar::Application::Dialog.message_box("Your project is still being indexed.", :type => :error)

data/plugins/project_search/lib/project_search/lucene_index.rb

@@ -60,7 +60,7 @@ class ProjectSearch
               pre_contents = File.new(fn).read(200)
               unless !pre_contents or BinaryDataDetector.binary?(pre_contents)
                 contents = File.read(fn)
-                adjusted_contents = contents.gsub(/\.([^\s])/, '. \1')
+                adjusted_contents = contents
                 @lucene_index << { :id => fn, :contents => adjusted_contents }
               end
             rescue => e

data/plugins/project_search/lib/project_search/stylesheets/style.css

@@ -2,19 +2,26 @@
   margin: 0;
   padding: 0;
   font-weight: normal;
+  font-family: Helvetica Neue, Sawasdee, sans-serif;
+}
+
+body {
+  background-color:#ddd;
   font-size: 14px;
-  font-family: sans-serif;
 }
 
 #search_form_container {
   background-color: #eee;
   width: 100%;
-  margin: -8px 0px 20px -8px;
-  padding: 16px 8px 10px 0;
+  margin: -8px 0px 20px -40px;
+  padding: 16px 40px 10px 0;
   border-bottom: 2px solid #ddd;
   position: fixed;
   top: 0;
   left: 0;
+  -webkit-box-shadow: 0px 0px 10px rgba(0,0,0,.5);
+  -moz-box-shadow: 0px 0px 10px rgba(0,0,0,.5);
+  box-shadow: 0px 0px 10px rgba(0,0,0,.5);
 }
 
 #search_form_container table {
@@ -32,28 +39,40 @@
   text-align: right;
 }
 
-#search_form_container .input .field input {
+#search_form_container .input .field #query {
   width: 100%;
-  height: 20px;
-  font-family: monospace;
+}
+
+#search_form_container .input .field input {
+  height: 25px;
 }
 
 #search_form_container .input .expand {
-  width: 20px;
+  width: 100px;
   padding: 3px 0px;
 }
 
+#search_form_container .input .expand #search {
+  width: 60px;
+  padding:0 4px;
+  font-size:11px;
+}
+
 #search_form_container .input .expand a {
-  color: black;
-  font-weight: bold;
+  background-color: #bcbcbc;
   text-decoration: none;
   display: block;
   width: 20px;
-  height: 18px;
-  background-color: #777;
-  border: 1px solid #000;
+  height: 20px;
+  color: #d0d0d0;
+  border: 1px solid #b0b0b0;
+  font-size:12px;
   text-align: center;
-  color: #fff;
+  margin-top:1px;
+  margin-left:-3px;
+  z-index:9999;
+  -moz-border-radius-topright:4px;
+  -moz-border-radius-bottomright:4px;
 }
 
 #search_form_container .controls label {
@@ -70,18 +89,30 @@
   margin-right: 7px;
 }
 
+#search_copy {
+  font-size:80%;
+  display:block;
+}
+
+#search {
+  float:right;
+  width:20%;
+}
+
 #recent_queries {
   position: absolute;
-  top: 41px;
+  top: 45px;
   left: 124px;
-  right: 34px;
-  border: 1px solid #000;
+  right: 122px;
+  border: 1px solid #acacac;
   background-color: #fff;
+  box-shadow:2px 3px 5px #bbb;
+  -moz-box-shadow:2px 3px 5px #ccc;
 }
 
 #recent_queries ul {
   list-style: none;
-  height: 100px;
+  height: 120px;
   overflow: auto;
 }
 
@@ -95,7 +126,7 @@
 }
 
 #results_container {
-  margin-top: 95px;
+  margin-top: 120px;
   margin-bottom: 25px;
 }
 
@@ -107,7 +138,7 @@
 }
 
 #results {
-  padding: 0 10px 10px 10px;
+/*  padding: 0 10px 10px 10px;*/
 }
 
 #results table {
@@ -121,10 +152,11 @@
 #results .line_num {
   background-color: #eee;
   padding: 3px 10px;
+  border-right:1px solid #ddd;
 }
 
 #results .even {
-  background-color: #F4F4F4;
+  background-color: #F9F9F9;
 }
 
 #results .odd {
@@ -132,9 +164,11 @@
 }
 
 #results .file_heading {
-  background-color: #eee;
-  padding: 4px;
+/*  background-color: #ccc;*/
+  padding: 4px 4px 4px 12px;
   font-weight: bold;
+  font-family:Helvetica Neue, Sawasdee, sans-serif;
+  border-bottom: 1px dotted #aaa;
 }
 
 #results .file_heading img {
@@ -144,7 +178,6 @@
 
 #results .file_heading a {
   font-weight: bold;
-  font-family: sans-serif;
 }
 
 #results .line_num {
@@ -152,38 +185,39 @@
   padding: 0 5px;
   min-width: 20px;
   cursor: hand;
-  font-size: 12px;
-  line-height: 12px;
-  font-family: sans-serif;
 }
 
 #results .divider .line_num {
   cursor: default;
   text-align: center;
-  background-color: #fff;
+/*  background-color: #ddd;*/
+
   color: #555;
 }
 
 #results .text {
   padding: 3px 10px;
   width: 100%;
-  cursor: hand;
-}
-
-#results .text pre {
-  font-size: 14px;
-  line-height: 17px;
-  font-family: monospace;
+  cursor: pointer;
 }
 
 #results .divider .text {
   cursor: default;
+  -moz-box-shadow:1px 1px 3px #bbb inset;
 }
 
 #results .text pre span {
-  background-color: #FFCCCC;
+  background-color: #fff319;
+  border:1px solid #efda17;
   font-weight: bold;
-  font-family: monospace;
+  box-shadow:1px 1px 1px #c49e28;
+  -moz-box-shadow:1px 1px 1px #c49e28;
+  border-radius:3px;
+  -moz-border-radius:3px;
+}
+
+#results .text pre span:hover {
+  padding: 1px 0;
 }
 
 #results .break {
@@ -196,7 +230,13 @@
   left: 0;
   right: 0;
   font-size: 1.5em;
-  font-family: sans-serif;
+  -moz-border-radius: 4px;
+  opacity:0.5;
+}
+
+#results_summary:hover {
+  opacity:1.0;
+  cursor:pointer;
 }
 
 #results_summary .text {
@@ -209,3 +249,31 @@
   border-top-right-radius: 1em;
   padding: 3px 5px;
 }
+
+#files_nav {
+  text-align:left;
+}
+
+#files_nav a:link,#files_nav a:visited,#files_nav a:hover {
+  text-decoration:none;
+  color:#212121;
+}
+
+#files_nav a:hover {
+  background-color: #fff319;
+  border:1px solid #efda17;
+  font-weight: bold;
+  box-shadow:1px 1px 1px #c49e28;
+  -moz-box-shadow:1px 1px 1px #c49e28;
+  border-radius:3px;
+  -moz-border-radius:3px;
+}
+
+#files_nav_container {
+  max-height:300px;
+  overflow-y:scroll;
+}
+
+ul {
+  list-style-type: none;
+}

data/plugins/project_search/lib/project_search/views/_file.html.erb

@@ -1,8 +1,9 @@
-
 <tr><td class='break' colspan='2'></td></tr>
 <tr>
   <td class="file_heading" colspan="2">
-    <%= CGI::escapeHTML(file.gsub(@word_search.project.path + "/", "")) %>
+    <a id="<%=File.basename(file).gsub(/\.|:|\\|\//,"")%>">
+      <%= CGI::escapeHTML(file.gsub(@word_search.project.path + "/", "")) %>
+    </a>
   </td>
 </tr>
 
@@ -15,7 +16,7 @@
   <% display_line_num = hit.line_num + 1%>
   <% if @word_search.context? and last_matching_line_num and (display_line_num - last_matching_line_num) > (@word_search.context_size * 2) %>
     <tr class="divider file_<%= file_num %>">
-      <td class="line_num">. . .</td>
+      <td class="line_num">&#8230;</td>
       <td class="text">&nbsp;</td> <!-- extra space to ensure line-height is respected -->
     </tr>
   <% end %>

data/plugins/project_search/lib/project_search/views/index.html.erb

@@ -1,21 +1,37 @@
+<html>
+<head>
 <% jquery_path = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets jquery-1.4.min.js))) %>
 <script type="text/javascript" src="file://<%= jquery_path %>"></script>
 <% json_path = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets json2.js))) %>
 <script type="text/javascript" src="file://<%= json_path %>"></script>
 
 <% plugin_css = File.expand_path(File.join(plugin_root, %w(lib project_search stylesheets style.css))) %>
+<style>
+<% font_size = (Redcar::EditView.font_size * 1.5).to_i %>
+#results .text pre, #results .text pre span, #query,#results .line_num, #recent_queries {
+  font-family: <%= Redcar::EditView.font %>;
+  font-size: <%= font_size - 6 %>px;
+}
+#results .line_num {
+  font-size:<%= font_size - 8 %>px;
+  line-height:<%= font_size - 8 %>px;
+}
+#results .text pre {
+  font-size: <%= font_size - 6 %>px;
+  line-height: <%= font_size - 3 %>px;
+}
+</style>
 <link rel="stylesheet" href="file://<%= plugin_css %>" type="text/css" media="screen">
-
-<% image_path = File.expand_path(File.join(plugin_root, %w(lib project_search images))) %>
-
+</head>
+<body>
 <div id="search_form_container">
   <form id="search_form">
     <table>
       <tr class="input">
-        <td class="label"><label for="query">Search Term</label></td>
+        <td class="label"><label for="query">Words:</label></td>
         <td class="field">
-          <input id="query" type="text" value="<%= default_query %>" />
-          
+          <input id="query" type="text" value="<%= default_query %>"/>
+
           <!-- keeps a cache of the current query so if the user changes the query field, this remains the same as the results -->
           <input id="cached_query" type="hidden" />
 
@@ -28,14 +44,13 @@
           </div>
         </td>
         <td class="expand">
-          <a href="#" title="Toggle Recent Queries" id="toggle_recent_queries">&darr;</a>
+          <input id="search" type="submit" value="Search" />
+          <a href="#" title="Toggle Recent Queries" id="toggle_recent_queries">&#9660;</a>
         </td>
       </tr>
       <tr>
         <td></td>
         <td class="controls">
-          <input id="search" type="submit" value="Find In Project" />
-          <img id="spinner" src="<%= image_path %>/spinner.gif" style="display:none;" />
           <% if show_literal_match_option? %>
           <input type="checkbox" id="literal_match" <%="checked=checked" if @literal_match %>>
             <label for="literal_match">Literal Match</label>
@@ -44,7 +59,6 @@
           <label for="match_case">Match case</label>
           <input type="checkbox" id="with_context" <%="checked=checked" if context? %>>
           <label for="with_context">With context</label>
-          <%= search_copy %>
         </td>
         <td></td>
       </tr>
@@ -63,6 +77,11 @@
 <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
+    <span style="float:right">&#9660;</span>
+    <div id="files_nav_container" style="display:none">
+      <ul id="files_nav">
+      </ul>
+    </div>
   </div>
 </div>
 
@@ -93,13 +112,9 @@
 
     $('#toggle_recent_queries').click(function(ev) {
       ev.preventDefault();
-      if ($('#recent_queries').is(":visible")) {
-        $('#recent_queries').hide();
-      } else {
-        $('#recent_queries').show();
-      }
+      $('#recent_queries').slideToggle('fast');
     });
-    
+
     // in the case the user wants to search for things like <table>, we need to unescape the entities
     String.prototype.unescapeHTML = function() {
       var t = document.createElement('div');
@@ -126,5 +141,16 @@
       }
     });
 
+    $('.text').click(function() {
+      $('#files_nav_container').slideToggle();
+    });
+
+    $('.file_link').live('click',function() {
+      $('body').animate({
+          scrollTop: $("#"+$(this).attr('id').replace("link_","")).offset().top - 120
+      }, 0);
+    });
   });
 </script>
+</body>
+</html>