redcar 0.11.0dev → 0.11

data/plugins/application/lib/application/commands/window_commands.rb

@@ -0,0 +1,68 @@
+module Redcar
+  class Application
+    class OpenNewWindowCommand < Command
+
+      def initialize(title=nil)
+        @title = title
+      end
+
+      def execute
+        window = Redcar.app.new_window
+        window.title = @title if @title
+      end
+    end
+
+    class FocusWindowCommand < Command
+      def initialize(window=nil)
+        @window = window
+      end
+
+      def execute
+        win.focus
+        @window = nil
+      end
+
+      def win
+        @window || super
+      end
+    end
+
+    class CloseWindowCommand < Command
+      def initialize(window=nil)
+        @window = window
+      end
+
+      def execute
+        Redcar.app.call_on_plugins(:close_window_guard, win) do |guard|
+          return unless guard
+        end
+        win.close
+        quit_if_no_windows if [:linux, :windows].include?(Redcar.platform)
+        @window = nil
+      end
+
+      private
+
+      def quit_if_no_windows
+        if Redcar.app.windows.length == 0
+          if Application.storage['stay_resident_after_last_window_closed'] && !(ARGV.include?("--multiple-instance"))
+            puts 'continuing to run to wait for incoming drb connections later'
+          else
+            QuitCommand.new.run
+          end
+        end
+      end
+
+      def win
+        @window || super
+      end
+    end
+
+    class ToggleFullscreen < Command
+      def execute
+        Redcar.app.focussed_window.fullscreen = !Redcar.app.focussed_window.fullscreen
+      end
+    end
+
+  end
+end

data/plugins/{tree/lib → application/lib/application}/tree.rb

@@ -1,8 +1,4 @@
 
-require 'tree/controller'
-require 'tree/command'
-require 'tree/mirror'
-
 module Redcar
   # Pass classes implementing Redcar::Tree::Mirror and 
   # Redcar::Tree::Controller to Tree#new to create a tree. Pass to

data/plugins/application/spec/application/keymap/builder_spec.rb

@@ -9,7 +9,7 @@ describe "Redcar::Keymap::Builder DSL" do
   
   it "add entries to the keymap" do
     builder = Redcar::Keymap::Builder.new("test", :osx) do
-      link "Ctrl+S", :NewCommand
+      link "Ctrl+S", :OpenNewEditTabCommand
     end
     builder.keymap.length.should == 1
     builder.keymap.command("Ctrl+S")

data/plugins/application/spec/application/menu/builder_spec.rb

@@ -9,12 +9,12 @@ describe "Redcar::Menu::Builder DSL" do
   
   it "adds entries to the menu" do
     builder = Redcar::Menu::Builder.new do
-      item "New", :NewCommand
+      item "New", :OpenNewEditTabCommand
     end
     builder.menu.length.should == 1
     item = builder.menu.entries.first
     item.text.should == "New"
-    item.command.should == :NewCommand
+    item.command.should == :OpenNewEditTabCommand
   end
   
   it "adds separators to the menu" do

data/plugins/application_swt/lib/application_swt.rb

@@ -31,6 +31,8 @@ require "application_swt-#{Redcar::VERSION}"
 module Redcar
   class ApplicationSWT
     include Redcar::Controller
+    
+    attr_reader :fake_shell
 
     def self.display
       @display ||= Swt.display
@@ -143,7 +145,7 @@ module Redcar
     end
 
     def refresh_menu
-      if Redcar.platform == :osx
+      if Redcar.platform == :osx and @fake_shell
         old_menu_bar = @fake_shell.menu_bar
         fake_menu_controller = ApplicationSWT::Menu.new(FakeWindow.new(@fake_shell), Redcar.app.main_menu, Redcar.app.main_keymap, Swt::SWT::BAR)
         fake_shell.menu_bar = fake_menu_controller.menu_bar
@@ -152,7 +154,7 @@ module Redcar
     end
 
     def refresh_toolbar
-      if Redcar.platform == :osx
+      if Redcar.platform == :osx and @fake_shell
         fake_toolbar_controller = ApplicationSWT::ToolBar.new(FakeWindow.new(@fake_shell), Redcar.app.main_toolbar, Swt::SWT::FLAT)
       end
     end

data/plugins/application_swt/lib/swt/vtab_label.rb

@@ -9,9 +9,12 @@ module Swt
       include Swt::Events::MouseListener
       include Swt::Events::MouseTrackListener
 
-      CLOSE_ICON   = Redcar::ApplicationSWT::Icon.swt_image(:close)
       ICON_PADDING = 3
 
+      def close_icon
+        @@close_icon ||= Redcar::ApplicationSWT::Icon.swt_image(:close)
+      end
+
       def initialize(tab, parent, style)
         @label = Swt::Widgets::Label.new(parent, style)
         @active = false
@@ -98,7 +101,7 @@ module Swt
       end
 
       def mouseUp(e)
-        if show_close and CLOSE_ICON.bounds.contains(e.x - ICON_PADDING, e.y - ICON_PADDING)
+        if show_close and close_icon.bounds.contains(e.x - ICON_PADDING, e.y - ICON_PADDING)
           @tab.parent.remove_item(@tab)
         else
           activate if e.button == 1
@@ -106,7 +109,7 @@ module Swt
       end
 
       def mouseEnter(e)
-        @icon = CLOSE_ICON
+        @icon = close_icon
         redraw
       end
 

data/plugins/auto_indenter/lib/auto_indenter/document_controller.rb

@@ -57,9 +57,12 @@ module Redcar
           if get_flags(line, rules) != @flags
             edit_view = document.edit_view
             analyzer = Analyzer.new(rules, document, edit_view.tab_width, edit_view.soft_tabs?)
-            increase_ignore
-            document.indentation.set_level(start_line_ix, analyzer.calculate_for_line(start_line_ix, true))
-            decrease_ignore
+            new_indentation = analyzer.calculate_for_line(start_line_ix, true)
+            if new_indentation >= 0
+              increase_ignore
+              document.indentation.set_level(start_line_ix, new_indentation)
+              decrease_ignore
+            end
           end
         end
       end

data/plugins/clojure/lib/clojure.rb

@@ -8,7 +8,7 @@ module Redcar
       Menu::Builder.build do
         sub_menu "Plugins" do
           sub_menu "REPL" do
-            item "Open Clojure REPL", ClojureOpenREPL
+            item "Open Clojure REPL", OpenClojureREPL
           end
         end
       end
@@ -24,7 +24,7 @@ module Redcar
       end
     end
 
-    class ClojureOpenREPL < Redcar::REPL::OpenREPL
+    class OpenClojureREPL < Redcar::REPL::OpenREPL
       def execute
         open_repl(ReplMirror.new)
       end

data/plugins/core/lib/core.rb

@@ -1,7 +1,6 @@
 
 require 'fileutils'
 
-require "core/logger"
 require "core/reentry_helpers"
 require "core/controller"
 require "core/gui"
@@ -32,10 +31,7 @@ module Redcar
   end
     
   class Core
-    include HasLogger
-    
     def self.loaded
-      Core::Logger.init
       unless File.exist?(Redcar.user_dir)
         FileUtils.mkdir(Redcar.user_dir)
       end

data/plugins/core/lib/core/gui.rb

@@ -8,8 +8,6 @@ module Redcar
       end
     end
     
-    include Redcar::Core::HasLogger
-    
     attr_reader :name
     
     # Initialize a new named gui.
@@ -32,10 +30,10 @@ module Redcar
     # Starts the event loop for this gui.
     def start
       if ARGV.include?("--quit-immediately")
-        logger.info("Quitting straight away")
+        Redcar.log.info("Quitting straight away")
         exit
       else
-        logger.info("Starting event loop")
+        Redcar.log.info("Starting event loop")
         @event_loop.start
       end
     end

data/plugins/core/lib/core/plugin/storage.rb

@@ -1,30 +1,28 @@
 
 module Redcar
   class Plugin
-    class Storage
-      class << self
-        attr_writer :storage_dir
-      end
-    
-      def self.storage_dir
-        @user_dir ||= File.join(Redcar.user_dir, "storage")
-      end
-
+    class BaseStorage
+      
       # Open a storage file or create it if it doesn't exist.
       #
-      # @param [String] a (short) name, should be suitable for use as a filename
-      def initialize(name)
-        @name    = name
-        unless File.exists?(Storage.storage_dir)
-          FileUtils.mkdir_p(Storage.storage_dir)
+      # @param [String] storage_dir  the path to the directory the storage file should exist in
+      # @param [String] name  a (short) name, should be suitable for use as a filename
+      def initialize(storage_dir, name)
+        @storage_dir = storage_dir
+        @name  = name
+        @mutex = Mutex.new
+        unless File.exists?(@storage_dir)
+          FileUtils.mkdir_p(@storage_dir)
         end
         rollback
       end
 
       # Save the storage to disk.
       def save
-        File.open(path, "w") { |f| YAML.dump(@storage, f) }
-        update_timestamp
+        @mutex.synchronize do
+          File.open(path, "w") { |f| YAML.dump(@storage, f) }
+          update_timestamp
+        end
         self
       end
 
@@ -32,9 +30,11 @@ module Redcar
       # it hasn't been saved.
       def rollback
         if File.exists?(path)
-          @storage = YAML.load_file(path)
-          raise 'storage file is corrupted--please delete ' + path unless @storage.is_a? Hash
-          update_timestamp
+          @mutex.synchronize do
+            @storage = YAML.load_file(path)
+            raise 'storage file is corrupted--please delete ' + path unless @storage.is_a?(Hash)
+            update_timestamp
+          end
         else
           @storage = {}
         end
@@ -60,6 +60,7 @@ module Redcar
         value
       end
       
+      # Set a default value for a key and save it to disk
       def set_default(key, value)
         unless @storage.has_key?(key)
           self[key] = value
@@ -67,6 +68,8 @@ module Redcar
         value
       end
       
+      # Get all keys in the storage
+      # @return [Array] the Array with all keys
       def keys
         @storage.keys
       end
@@ -74,11 +77,55 @@ module Redcar
       private
       
       def path
-        File.join(Storage.storage_dir, @name + ".yaml")
+        File.join(@storage_dir, @name + ".yaml")
       end
       
       def update_timestamp
-        @last_modified_time = File.stat(path()).mtime
+        @last_modified_time = File.stat(path).mtime
+      end
+    end
+    
+    class Storage < Plugin::BaseStorage
+      def self.storage_dir=(value)
+        @user_dir = value
+      end
+    
+      def self.storage_dir
+        @user_dir ||= File.join(Redcar.user_dir, "storage")
+      end
+      
+      def initialize(name)
+        super(self.class.storage_dir, name)
+      end
+    end
+    
+    # A Storage which is used by multiple plugins. This kind of storage can only
+    # contain arrays, because otherwise plugins could not set their defaults as
+    # addition to the existing ones of other plugins.
+    class SharedStorage < Plugin::Storage
+      # Set a default value for a key or update it, if it already exists
+      def set_or_update_default(key, value)
+        if @storage.has_key?(key)
+          update_default(key, value)
+        else
+          if value.instance_of? Array
+            set_default(key, value)
+          else
+            set_default(key, [value])
+          end
+        end
+        @storage[key] = @storage[key].uniq
+        value
+      end
+      
+      private
+      
+      def update_default(key, value)
+        if value.instance_of? Array
+          self[key] = self[key] + value
+        else
+          self[key] << value
+        end
       end
     end
   end

data/plugins/core/spec/core/base_storage_spec.rb

@@ -0,0 +1,81 @@
+
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe Redcar::Plugin::BaseStorage do
+  
+  before :each do
+    @tmp_dir = File.join(File.dirname(__FILE__), "tmp")
+    FileUtils.mkdir_p(@tmp_dir)
+  end
+  
+  after :each do
+    FileUtils.rm_rf(@tmp_dir)
+  end
+  
+  def get_new_storage
+    Redcar::Plugin::BaseStorage.new(@tmp_dir, 'test_storage_saved')
+  end
+  
+  it "acts like a hash" do
+    storage = get_new_storage
+    storage[:some_key] = "some value"
+    storage[:some_key].should == "some value"
+    storage[:some_key] = "some other value"
+    storage[:some_key].should == "some other value"
+  end
+
+  it "saves to disk" do
+    storage = get_new_storage
+    storage[:some_key] = "some value"
+    storage = get_new_storage
+    storage[:some_key].should == "some value"
+    
+    FileUtils.rm_rf(storage.send(:path))
+    storage = get_new_storage
+    storage[:some_key].should be_nil
+  end
+  
+  it "has a set default method" do
+    storage = get_new_storage
+    storage.set_default('a', 'b')    
+    storage['a'].should == 'b'
+    storage = get_new_storage
+    storage['a'].should == 'b'
+    storage['a'] = 'c'
+    storage['a'].should == 'c'
+    storage = get_new_storage
+    storage['a'].should == 'c'
+    storage['b'] = false
+    storage.set_default('b', true)
+    storage['b'].should == false
+  end
+  
+  it "should raise an error when the storage file is invalid/corrupt" do
+    storage = get_new_storage
+    FileUtils.touch(storage.send(:path))
+    lambda { storage.rollback }.should raise_error(RuntimeError)
+  end
+  
+  it "should reload when the storage file itself has been elsewise modified" do
+    storage = get_new_storage
+    storage['a'] = 'b'
+    storage['a'].should == 'b'
+    storage['a'].should == 'b'
+    sleep 1 # windows doesn't have finer granularity than this
+    File.open(storage.send(:path), 'w') do |f|
+      f.write "---
+                a: new"
+    end    
+    storage['a'].should == 'new'
+    storage['a'].should == 'new'
+    storage = get_new_storage
+    storage['a'].should == 'new'    
+  end
+  
+  it "should allow per-instance storage directory" do
+    storage  = Redcar::Plugin::BaseStorage.new(@tmp_dir, 'test_storage_saved')
+    storage2 = Redcar::Plugin::BaseStorage.new(File.join(@tmp_dir, "sub"), 'test_storage_saved')
+    storage.send(:path).should_not == storage2.send(:path)
+  end
+  
+end