redcar 0.2.9dev → 0.3.0dev

data/ROADMAP.md

@@ -13,8 +13,8 @@ The features of this release are chosen to be the minimum to make Redcar self-ho
   * File editing                  (done)
   * Multiple notebook panes       (done)
   * Multiple windows              (done)
-  * _Basic_ project pane
-  * Auto-indenter
+  * _Basic_ project pane          (done)
+  * Auto-indenter                 (done)
   * Tests passing on 3 platforms 
 
 0.3.1dev - *Developer preview*

data/Rakefile

@@ -79,9 +79,9 @@ 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
+  # 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"
@@ -121,7 +121,7 @@ spec = Gem::Specification.new do |s|
   
   # Change these as appropriate
   s.name              = "redcar"
-  s.version           = "0.2.9dev"
+  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.author            = "Daniel Lucraft"
   s.email             = "dan@fluentradical.com"

data/lib/redcar/boot.rb

@@ -14,6 +14,8 @@ require 'freebase/freebase'
 require 'redcar/ruby_extensions'
 require 'redcar/usage'
 
+require 'forwardable'
+
 # ## Loading and Initialization
 #
 # Every feature in Redcar is written as a plugin. This module contains a few 
@@ -101,5 +103,6 @@ module Redcar
 end
 
 usage = Redcar::Usage.new
+usage.version_string
 usage.version_requested
 usage.help_requested

data/lib/redcar/install.rb

@@ -3,10 +3,10 @@ require 'rbconfig'
 require 'open-uri'
 require 'fileutils'
 
-# Methods used in gem installation hooks
-#
-# Cribbed from the zerg and zerg_support gems by Victor Costan (big woop!)
 module Redcar
+  # Methods used in gem installation hooks
+  #
+  # Cribbed from the zerg and zerg_support gems by Victor Costan (big woop!)
   class Install
     
     # tricks rubygems into believeing that the extension compiled and worked out

data/lib/redcar/runner.rb

@@ -11,7 +11,7 @@ module Redcar
     # our vendored jarred one (useful for gems).
     def spin_up
       bin = "#{File.dirname(__FILE__)}/../../bin/redcar"
-      jruby_complete = Dir[File.dirname(__FILE__) + "/../jruby-complete*.jar"].first
+      jruby_complete = Dir[File.dirname(__FILE__) + "/../jruby-complete-1.4.0.jar"].first
       args = []
       if false
         command = "jruby #{java_args} \"#{bin}\" #{ARGV.join(' ')}"

data/lib/redcar/usage.rb

@@ -2,6 +2,11 @@
 module Redcar
   
   class Usage
+    def version_string
+      str = "Redcar #{Redcar::VERSION} (jruby )"
+      puts str
+    end
+    
     def version_requested
       if ARGV.include?("-v")
         puts "Redcar #{Redcar::VERSION}"

data/plugins/application/features/step_definitions/tree_steps.rb

@@ -0,0 +1,6 @@
+Then /^I should see "([^\"]*)" in the tree$/ do |rows|
+  rows = rows.split(",").map {|r| r.strip}
+  rows.each do |row|
+    top_tree.items.include?(row).should be_true
+  end
+end

data/plugins/application/features/support/env.rb

@@ -9,6 +9,26 @@ module SwtHelper
   def first_shell
     Redcar::ApplicationSWT.display.get_shells.to_a.first
   end
+  
+  def sash_form 
+    first_shell.getChildren.to_a.first
+  end
+  
+  def tree_book
+    sash_form.getChildren.to_a.first
+  end
+  
+  def top_tree
+    r = tree_book.getLayout.topControl
+    r.extend(TreeHelpers)
+    r
+  end
+  
+  module TreeHelpers
+    def items
+      getItems.to_a.map {|item| item.getText}
+    end
+  end
 end
     
 class FakeDialogAdapter
@@ -24,9 +44,47 @@ class FakeDialogAdapter
     @responses[:open_file]
   end
   
+  def open_directory(*args)
+    @responses[:open_directory]
+  end
+  
   def save_file(*args)
     @responses[:save_file]
   end
 end
 
-World(SwtHelper)
+World(SwtHelper)
+
+After do
+  Redcar.app.windows.each do |win|
+    while tree = win.treebook.trees.first
+      Redcar::ApplicationSWT.sync_exec do
+        win.treebook.remove_tree(tree)
+      end
+    end
+    win.notebooks.each do |notebook|
+      while tab = notebook.tabs.first
+        Redcar::ApplicationSWT.sync_exec do
+          tab.close
+        end
+      end
+    end
+    if win.notebooks.length == 2
+      Redcar::ApplicationSWT.sync_exec do
+        win.close_notebook
+      end
+    end
+  end
+  while Redcar.app.windows.length > 1
+    Redcar::ApplicationSWT.sync_exec do
+      Redcar.app.windows.last.close
+    end
+  end
+end
+
+
+
+
+
+
+

data/plugins/application/lib/application.rb

@@ -11,6 +11,7 @@ require 'application/menu/builder'
 require 'application/notebook'
 require 'application/tab'
 require 'application/tab/command'
+require 'application/treebook'
 require 'application/window'
 
 module Redcar
@@ -81,6 +82,9 @@ module Redcar
       end
       @window_handlers[window].each {|h| window.remove_listener(h) }
       @window_handlers.delete(window)
+      if windows.length == 0  and [:linux, :windows].include?(Core.platform)
+        quit
+      end
     end
     
     def focussed_window

data/plugins/application/lib/application/command/executor.rb

@@ -1,3 +1,4 @@
+
 module Redcar
   class Command
     class Executor
@@ -15,7 +16,7 @@ module Redcar
       def execute
         @command_instance.environment(Executor.current_environment)
         begin
-          @command_instance.execute
+          result = @command_instance.execute
         rescue Object => e
           @command_instance.error = e
           log_error
@@ -24,6 +25,7 @@ module Redcar
           log_error
         end
         record
+        result
       end
       
       private

data/plugins/application/lib/application/dialog.rb

@@ -5,6 +5,11 @@ module Redcar
       def self.open_file(window, options)
         Redcar.gui.dialog_adapter.open_file(window, options)
       end
+      
+      # Prompt the user with an open directory dialog. Returns a path.
+      def self.open_directory(window, options)
+        Redcar.gui.dialog_adapter.open_directory(window, options)
+      end
 
       # Prompt the user with an save file dialog. Returns a path.
       def self.save_file(window, options)

data/plugins/application/lib/application/treebook.rb

@@ -0,0 +1,30 @@
+module Redcar
+  class Treebook
+    include Redcar::Observable
+    include Redcar::Model
+    
+    attr_reader :trees
+    
+    def initialize
+      @trees = []
+    end
+    
+    # Add a tree to this treebook
+    #
+    # @param [Redcar::Tree]
+    def add_tree(tree)
+      @trees << tree
+      notify_listeners(:tree_added, tree)
+    end
+    
+    # Remove a tree from this treebook
+    #
+    # @param [Redcar::Tree]
+    def remove_tree(tree)
+      if @trees.include?(tree)
+        @trees.delete(tree)
+        notify_listeners(:tree_removed, tree)
+      end
+    end
+  end
+end

data/plugins/application/lib/application/window.rb

@@ -10,15 +10,15 @@ module Redcar
     end
 
     attr_reader :notebooks, :notebook_orientation
-    attr_reader :trees
-
+    attr_reader :treebook
+    
     def initialize
       Window.all << self
       @visible   = false
       @notebooks = []
-      @trees     = []
       @notebook_orientation = :horizontal
       create_notebook
+      @treebook = Treebook.new
       self.title = "Redcar"
     end
 

data/plugins/application/spec/application/treebook_spec.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe Redcar::Treebook do
+  
+  describe "a new treebook" do
+    before do
+      @treebook = Redcar::Treebook.new
+    end
+    
+    it "has no trees" do
+      @treebook.trees.length.should == 0
+    end
+    
+    it "accepts a tree and notifies listeners" do
+      tree = "mock tree"
+      tree_added = false
+      @treebook.add_listener(:tree_added) do |tree|
+        tree_added = tree
+      end
+      
+      @treebook.add_tree(tree)
+      
+      tree_added.should == tree
+      @treebook.trees.should == [tree]
+    end
+  end
+end

data/plugins/application/spec/application/window_spec.rb

@@ -16,8 +16,8 @@ describe Redcar::Window do
       @called_menu_changed.should be_true
     end
 
-    it "has no trees" do
-      @window.trees.length.should == 0
+    it "has a treebook" do
+      @window.treebook.should be_an_instance_of(Redcar::Treebook)
     end
     
   end

data/plugins/application_swt/lib/application_swt.rb

@@ -8,6 +8,7 @@ require "application_swt/notebook"
 require "application_swt/notebook/drag_and_drop_listener"
 require "application_swt/swt_wrapper"
 require "application_swt/tab"
+require "application_swt/treebook"
 require "application_swt/window"
 require "application_swt/swt/grid_data"
 

data/plugins/application_swt/lib/application_swt/dialog_adapter.rb

@@ -5,6 +5,10 @@ module Redcar
         file_dialog(window, Swt::SWT::OPEN, options)
       end
       
+      def open_directory(window, options)
+        directory_dialog(window, options)
+      end
+      
       def save_file(window, options)
         file_dialog(window, Swt::SWT::SAVE, options)
       end
@@ -18,6 +22,14 @@ module Redcar
         end
         dialog.open
       end
+      
+      def directory_dialog(window, options)
+        dialog = Swt::Widgets::DirectoryDialog.new(window.controller.shell)
+        if options[:filter_path]
+          dialog.set_filter_path(options[:filter_path])
+        end
+        dialog.open
+      end
     end
   end
 end

data/plugins/application_swt/lib/application_swt/swt_wrapper.rb

@@ -38,6 +38,7 @@ module Swt
     import org.eclipse.swt.widgets.Composite
     import org.eclipse.swt.widgets.Display
     import org.eclipse.swt.widgets.Event
+    import org.eclipse.swt.widgets.DirectoryDialog
     import org.eclipse.swt.widgets.FileDialog
     import org.eclipse.swt.widgets.Label
     import org.eclipse.swt.widgets.Menu
@@ -52,6 +53,7 @@ module Swt
     import org.eclipse.swt.custom.CTabFolder
     import org.eclipse.swt.custom.CTabItem
     import org.eclipse.swt.custom.SashForm
+    import org.eclipse.swt.custom.StackLayout
   end
   
   module Layout
@@ -95,12 +97,7 @@ module JFace
     import org.eclipse.jface.viewers.TreeViewer
     import org.eclipse.jface.viewers.ITreeContentProvider
     import org.eclipse.jface.viewers.ILabelProvider
+    import org.eclipse.jface.viewers.ILazyTreeContentProvider
+    import org.eclipse.jface.viewers.ILabelProvider
   end
 end
-
-
-
-
-
-
-

data/plugins/application_swt/lib/application_swt/treebook.rb

@@ -0,0 +1,33 @@
+module Redcar
+  class ApplicationSWT
+    class Treebook
+      
+      def initialize(composite, layout, model)
+        @composite, @layout, @model = composite, layout, model
+        add_listeners
+      end
+      
+      def add_listeners
+        @model.add_listener(:tree_added,   &method(:tree_added))
+        @model.add_listener(:tree_removed, &method(:tree_removed))
+      end
+
+      def tree_added(tree)
+        create_tree_view(tree)
+      end
+      
+      def tree_removed(tree)
+        tree.controller.close
+      end
+
+      def create_tree_view(tree)
+        tree_view = TreeViewSWT.new(@composite, tree)
+        tree.controller = tree_view
+        @layout.topControl = tree_view.control
+        @composite.layout
+      end
+      
+    end
+  end
+end
+

data/plugins/application_swt/lib/application_swt/window.rb

@@ -36,9 +36,12 @@ module Redcar
         @window = window
       	@notebook_handlers = Hash.new {|h,k| h[k] = []}
         create_shell
-        create_sash(window)
+        create_sashes(window)
         new_notebook(window.notebooks.first)
         add_listeners
+        create_treebook_controller
+        reset_sash_widths
+        @treebook_unopened = true
       end
       
       def add_listeners
@@ -51,8 +54,28 @@ module Redcar
         method = method(:notebook_orientation_changed)
         @window.add_listener(:notebook_orientation_changed, &method)
         @window.add_listener(:focussed,      &method(:focussed))
+        
+        @window.treebook.add_listener(:tree_added) do
+          if @treebook_unopened
+            reset_sash_widths
+            @treebook_unopened = false
+          end
+        end
+        
+        @window.treebook.add_listener(:tree_removed) do
+          reset_sash_widths
+        end
       end
         
+      def create_treebook_controller
+        treebook = @window.treebook
+        controller = ApplicationSWT::Treebook.new(
+          @tree_composite, 
+          @tree_layout, 
+          treebook)
+        treebook.controller = controller
+      end
+      
       def show
         @shell.open
         @shell.text = window.title
@@ -68,10 +91,8 @@ module Redcar
       end
       
       def new_notebook(notebook_model)
-        notebook_controller = ApplicationSWT::Notebook.new(notebook_model, @sash)
-        width = (100/@window.notebooks.length).to_i
-        widths = [width]*@window.notebooks.length
-      	@sash.setWeights(widths.to_java(:int))
+        notebook_controller = ApplicationSWT::Notebook.new(notebook_model, @notebook_sash)
+        reset_notebook_sash_widths
       end
       
       def notebook_removed(notebook_model)
@@ -80,14 +101,12 @@ module Redcar
           notebook_controller.remove_listener(h)
         end
         notebook_controller.dispose
-        width = (100/@window.notebooks.length).to_i
-        widths = [width]*@window.notebooks.length
-      	@sash.setWeights(widths.to_java(:int))
+        reset_notebook_sash_widths
       end
       
       def notebook_orientation_changed(new_orientation)
         orientation = horizontal_vertical(new_orientation)
-        @sash.setOrientation(orientation)
+        @notebook_sash.setOrientation(orientation)
       end
       
       def focussed(_)
@@ -111,9 +130,12 @@ module Redcar
       def swt_event_activated
         @window.focus
       end
-        
+      
       private
       
+      SASH_WIDTH = 5
+      TREEBOOK_WIDTH = 20
+      
       def create_shell
         @shell = Swt::Widgets::Shell.new(ApplicationSWT.display)
         @shell.layout = Swt::Layout::GridLayout.new(1, false)
@@ -121,12 +143,24 @@ module Redcar
         @shell.add_shell_listener(@shell_listener)  
       end
       
-      def create_sash(window_model)
+      def create_sashes(window_model)
         orientation = horizontal_vertical(window_model.notebook_orientation)
         @sash     = Swt::Custom::SashForm.new(@shell, orientation)
         grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
       	@sash.setLayoutData(grid_data)
-      	@sash.setSashWidth(10)
+      	@sash.setSashWidth(0)
+      	
+      	@tree_composite = Swt::Widgets::Composite.new(@sash, Swt::SWT::NONE)
+      	@tree_layout = Swt::Custom::StackLayout.new
+      	@tree_composite.setLayout(@tree_layout)
+      	button = Swt::Widgets::Button.new(@tree_composite, Swt::SWT::PUSH)
+      	button.setText("Button in pane2")
+      	@tree_layout.topControl = button
+      	
+        @notebook_sash     = Swt::Custom::SashForm.new(@sash, orientation)
+        grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
+      	@notebook_sash.setLayoutData(grid_data)
+      	@notebook_sash.setSashWidth(SASH_WIDTH)
       end
       
       def horizontal_vertical(symbol)
@@ -137,6 +171,23 @@ module Redcar
           Swt::SWT::VERTICAL
         end
       end
+      
+      def reset_sash_widths
+        if @window.treebook.trees.any?
+          @sash.setWeights([TREEBOOK_WIDTH, 100 - TREEBOOK_WIDTH].to_java(:int))
+          @sash.setSashWidth(SASH_WIDTH)
+        else
+          @sash.setWeights([0,100].to_java(:int))
+          @sash.setSashWidth(0)
+          @treebook_unopened = true
+        end
+      end
+      
+      def reset_notebook_sash_widths
+        width = (100/@window.notebooks.length).to_i
+        widths = [width]*@window.notebooks.length
+      	@notebook_sash.setWeights(widths.to_java(:int))
+    	end
     end
   end
 end