redcar 0.3.0dev → 0.3.1dev

data/CHANGES

@@ -1,15 +1,41 @@
 
-Version 0.3dev
-==============
+Version 0.3.1dev (9 Jan 2010)
+======================
+
+Enhancements:
+
+  * Fuzzy file finder.
+  * Directory tree refreshes on window focus.
+  * Keybindings to switch tabs and notebooks.
+  * Undo/redo.
+  * Home/end keys.
+  * Modified tabs have little stars before their names.
+  * Increase indent and decrease indent commands (need further work).
+  * Themes support bold, italic and underline again.
+  * All commands are greyed out when inapplicable.
+  * Files can not be opened twice.
+  * Added Java, Perl and Ruby on Rails bundles.
+  * New simpler way for bundles to add commands to menus (used in repl.rb)
+  * New "redcar install" command to download jars.
+  
+Fixes:
+
+  * Change key logic in JavaMateView - should fix a bunch of subtle highlighting bugs.
+  * Runs on Java 5.
+  * Open Directory doesn't log an error if you cancel.
+
+Version 0.3.0dev (25 Dec 2009)
+==============================
 
 Rewritten in JRuby/SWT.
 
 Enhancements:
   
-  * _Much_ simpler installation
+  * _Much_ simpler installation: packaged as a gem.
   * Faster highlighter
   * Fewer bugs
   * Clearer architecture
+  * Multiple window/project support.
 
 
 Version 0.2 (28 May 2009)

data/README.md

@@ -23,6 +23,39 @@ You must have Java installed.
 NB the install will take a minute or so to complete as it has to download about
 15MB of jar files.
 
+## USAGE
+
+Run 
+
+    $ redcar
+    
+Usage:
+
+         --font=FONT  Choose font
+    --font-size=SIZE  Choose font point size
+       --theme=THEME  Choose Textmate theme
+
+## INSTALLING FROM SOURCE
+
+Download from github, checkout the submodules and build JavaMateView. You will need Ant 
+installed, and RSpec and Cucumber installed as JRuby gems.
+
+    $ git clone git://github.com/danlucraft/redcar.git
+    $ cd redcar
+    $ git submodule init
+    $ git submodule update
+    $ jruby ext/extconf.rb
+    $ jruby -S rake build
+
+To run:
+
+    $ jruby bin/redcar
+
+To run on OSX:
+
+    $ jruby -J-XstartOnFirstThread bin/redcar        
+
+
 ## PROBLEMS?
 
 * Irc at #redcar on irc.freenode.net

data/ROADMAP.md

@@ -1,13 +1,13 @@
 
-Redcar Development Roadmap
-==========================
+Redcar JRuby Port Roadmap
+=========================
 
-0.3dev - *Developer preview*
-----------------------------
+0.3dev - *Developer preview* - DONE
+-----------------------------------
 
 This will be the first JRuby release of Redcar. 
 
-The features of this release are chosen to be the minimum to make Redcar self-hosting as a reasonable editor:
+The features of this release are chosen to be the minimum to make Redcar self-hosting as an editor:
 
   * Syntax Highlighting           (done)
   * File editing                  (done)
@@ -15,44 +15,42 @@ The features of this release are chosen to be the minimum to make Redcar self-ho
   * Multiple windows              (done)
   * _Basic_ project pane          (done)
   * Auto-indenter                 (done)
-  * Tests passing on 3 platforms 
+  * Packaged as a gem             (done)
+  * Runs on 3 platforms           (done)  
 
-0.3.1dev - *Developer preview*
+0.3.1dev - *Developer preview* - DONE
 ------------------------------
 
 Features:
 
+  * Keybindings to switch tabs    (done)
+  * Text editing stuff:          
+      - Undo/Redo                 (done)
+      - Home/End                  (done)
+  * Project stuff: 
+      - watches for file changes  (done)
+      - fuzzy file finder         (done)
+  * Plugins stuff:
+      - can add to menus easily   (done)
+  
+More previews to add
+--------------------
+
+  * Tests passing on 3 platforms
   * Dialog library with simple DSL
+  * Gem plugins
   * Per-plugin storage
   * HTML output from commands
   * Tooltip output from commands
   * Full project support
   * Fuzzy file finder
   * Speedbar returns
-  
-0.3.2dev - *Developer preview*
-------------------------------
-
-Features:
-
   * Embedded web server for plugins/plugin configuration
   * Snippets
   * Go to symbol
-  
-0.3.3dev - *Developer preview*
-------------------------------
-
-Features:
-
   * Autocompletion
   * Bracket matching
   * Text/Source/Ruby bundle commands ported
-  
-0.3.4dev - *Developer preview*
-------------------------------
-
-Features: 
-
   * Drag and drop of tabs
   * Packaged for one-click install on 3 platforms
   * Ruby on Rails/HTML/CSS/YAML bundle commands ported

data/Rakefile

@@ -1,11 +1,10 @@
 
-# To create Rake tasks for your plugin, put them in plugins/my_plugin/Rakefile or
-# plugins/my_plugin/tasks/my_tasks.rake.
-
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
 require 'cucumber/rake/task'
+require "rake/gempackagetask"
+require "rake/rdoctask"
 
 if RUBY_PLATFORM =~ /mswin/
   begin
@@ -15,21 +14,7 @@ if RUBY_PLATFORM =~ /mswin/
   end
 end
 
-def plugin_names
-  Dir["plugins/*"].map do |fn|
-    name = fn.split("/").last
-  end
-end
-
-Dir[File.join(File.dirname(__FILE__), *%w[plugins *])].each do |plugin_dir|
-  rakefiles = [File.join(plugin_dir, "Rakefile")] + 
-    Dir[File.join(plugin_dir, "tasks", "*.rake")]
-  rakefiles.each do |rakefile|
-    if File.exist?(rakefile)
-      load rakefile
-    end
-  end
-end
+### DOCUMENTATION
 
 begin
   require 'yard'
@@ -52,9 +37,28 @@ task :yardoc do
   %x(yardoc #{files.join(" ")} -o yardoc)
 end
 
+
+# Generate documentation
+Rake::RDocTask.new do |rd|
+  rd.main = "README.md"
+  rd.rdoc_files.include("README.md", "lib/**/*.rb")
+  rd.rdoc_dir = "rdoc"
+end
+
+### TESTS
+
 desc "Run all specs and features"
 task :default => ["specs", "cucumber"]
 
+Spec::Rake::SpecTask.new("specs") do |t|
+  t.spec_files = FileList[
+    'plugins/*/spec/*/*_spec.rb',
+    'plugins/*/spec/*/*/*_spec.rb',
+    'plugins/*/spec/*/*/*/*_spec.rb',
+  ]
+  t.spec_opts = ["-c"]
+end
+
 desc "Run features"
 task :cucumber do
   case Config::CONFIG["host_os"]
@@ -65,45 +69,15 @@ task :cucumber do
   end
 end
 
-Spec::Rake::SpecTask.new("specs") do |t|
-  t.spec_files = FileList[
-    'plugins/*/spec/*/*_spec.rb',
-    'plugins/*/spec/*/*/*_spec.rb',
-    'plugins/*/spec/*/*/*/*_spec.rb',
-  ]
-  t.spec_opts = ["-c"]
-end
+### BUILD AND RELEASE
 
 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/")
-  # Dir["vendor/java-mateview/lib/*.jar"].each do |fn|
-  #   FileUtils.cp(fn, "plugins/edit_view_swt/vendor/")
-  # end
-end
-
-desc "Package jars and submodules into big tar file"
-task :package do
-  sh("COPYFILE_DISABLE=true \
-      tar czvf redcar_jars.tar.gz \
-          --exclude textmate/.git \
-          --exclude **/._* \
-          --exclude *.off \
-      plugins/application_swt/vendor/swt/{osx64,linux,linux64,windows}/swt.jar \
-      plugins/application_swt/vendor/jface/org.eclipse.*.jar \
-      plugins/edit_view_swt/vendor/*.jar \
-      plugins/edit_view_swt/vendor/java-mateview.rb \
-      textmate/Bundles textmate/Themes"
-  )
 end
 
-
-require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
-
 def remove_gitignored_files(filelist)
   ignores = File.readlines(".gitignore")
   ignores = ignores.select {|ignore| ignore.chomp.strip != ""}
@@ -112,17 +86,12 @@ def remove_gitignored_files(filelist)
   r.select {|fn| fn !~ /\.jar$/}
 end
 
-# This builds the actual gem. For details of what all these options
-# mean, and other ones you can add, check the documentation here:
-#
-#   http://rubygems.org/read/chapter/20
-#
 spec = Gem::Specification.new do |s|
   
   # Change these as appropriate
   s.name              = "redcar"
-  s.version           = "0.3.0dev"
-  s.summary           = "A JRuby text editor. (Installing the gem will take a while as it downloads assets during the install.)"
+  s.version           = "0.3.1dev"
+  s.summary           = "A JRuby text editor."
   s.author            = "Daniel Lucraft"
   s.email             = "dan@fluentradical.com"
   s.homepage          = "http://redcareditor.com"
@@ -135,11 +104,10 @@ spec = Gem::Specification.new do |s|
   # Add any extra files to include in the gem
   s.files             = %w(CHANGES LICENSE Rakefile README.md ROADMAP.md) + 
                           Dir.glob("bin/redcar") + 
-                          Dir.glob("ext/**/*") + 
                           Dir.glob("config/**/*") + 
                           remove_gitignored_files(Dir.glob("lib/**/*")) + 
                           remove_gitignored_files(Dir.glob("plugins/**/*")) + 
-                          Dir.glob("textmate/Bundles/*.tmbundle/{Syntaxes,Snippets,Templates}/**/*") + 
+                          Dir.glob("textmate/Bundles/*.tmbundle/Syntaxes/**/*") + 
                           Dir.glob("textmate/Themes/*.tmTheme")
   s.executables       = FileList["bin/redcar"].map { |f| File.basename(f) }
    
@@ -153,27 +121,25 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency("cucumber")
   s.add_development_dependency("rspec")
   
-  
-  s.extensions = ["ext/extconf.rb"]
+  s.post_install_message = <<TEXT
+
+------------------------------------------------------------------------------------
+
+Please now run:
+
+  $ redcar install
+
+to complete the installation. 
+
+(If you installed the gem with 'sudo', you will need to run 'sudo redcar install').
+
+------------------------------------------------------------------------------------
+
+TEXT
 end
 
-# This task actually builds the gem. We also regenerate a static 
-# .gemspec file, which is useful if something (i.e. GitHub) will
-# be automatically building a gem for this project. If you're not
-# using GitHub, edit as appropriate.
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
-  
-  # Generate the gemspec file for github.
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
-
-# Generate documentation
-Rake::RDocTask.new do |rd|
-  rd.main = "README.md"
-  rd.rdoc_files.include("README.md", "lib/**/*.rb")
-  rd.rdoc_dir = "rdoc"
 end
 
 RELEASE_BUNDLES = %w(
@@ -184,10 +150,21 @@ RELEASE_BUNDLES = %w(
     RedcarRepl.tmbundle
     Text.tmbundle
     Source.tmbundle
-  )
+    Cucumber.tmbundle
+    Java.tmbundle
+    Perl.tmbundle
+  ) + ["Ruby on Rails.tmbundle"]
 
 desc 'Clean up the Textmate files for packaging'
 task :clean_textmate do
+  # remove unwanted bundles
+  Dir["textmate/Bundles/*"].each do |bdir|
+    p bdir.split("/").last
+    unless RELEASE_BUNDLES.include?(bdir.split("/").last)
+      FileUtils.rm_rf(bdir)
+    end
+  end
+
   # rename files to be x-platform safe
   Dir["textmate/Bundles/*.tmbundle/{Syntaxes,Snippets,Templates}/**/*"].each do |fn|
     if File.file?(fn)
@@ -203,18 +180,14 @@ task :clean_textmate do
           FileUtils.mv(fn, new_fn)
         end
       else
-        FileUtils.mv(fn, new_fn)
+        begin
+          FileUtils.mv(fn, new_fn)
+        rescue => e
+          puts e
+        end
       end
     end
   end
-  
-  # remove unwanted bundles
-  Dir["textmate/Bundles/*"].each do |bdir|
-    p bdir.split("/").last
-    unless RELEASE_BUNDLES.include?(bdir.split("/").last)
-      FileUtils.rm_r(bdir)
-    end
-  end
 end
 
 desc 'Clear out RDoc and generated packages'

data/bin/redcar

@@ -2,5 +2,11 @@
 
 require File.join(File.dirname(__FILE__), %w(.. lib redcar))
 
-Redcar.start
-Redcar.pump
+if ARGV.first == "install"
+  installer = Redcar::Installer.new
+  installer.install
+else
+  Redcar.ensure_jruby
+  Redcar.start
+  Redcar.pump
+end

data/lib/freebase2/lib/freebase/readers.rb

@@ -29,12 +29,19 @@ module FreeBASE
       require 'yaml'
     end
     
+    def self.windows?
+      (RUBY_PLATFORM =~ /(mswin32|mingw32)/) || 
+         ( (RUBY_PLATFORM == 'java') && 
+           (java.lang.System.getProperty('os.name') =~ /Windows/)
+         )
+    end
+    
     ##
     # Determine where the user directory is (if any)
     #
     def self.setup
       $FREEBASE_APPLICATION = "redcar" unless $FREEBASE_APPLICATION
-      if RUBY_PLATFORM =~ /(mswin32|mingw32)/
+      if windows?
         if ENV['USERPROFILE'].nil?
           @@userdir = "C:/My Documents/.redcar/"
           Dir.mkdir(@@userdir) unless File.directory?(@@userdir)

data/lib/redcar.rb

@@ -3,10 +3,25 @@ $:.push File.join(File.dirname(__FILE__))
 
 require 'rbconfig'
 
-if Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
-  require 'redcar/boot'
-else
-  require 'redcar/runner'
-  runner = Redcar::Runner.new
-  runner.spin_up
-end
+module Redcar
+  VERSION         = '0.3.1dev'
+  VERSION_MAJOR   = 0
+  VERSION_MINOR   = 3
+  VERSION_RELEASE = 1
+
+  def self.ensure_jruby
+    if Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
+      boot
+    else
+      require 'redcar/runner'
+      runner = Redcar::Runner.new
+      runner.spin_up
+    end
+  end
+  
+  def self.boot
+    require 'redcar/boot'
+  end
+end
+
+require 'redcar/installer'