redcar 0.3.4.3 → 0.3.5

data/CHANGES

@@ -1,4 +1,49 @@
 
+Version 0.3.5dev (1 May 2010)
+=============================
+
+Enhancements:
+  
+  * Jump to declaration support for Ruby and Java
+  * Double click respects word boundaries
+  * Window title reflects project name
+  * Duplicate region command
+  * Switch tab with Alt-1, Alt-2 (or Cmd-1, Cmd-2 on OSX)
+  * Prompts to save modified tabs on tab, window or application close
+  * Snippet menus show tab trigger more nicely (linux/windows)
+  * Watches to changes to open files, and prompts to revert
+  * Project view sorts directories before files (by popular request!)
+  * Shows menu bar on OSX when there are no windows open
+  * Halve startup time from 0.3.4 (warm startup)
+  * Added background Task APIs.
+  * Task Manager
+  * Added ProjectRefresh Task API
+  * No longer dumps command errors to the console
+  * Command history tab
+  * Speed up opening of first file by lazy loading embedded grammars
+  * Sped up Ruby highlighting by 17x
+  * Doesn't die on long lines (gives up after 500 characters now)
+  * Added show/hide invisible characters menu option
+  * Smart indentation as you type (based on Textmate bundle rules)
+  * Add profiling commands to the Debug menu (uses jruby-prof)
+  * Lazy menus API
+  * Commands to profile Redcar with jruby-prof.
+  
+Fixes:
+
+  * Fix delete at end of line when using "\r\n" delimiter
+  * Increase and decrease indent commands respect soft tabs and tab width settings
+  * Directory tree sorts correctly
+  * Speed up opening a project (about 1s faster)
+  
+New contributors:
+
+  * Antono Vasiljev
+  * Sergey Potapov
+  * Kirill Nikitin
+  * Juozas Gaigalas
+  * Tim Felgentreff
+
 Version 0.3.4dev (7 Mar 2010)
 =============================
 

data/README.md

@@ -13,7 +13,7 @@ A pure Ruby text editor running on JRuby.
 
 You must have Java installed. 
 
-    $ sudo gem install redcar --pre
+    $ sudo gem install redcar
     $ sudo redcar install
     
 NB the install will take a minute or so to complete as it has to download about
@@ -29,6 +29,7 @@ for a list of options.
 
 ## INSTALLING FROM SOURCE
 
+If you want to contribute to Redcar, you can install it from the source code.
 Download from github, checkout the submodules and build JavaMateView. You will need Ant 
 installed, and RSpec and Cucumber installed as JRuby gems.
 

data/ROADMAP.md

@@ -11,7 +11,6 @@ Features still to port
   * Drag and drop of tabs
   * Packaged for one-click install on 3 platforms
   * Ruby on Rails/HTML/CSS/YAML bundle commands ported
-  * Use Gecko as embedded browser widget on all 3 platforms
   
 Version 0.4.0
 -------------

data/Rakefile

@@ -60,9 +60,12 @@ end
 
 desc "Build"
 task :build do
-  sh("ant jar -f vendor/java-mateview/build.xml")
-  cp("vendor/java-mateview/lib/java-mateview.rb", "plugins/edit_view_swt/vendor/")
-  cp("vendor/java-mateview/release/java-mateview.jar", "plugins/edit_view_swt/vendor/")
+  sh "ant jar -f vendor/java-mateview/build.xml"
+  cp "vendor/java-mateview/lib/java-mateview.rb", "plugins/edit_view_swt/vendor/"
+  cp "vendor/java-mateview/release/java-mateview.jar", "plugins/edit_view_swt/vendor/"
+  cd "plugins/application_swt" do
+    sh "ant"
+  end
 end
 
 def remove_gitignored_files(filelist)
@@ -75,7 +78,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name              = "redcar"
-  s.version           = "0.3.4.3"
+  s.version           = "0.3.5"
   s.summary           = "A JRuby text editor."
   s.author            = "Daniel Lucraft"
   s.email             = "dan@fluentradical.com"
@@ -117,6 +120,9 @@ to complete the installation.
 
 (If you installed the gem with 'sudo', you will need to run 'sudo redcar install').
 
+NB. This will download jars that Redcar needs to run from the internet. It will put
+them only into the Redcar gem directory.
+
 ------------------------------------------------------------------------------------
 
 TEXT

data/bin/redcar

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 $VERBOSE = true if ARGV.find{|arg| arg == '--verbose'}
+require File.join(File.dirname(__FILE__), %w(.. lib redcar_quick_start))
 
 if ARGV.first == "install"
   require File.join(File.dirname(__FILE__), %w(.. lib redcar))
@@ -13,12 +14,11 @@ elsif ARGV.first == '--associate_with_any_right_click'
   installer = Redcar::Installer.new
   installer.associate_with_any_right_click
 else
-  require File.join(File.dirname(__FILE__), %w(.. lib redcar_quick_start))
   exit if Redcar.try_to_load_via_drb
   require File.join(File.dirname(__FILE__), %w(.. lib redcar))
   Redcar.spin_up
   Redcar.environment = :user
   Redcar.load
-  Redcar::Top.start
+  Redcar::Top.start(ARGV)
   Redcar.pump
 end

data/lib/openssl/build.properties

@@ -0,0 +1,7 @@
+version.target=1.5
+version.source=1.5
+jruby.home=/Users/danlucraft/Programs/jruby
+jruby.jar=${jruby.home}/lib/jruby.jar
+# set this to an alternate location to compile against a different jruby.jar
+#jruby.jar=lib/jruby.jar
+

data/lib/plugin_manager/lib/plugin_manager.rb

@@ -18,6 +18,14 @@ class PluginManager
   def plugins
     @unloaded_plugins + @loaded_plugins
   end
+  
+  def plugin_objects
+    @loaded_plugins.map {|definition| definition.object}
+  end
+  
+  def objects_implementing(method_name)
+    plugin_objects.select {|obj| obj.respond_to?(method_name) }
+  end
 
   def add_plugin_source(directory)
     definition_files = Dir[File.join(File.expand_path(directory), "*", "plugin.rb")]
@@ -40,6 +48,7 @@ class PluginManager
   end
   
   def load
+    start = Time.now
     previous_length = @unloaded_plugins.length + 1
     while previous_length > @unloaded_plugins.length
       previous_length = @unloaded_plugins.length
@@ -57,6 +66,7 @@ class PluginManager
         @unloaded_plugins.delete(plugin)
       end
     end
+    puts "[PluginManager] took #{Time.now - start}s to load plugins" if ENV["PLUGIN_DEBUG"]
   end
   
   private

data/lib/plugin_manager/lib/plugin_manager/plugin_definition.rb

@@ -21,15 +21,7 @@ class PluginManager
     end
     
     def load
-      required_files.each do |file|
-        #fn = File.expand_path(file, definition_directory)
-        #p file
-        #p fn
-        #if fn.match(/^#{Regexp.escape(definition_directory)}/)
-        #p :delete
-          $".delete(file)
-        #end
-      end
+      required_files.each {|file| $".delete(file) }
       load_file = File.expand_path(File.join(File.dirname(definition_file), file))
       $:.unshift(File.dirname(load_file))
       new_files = log_requires do
@@ -45,10 +37,6 @@ class PluginManager
       eval(object_string)
     end
     
-    def definition_directory
-      File.expand_path(File.dirname(@definition_file))
-    end
-    
     private
     
     def log_requires

data/lib/redcar.rb

@@ -40,12 +40,14 @@ require 'yaml'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.4'
+  VERSION         = '0.3.5'
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 3
-  VERSION_RELEASE = 4
+  VERSION_RELEASE = 5
   
   ENVIRONMENTS = [:user, :debug, :test]
+  
+  PROCESS_START_TIME = Time.now
 
   def self.environment=(env)
     unless ENVIRONMENTS.include?(env)
@@ -85,9 +87,6 @@ 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__), "openssl", "lib"))
-    require 'openssl'
-
     plugin_manager.load
     if plugin_manager.unreadable_definitions.any?
       puts "Couldn't read definition files: "
@@ -130,14 +129,19 @@ module Redcar
   #
   # @return [String] expanded path
   def self.user_dir
+    dirname = {
+      :user => ".redcar",
+      :test => ".redcar_test",
+      :debug => ".redcar_debug"
+    }[Redcar.environment]
     if platform == :windows
       if ENV['USERPROFILE'].nil?
-        userdir = "C:/My Documents/.redcar/"
+        userdir = "C:/My Documents/#{dirname}/"
       else
-        userdir = File.join(ENV['USERPROFILE'], ".redcar")
+        userdir = File.join(ENV['USERPROFILE'], dirname)
       end
     else
-      userdir = File.join(ENV['HOME'], ".redcar") unless ENV['HOME'].nil?
+      userdir = File.join(ENV['HOME'], dirname) unless ENV['HOME'].nil?
     end
     File.expand_path(userdir)
   end

data/lib/redcar/installer.rb

@@ -77,7 +77,7 @@ module Redcar
       "/jruby/joni.jar"
     ]
 
-    JRUBY << "http://jruby.kenai.com/downloads/1.4.0/jruby-complete-1.4.0.jar" unless RUBY_PLATFORM =~ /java/
+    JRUBY << "http://jruby.kenai.com/downloads/1.4.0/jruby-complete-1.4.0.jar"
     
     JOPENSSL = {
       "/jruby/bcmail-jdk14-139-#{Redcar::VERSION}.jar" => "lib/openssl/lib/bcmail-jdk14-139.jar",
@@ -86,7 +86,8 @@ module Redcar
     }
 
     REDCAR_JARS = {
-      "/java-mateview-#{Redcar::VERSION}.jar" => "plugins/edit_view_swt/vendor/java-mateview.jar"
+      "/java-mateview-#{Redcar::VERSION}.jar" => "plugins/edit_view_swt/vendor/java-mateview.jar",
+      "/application-swt-#{Redcar::VERSION}.jar" => "plugins/application_swt/lib/dist/application_swt.jar"
     }
     
     XULRUNNER_URI = "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2/runtimes/xulrunner-1.9.2.en-US.win32.zip"
@@ -152,19 +153,19 @@ module Redcar
     
     # unzip a .zip file into the directory it is located
     def self.unzip_file(source)
-      source = File.expand_path(source)
-      Dir.chdir(File.dirname(source)) do
-        Zip::ZipFile.open(source) do |zipfile|
-          zipfile.entries.each do |entry|
-            FileUtils.mkdir_p(File.dirname(entry.name))
-          	begin
-              entry.extract
-            rescue Zip::ZipDestinationFileExistsError
-            end
-          end
-        end
-      end
-    end
+      source = File.expand_path(source)
+      Dir.chdir(File.dirname(source)) do
+        Zip::ZipFile.open(source) do |zipfile|
+          zipfile.entries.each do |entry|
+            FileUtils.mkdir_p(File.dirname(entry.name))
+          	begin
+              entry.extract
+            rescue Zip::ZipDestinationFileExistsError
+            end
+          end
+        end
+      end
+    end
   end
 end
 

data/lib/redcar/ruby_extensions.rb

@@ -15,4 +15,149 @@ end
 
 def ARGV.option(name)
   ARGV.map {|arg| arg =~/--#{name}=(.*)$/; $1}.compact.first
-end
+end
+
+module AndAnd
+  
+  # This module is included in Object, so each of these methods are added
+  # to Object when you require 'andand'. Each method is an *adverb*: they are
+  # intended to be enchained with another method, such as receiver.adverb.method
+  #
+  # The purpose of an adverb is to modify what the primary method returns.
+  #
+  # Adverbs also take blocks or procs, passing the receiver as an argument to the
+  # block or proc. They retain the same semantics with a block or proc as they
+  # do with a method. This behaviour weakly resembles a monad.
+  module ObjectGoodies
+    
+    # Returns nil if its receiver is nil, regardless of whether nil actually handles the
+    # actual method ot what it might return. 
+    #
+    #    'foo'.andand.size => 3
+    #    nil.andand.size => nil
+    #    'foo'.andand { |s| s << 'bar' } => 'foobar'
+    #    nil.andand { |s| s << 'bar' } => nil
+    def andand (p = nil)
+      if self
+        if block_given?
+          yield(self)
+        elsif p
+          p.to_proc.call(self)
+        else
+          self
+        end
+      else
+        if block_given? or p
+          self
+        else
+          MockReturningMe.new(self)
+        end
+      end 
+    end
+
+    # Invokes the method and returns the receiver if nothing is raised. Therefore,
+    # the purpose of calling the method is strictly for side effects. In the block
+    # form, it resembles #tap from Ruby 1.9, and is useful for debugging. It also
+    # resembles #returning from Rails, with slightly different syntax.
+    #
+    #    Object.new.me do |o|
+    #      def o.foo
+    #        'foo'
+    #      end
+    #    end
+    #      => your new object
+    #
+    # In the method form, it is handy for chaining methods that don't ordinarily
+    # return the receiver:
+    #
+    #    [1, 2, 3, 4, 5].me.pop.reverse
+    #      => [4, 3, 2, 1]
+    def me (p = nil)
+      if block_given?
+        yield(self)
+        self
+      elsif p
+        p.to_proc.call(self)
+        self
+      else
+        ProxyReturningMe.new(self)
+      end
+    end
+    
+    unless Object.instance_methods.include?('tap')
+      alias :tap :me
+    end
+    
+    # Does not invoke the method or block and returns the receiver.
+    # Useful for comemnting stuff out, especially if you are using #me for
+    # debugging purposes: change the .me to .dont and the semantics of your
+    # program are unchanged.
+    #
+    #    [1, 2, 3, 4, 5].me { |x| p x }
+    #      => prints and returns the array
+    #    [1, 2, 3, 4, 5].dont { |x| p x }
+    #      => returns the array without printing it
+    def dont (p = nil)
+      if block_given?
+        self
+      elsif p
+        self
+      else
+        MockReturningMe.new(self)
+      end
+    end
+    
+  end
+  
+end
+
+class Object
+  include AndAnd::ObjectGoodies
+end
+  
+unless Module.constants.map { |c| c.to_s }.include?('BlankSlate')
+ if Module.constants.map { |c| c.to_s }.include?('BasicObject')
+    module AndAnd
+      class BlankSlate < BasicObject
+      end
+    end
+  else
+    module AndAnd
+      class BlankSlate
+        def self.wipe
+          instance_methods.reject { |m| m =~ /^__/ }.each { |m| undef_method m }
+        end
+        def initialize
+          BlankSlate.wipe
+        end
+      end
+    end
+  end
+end
+
+module AndAnd
+  # A proxy that returns its target without invoking the method you
+  # invoke. Useful for nil.andand and #dont
+  class MockReturningMe < BlankSlate
+    def initialize(me)
+      super()
+      @me = me
+    end
+    def method_missing(*args)
+      @me
+    end
+  end
+
+  # A proxy that returns its target after invoking the method you
+  # invoke. Useful for #me
+  class ProxyReturningMe < BlankSlate
+    def initialize(me)
+      super()
+      @me = me
+    end
+    def method_missing(sym, *args, &block)
+      @me.__send__(sym, *args, &block)
+      @me
+    end
+  end
+end