redcar 0.11.0dev → 0.11

data/CHANGES

@@ -3,14 +3,27 @@ Version 0.11 (TBA)
 
 Enhancements:
 
+ * Project search backed by Lucene (Dan Lucraft)
  * Fuzzy file finder now recognizes directories "a/c/repocontr" (Tim Felgentreff)
  * Recent project fuzzy finder (Benedikt Müller)
  * Improved DocumentSearch, with UI refinements, added Replace All commands (Tom Murray)
  * Raise/lower region behaves better when you select multiple lines (Benedikt Müller)
- * Project search backed by Lucene (Dan Lucraft)
+ * Which files are hidden in a project is now configurable (Konstantin Haase)
+ * Added logger at Redcar.log, goes to ~/.redcar/user.log (Dan Lucraft)
+ * Can hide files and directories from the project context menu (Benedikt Müller)
+ * Notification if Redcar doesn't have permission to save files (Benedikt Müller & Bill Siggelkow)
+ * Tweaked the load order to make the window appear faster during startup (Dan Lucraft)
+ * All the plugins use a single preference value to ignore files (Benedikt Müller & Daniel Lucraft)
+ * Can ignore directories (Benedikt Müller)
+ * User definable keybindings (Chris Nelson)
 
 Bugfixes:
  * Fixed Unicode problems in DocumentSearch (Tom Murray)
+ * You can now symlink bin/redcar (Konstantin Haase)
+ * Runnables are now terminated correctly when the tab is closed (Dan Lucraft)
+ * You are once again prompted when you close a window with running Runnables in (Dan Lucraft)
+ * Fix encoding issue that broke highlighting when there are multi-byte characters in a line (Dan Lucraft)
+ * Fixed project-dependent trees remaining open when project is closed (Delisa Mason)
 
 Version 0.10 (17 January 2011)
 ==============================

data/README.md

@@ -1,15 +1,34 @@
 {Redcar}
 ========
 
-http://RedcarEditor.com/
+[http://redcareditor.com/](http://redcareditor.com/)
 
 ## DESCRIPTION
 
-A pure Ruby text editor running on JRuby. 
+A Ruby text editor.
+
+ * written in Ruby from the ground up
+ * runs on JRuby (a fast, compatible Ruby implementation)
+ * is cross-platform (Linux, Mac OS X, Windows)
+ * highly extensible
+
+Some Redcar features:
+
+ * supports Textmate themes and snippets
+ * split screen mode
+ * syntax checking for many languages
+ * built in REPLs for Ruby, Groovy, Clojure and Mirah.
+
+Some (current) limitations:
+
+ * Only supports UTF-8 file encodings (and therefore ASCII)
+
+![alt text](http://redcareditor.com/images/redcar-4-thumb.png "Title")
+![alt text](http://redcareditor.com/images/redcar-1-thumb.png "Title")
 
 ## INSTALLATION
 
-You must have Java installed [1]. You will also need to run these commands for each user on your computer that needs access to Redcar.
+You must have Java installed [1]. Redcar is easiest to install as a gem. After installing the gem there is one further install step:
 
     $ sudo gem install redcar
     $ redcar install
@@ -49,7 +68,7 @@ To run:
 
     $ ruby bin/redcar
 
-## UPDATING A SOURCE BUILD
+### Updating a source build
 
 If you are running a source version of Redcar and you have pulled changes from master, then you may have to update your repo:
 
@@ -60,15 +79,16 @@ If you are running a source version of Redcar and you have pulled changes from m
 
 NB. Redcar features are known to work with Cucumber 0.9.2, and known NOT to work with Cucumber < 0.9
 
-To run the tests you need JRuby installed. You also need rspec and cucumber installed as Jruby gems. See jruby.org for this, or install with rvm.
+To run the tests you need JRuby installed. You also need rspec and cucumber installed as JRuby gems. See jruby.org for this, or install with rvm.
 
 To run all specs and features:
 
+    $ jruby -S bundle install
     $ jruby -S rake
 
 NB. You must leave the test window focussed while the features run. Some of the tests will fail if the test process is in the background.
 
-## TESTS (specs)
+### Specs
 
 On OSX:
 
@@ -79,7 +99,7 @@ On Linux:
     $ jruby -S spec plugins/#{plugin_name}/spec/
 
   
-## TESTS (features)
+### Features
 
 On OSX:
 
@@ -91,5 +111,5 @@ On Linux:
 
 ## LICENSE
 
-Redcar is copyright 2007-2010 Daniel Lucraft and contributors. 
+Redcar is copyright 2007-2011 Daniel Lucraft and contributors.
 It is licensed under the GPL2. See the included LICENSE file for details.

data/Rakefile

@@ -1,6 +1,9 @@
-REDCAR_VERSION = "0.11.0dev" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.11" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
+
+# explitely use rspec < 2.0
+gem 'rspec', '<2.0'
 require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 require "rake/gempackagetask"
@@ -29,7 +32,7 @@ begin
         'plugins/*/lib/**/*.rb'
       ]
     t.options = ['--markup', 'markdown']
-  end  
+  end
 rescue LoadError
 end
 
@@ -126,9 +129,9 @@ task :specs do
   files = Dir['plugins/*/spec/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*/*_spec.rb']
   case Config::CONFIG["host_os"]
   when "darwin"
-    sh("jruby -J-XstartOnFirstThread -S spec -c #{files.join(" ")} && echo 'done'")
+    sh("jruby -J-XstartOnFirstThread -S bundle exec spec -c #{files.join(" ")} && echo 'done'")
   else
-    sh("jruby -S spec -c #{files.join(" ")} && echo 'done'")
+    sh("jruby -S bundle exec spec -c #{files.join(" ")} && echo 'done'")
   end
 end
 
@@ -152,6 +155,8 @@ task :build do
   cd "plugins/application_swt" do
     sh "ant"
   end
+  cp "plugins/edit_view_swt/vendor/java-mateview.jar", "#{ENV['HOME']}/.redcar/assets/java-mateview-#{REDCAR_VERSION}.jar"
+  cp "plugins/application_swt/lib/dist/application_swt.jar", "#{ENV['HOME']}/.redcar/assets/application_swt-#{REDCAR_VERSION}.jar"
 end
 
 def remove_gitignored_files(filelist)
@@ -167,16 +172,16 @@ def remove_matching_files(list, string)
 end
 
 def gem_manifest
-  r = %w(CHANGES LICENSE Rakefile README.md) + 
-                          Dir.glob("bin/redcar") + 
-                          Dir.glob("config/**/*") + 
-                          Dir.glob("share/**/*") + 
-                          remove_gitignored_files(Dir.glob("lib/**/*")) + 
-                          remove_matching_files(remove_gitignored_files(Dir.glob("plugins/**/*")), "redcar-bundles") + 
-                          Dir.glob("plugins/textmate/vendor/redcar-bundles/Bundles/*.tmbundle/Syntaxes/**/*") + 
-                          Dir.glob("plugins/textmate/vendor/redcar-bundles/Bundles/*.tmbundle/Preferences/**/*") + 
-                          Dir.glob("plugins/textmate/vendor/redcar-bundles/Bundles/*.tmbundle/Snippets/**/*") + 
-                          Dir.glob("plugins/textmate/vendor/redcar-bundles/Bundles/*.tmbundle/info.plist") + 
+  r = %w(CHANGES LICENSE Rakefile README.md) +
+                          Dir.glob("bin/redcar") +
+                          Dir.glob("config/**/*") +
+                          Dir.glob("share/**/*") +
+                          remove_gitignored_files(Dir.glob("lib/**/*")) +
+                          remove_matching_files(remove_gitignored_files(Dir.glob("plugins/**/*")), "redcar-bundles") +
+                          Dir.glob("plugins/textmate/vendor/redcar-bundles/Bundles/*.tmbundle/Syntaxes/**/*") +
+                          Dir.glob("plugins/textmate/vendor/redcar-bundles/Bundles/*.tmbundle/Preferences/**/*") +
+                          Dir.glob("plugins/textmate/vendor/redcar-bundles/Bundles/*.tmbundle/Snippets/**/*") +
+                          Dir.glob("plugins/textmate/vendor/redcar-bundles/Bundles/*.tmbundle/info.plist") +
                           Dir.glob("plugins/textmate/vendor/redcar-bundles/Themes/*.tmTheme")
   remove_matching_files(r, "multi-byte")
 end
@@ -236,7 +241,7 @@ task :run_ci do
       a = "jruby -S spec #{filename} --backtrace"
       puts a
       system a
-    end  
+    end
   
     spec_filename = "#{filename[1]}_spec.rb"
     spec = Dir["**/#{spec_filename}"]
@@ -292,13 +297,13 @@ namespace :redcar do
     
     tasks = Rake::Task.tasks
     runnables = []
-    ruby_bin = Config::CONFIG["bindir"] + "/ruby -r#{File.dirname(__FILE__)}/.redcar/runnables/sync_stdout.rb " 
+    ruby_bin = Config::CONFIG["bindir"] + "/ruby -r#{File.dirname(__FILE__)}/.redcar/runnables/sync_stdout.rb "
     tasks.each do |task|
       name = task.name.gsub(":", "/")
       command = ruby_bin + $0 + " " + task.name
       runnables << {
         "name"        => name,
-        "command"     => command, 
+        "command"     => command,
         "description" => task.comment,
         "type"        => "task/ruby/rake"
       }
@@ -308,7 +313,7 @@ namespace :redcar do
       f.puts(JSON.pretty_generate(data))
     end
     File.open(".redcar/runnables/ruby.json", "w") do |f|
-      data = {"file_runners" => 
+      data = {"file_runners" =>
         [
           {
             "regex" =>    ".*.rb$",

data/bin/redcar

@@ -1,9 +1,13 @@
 #!/usr/bin/env ruby
 $KCODE='U' unless RUBY_VERSION > "1.9.0"
 $redcar_process_start_time = Time.now
-$VERBOSE = true if ARGV.find{|arg| arg == '--verbose'}
+$VERBOSE = ARGV.include? '--verbose'
+
+file = __FILE__
+file = File.readlink(file) while File.symlink?(file)
+
+$LOAD_PATH.unshift File.expand_path('../../lib', file)
 
-$:.push(File.join(File.dirname(__FILE__), %w(.. lib)))
 require "redcar_quick_start"
 
 if ARGV.include? '--silent'
@@ -14,7 +18,7 @@ if ARGV.include? '--silent'
 end
 
 if ARGV.include? "install"
-  require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar)))
+  require 'redcar'
   require 'redcar/installer'
   require 'redcar/runner'
   installer = Redcar::Installer.new
@@ -22,8 +26,9 @@ if ARGV.include? "install"
 else
   Redcar.read_stdin
   exit if Redcar.try_to_load_via_drb
-  require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar)))
+  require 'redcar'
   Redcar.environment = :user
+  Redcar.log.info("REDCAR #{Redcar::VERSION} start (start time was #{Redcar.process_start_time})")
   Redcar.spin_up
   Redcar.load_threaded
   Redcar.show_splash

data/lib/redcar.rb

@@ -8,6 +8,7 @@ require 'redcar/usage'
 require 'redcar/ruby_extensions'
 require 'redcar/instance_exec'
 require 'redcar/usage'
+require 'redcar/logger'
 require 'regex_replace'
 
 require 'forwardable'
@@ -51,7 +52,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.11.0dev' # also change in the Rakefile!
+  VERSION         = '0.11' # also change in the Rakefile!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 11
   VERSION_RELEASE = 0
@@ -105,15 +106,18 @@ module Redcar
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "plugin_manager", "lib"))
     require 'plugin_manager'
     
-    $:.push File.expand_path(File.join(File.dirname(__FILE__), "json", "lib"))
-    require 'json'
-    
     $:.push File.expand_path(File.join(Redcar.asset_dir))
     
+    $:.push File.expand_path(File.join(File.dirname(__FILE__), "json", "lib"))
+    require 'json'
+
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "openssl", "lib"))
     
     plugin_manager.load("swt")
   end
+  
+  def self.load_useful_libraries
+  end
 
   def self.load_plugins
     begin
@@ -231,6 +235,40 @@ module Redcar
     return if Redcar.no_gui_mode?
     @gui = gui
   end
+  
+  def self.log
+    @log ||= begin
+      targets = [log_file]
+      targets << STDOUT if show_log?
+      logger = Redcar::Logger.new(*targets)
+      logger.level = custom_log_level
+      at_exit { logger.close }
+      logger
+    end
+  end
+  
+  def self.log_path
+    user_dir + "/#{environment}.log"
+  end
+  
+  def self.log_file
+    File.open(log_path, "a")
+  end
+  
+  def self.show_log?
+    ARGV.include?("--show-log")
+  end
+  
+  def self.custom_log_level
+    ARGV.map {|a| a =~ /--log-level=(info|debug|warn|error)/; $1}.compact.first
+  end
+  
+  def self.process_start_time
+    @process_start_time ||= begin
+      t = ARGV.map {|arg| arg =~ /--start-time=(\d+)$/; $1}.compact.first
+      t ? Time.at(t.to_i) : $redcar_process_start_time
+    end
+  end
 end
 
 usage = Redcar::Usage.new

data/lib/redcar/installer.rb

@@ -64,7 +64,8 @@ module Redcar
           "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/codehaus/groovy/groovy-all/1.7.4/groovy-all-1.7.4.jar" => "/groovy-all.jar",
           "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/tmatesoft/svnkit/svnkit/1.3.4/svnkit-1.3.4.jar" => "/svnkit.jar",
           # "http://mirrors.ibiblio.org/pub/mirrors/maven2/rhino/js/1.7R2/js-1.7R2.jar" => "/js.jar",
-          "http://redcar.s3.amazonaws.com/deps/rhino-js-1.7R2.jar" => "/js.jar"
+          "http://redcar.s3.amazonaws.com/deps/rhino-js-1.7R2.jar" => "/js.jar",
+          "http://redcar.s3.amazonaws.com/lucene-core-2.9.1.jar" => "lucene/jars/lucene-core-2.9.1.jar"
         },
         :windows => {
           "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/#{xulrunner_version}/runtimes/xulrunner-#{xulrunner_version}.en-US.win32.zip" => "xulrunner-#{xulrunner_version}.en-US.win32.zip",
@@ -84,7 +85,11 @@ module Redcar
     def fetch_asset(source, target)
       relative_target   = target || implicit_target(source)
       absolute_target   = File.join(Redcar.asset_dir, relative_target)
-      return if File.exist?(absolute_target)
+      if File.exist?(absolute_target)
+        unless source =~ /dev\.jar/
+          return
+        end
+      end
       download_file_to(source, absolute_target)
       unzip_file(absolute_target) if absolute_target =~ /\.zip$/
     end

data/lib/redcar/logger.rb

@@ -0,0 +1,64 @@
+
+module Redcar
+  class Logger
+    LEVELS = [:debug, :info, :warn, :error]
+    
+    def initialize(*targets)
+      @targets = targets
+    end
+    
+    def level
+      @level || :info
+    end
+    
+    def level=(val)
+      @level = val ? val.to_sym : nil
+    end
+    
+    def close
+      @targets.each {|target| target.close if target.is_a?(File)}
+    end
+    
+    def log(msg_level, msg)
+      string = "#{msg_level.to_s.rjust(5, " ")} [#{Time.now.strftime("%x %X")}] #{msg}"
+      @targets.each do |target|
+        target.puts(string)
+      end
+    end
+    
+    def should_log?(msg_level)
+      LEVELS.index(msg_level) >= LEVELS.index(level)
+    end
+    
+    def error(msg=nil)
+      return unless should_log?(:error)
+      log(:error, (block_given? ? yield : msg))
+    end
+    
+    def warn(msg=nil)
+      return unless should_log?(:warn)
+      log(:warn, (block_given? ? yield : msg))
+    end
+    
+    def info(msg=nil)
+      return unless should_log?(:info)
+      log(:info, (block_given? ? yield : msg))
+    end
+    
+    def debug(msg=nil)
+      return unless should_log?(:debug)
+      log(:debug, (block_given? ? yield : msg))
+    end
+    
+    def benchmark(msg, msg_level=:debug)
+      s = Time.now
+      result = yield
+      if should_log?(msg_level)
+        log(msg_level, msg + " (#{Time.now - s}s)")
+      end
+      result
+    end
+  end
+end
+
+

data/lib/redcar/runner.rb

@@ -60,20 +60,21 @@ module Redcar
 
       # Windows XP updates
       if [:windows].include?(Redcar.platform)
-	bin = "\"#{bin}\""
-	jruby_complete = "\"#{jruby_complete}\""
+        bin = "\"#{bin}\""
+        jruby_complete = "\"#{jruby_complete}\""
       end      
 
       # unfortuanately, ruby doesn't support [a, *b, c]
       command = ["java"]
       command.push(*java_args)
       command.push("-Xbootclasspath/a:#{jruby_complete}")
-      command.push("-Xmx320m", "-Xss1024k", "-Djruby.memory.max=320m", "-Djruby.stack.max=1024k", "org.jruby.Main")
+      command.push("-Dfile.encoding=UTF8", "-Xmx320m", "-Xss1024k", "-Djruby.memory.max=320m", "-Djruby.stack.max=1024k", "org.jruby.Main")
       command.push "--debug" if debug_mode?
       command.push(bin)
       command.push(*cleaned_args)
       command.push("--no-sub-jruby", "--ignore-stdin")
       command.push(*args)
+      command.push "--start-time=#{$redcar_process_start_time.to_i}"
       
       puts command.join(' ')
       yield command
@@ -106,16 +107,24 @@ module Redcar
         str.push "-Djruby.debug.loadService.timing=true"
       end
 
-      str.push "-d32" if JvmOptionsProbe::D32
-      str.push "-client" if JvmOptionsProbe::Client
+      str.push "-d32" if JvmOptionsProbe.d32
+      str.push "-client" if JvmOptionsProbe.client
       
       str
     end
 
     class JvmOptionsProbe
-      Redirect = "> #{Redcar.null_device} 2>&1"
-      D32 = system("java -d32 #{Redirect}")
-      Client = system("java -client #{Redirect}")
+      def self.redirect
+        @redirect ||= "> #{Redcar.null_device} 2>&1"
+      end
+      
+      def self.d32
+        @d32 ||= system("java -d32 #{redirect}")
+      end
+      
+      def self.client 
+        @client ||= system("java -client #{redirect}")
+      end
     end
   end
 end