redcar 0.3.2dev → 0.3.3

data/plugins/encryption/plugin.rb

@@ -0,0 +1,9 @@
+
+Plugin.define do
+  name "Encryption"
+  version "1.0"
+  file "encryption"
+  object "Encryption"
+  
+  dependencies "redcar", ">0"
+end

data/plugins/execute_current_tab/lib/execute_current_tab.rb

@@ -0,0 +1,56 @@
+module Redcar
+  class ExecuteCurrentTab
+
+    def self.menus
+      Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "Execute" do
+            item "Execute Current Tab as Ruby File", ExecuteCurrentTab::Execute
+            item "Eval Current Tab (within Redcar itself)", ExecuteCurrentTab::EmbeddedExecute
+          end
+        end
+      end
+    end
+
+    def self.keymaps
+      [Keymap.build("main", [:osx, :linux, :windows]) { 
+        link "Ctrl+R", ExecuteCurrentTab::Execute 
+        link "Ctrl+Shift+R", ExecuteCurrentTab::EmbeddedExecute 
+      }]
+    end
+
+    class Execute < Command
+
+      def execute
+        doc = win.focussed_notebook_tab_document
+        path = doc.path if doc
+        if path
+          command = "ruby #{path} 2>&1"
+          out = `#{command}`
+          new_tab = Top::NewCommand.new.run          
+          new_tab.document.text = "***** generated output from #{command} ***\n" + out
+          new_tab.title= 'exec output'
+        else
+          puts 'unable to execute--maybe you need to save it first, so it has a filename?'
+        end
+      end
+
+    end
+
+    class EmbeddedExecute < Command
+
+      def execute
+        doc = win.focussed_notebook_tab_document
+        out = doc.get_all_text if doc
+        if out
+          eval out, TOPLEVEL_BINDING, doc.path || doc.title || ''
+        else
+          puts 'unable to eval embedded'
+        end
+      end
+
+    end
+
+  end
+
+end

data/plugins/execute_current_tab/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "execute_current_tab"
+  version "0.0"
+  file    "lib", "execute_current_tab.rb"
+  object  "Redcar::ExecuteCurrentTab"
+  dependencies "redcar",              ">0" # I assume it does transitive?
+end

data/plugins/html_view/lib/html_view.rb

@@ -1,6 +1,5 @@
 
 require 'html_view/html_tab'
-#require 'html_controller'
 
 module Redcar
   class HtmlView
@@ -13,8 +12,10 @@ module Redcar
     def controller=(new_controller)
       @controller = new_controller
       @html_tab.title = controller.title
-      setup_javascript_listeners
-      text = controller.index
+      func = RubyFunc.new(@html_tab.controller.browser, "rubyCall")
+      func.controller = @controller
+      text = controller.index + setup_javascript_listeners
+      puts text
       @html_tab.controller.browser.set_text(text)
     end
     
@@ -31,17 +32,21 @@ module Redcar
     end
         
     def setup_javascript_listeners
-      func = RubyFunc.new(@html_tab.controller.browser, "rubyCall")
-      func.controller = @controller
       js = []
+      js << "<script type=\"text/javascript\">"
       js << "Controller = {"
+      methods = []
       (controller.methods - Object.new.methods).each do |method_name|
-        js << "  #{method_name.gsub(/_(\w)/) { |a| $1.upcase}}: function() {"
-        js << "    rubyCall(\"#{method_name}\", arguments);"
-        js << "  },"
+        method = []
+        method << "  #{method_name.gsub(/_(\w)/) { |a| $1.upcase}}: function() {"
+        method << "    rubyCall(\"#{method_name}\", Array.prototype.slice.call(arguments));"
+        method << "  }"
+        methods << method.join("\n")
       end
-      js << "}"
-      @html_tab.controller.browser.evaluate(js.join("\n"))
+      js << methods.join(",\n")
+      js << "};"
+      js << "</script>"
+      js.join("\n")
     end
   end
-end
+end

data/plugins/plugin_manager_ui/lib/plugin_manager_ui.rb

@@ -8,7 +8,6 @@ module Redcar
     end
     
     class ReloadLastReloadedCommand < Redcar::Command
-      key :osx => "Cmd+Shift+R", :linux => "Ctrl+Shift+R", :windows => "Ctrl+Shift+R"
       
       def execute
         if plugin = PluginManagerUi.last_reloaded
@@ -31,7 +30,9 @@ module Redcar
         def reload_plugin(name)
           plugin = Redcar.plugin_manager.loaded_plugins.detect {|pl| pl.name == name }
           plugin.load
+          Redcar.app.refresh_menu!
           PluginManagerUi.last_reloaded = plugin
+          1
         end
         
         private

data/plugins/plugin_manager_ui/views/index.html.erb

@@ -12,7 +12,7 @@
     
     <h3>Loaded Plugins</h3>
     <%= plugin_table(Redcar.plugin_manager.loaded_plugins) %>
-    
+
     <h3>Unloaded Plugins</h3>
     <%= plugin_table(Redcar.plugin_manager.unloaded_plugins) %>
     
@@ -23,9 +23,27 @@
     <%= plugin_table(Redcar.plugin_manager.plugins_with_errors) %>
     
     <script language="javascript">
-      $("a").click(function() {
-        Controller.reloadPlugin($(this).parent().parent().find(".plugin-name").text());
+      $("a").click(function(e) {
+        e.preventDefault();
+        var pluginName = $(this).parent().parent().find(".plugin-name").text();
+        try {
+          Controller.reloadPlugin(pluginName);
+        } catch(e) {
+          alert(e.message);
+        }
       });
     </script>
   </div>
-</div>
+</div>
+
+
+<script type="text/javascript">
+var browser=navigator.appName;
+var b_version=navigator.appVersion;
+var version=parseFloat(b_version);
+
+document.write("Browser name: "+ browser);
+document.write("<br />");
+document.write("Browser version: "+ b_version);
+</script>
+ 

data/plugins/project/lib/project.rb

@@ -1,13 +1,35 @@
+require 'drb/drb'
 
 require "project/project_command"
 require "project/file_mirror"
 require "project/find_file_dialog"
 require "project/dir_mirror"
 require "project/dir_controller"
+require "project/drb_service"
 
 module Redcar
   class Project
 
+    # this will restore open files unless other files or dirs were passed
+    # as command line parameters
+    def self.start
+      restore_last_session unless handle_startup_arguments
+      init_current_files_hooks
+      init_window_closed_hooks
+      init_drb_listener
+    end
+    
+    def self.init_window_closed_hooks
+      Redcar.app.add_listener(:window_about_to_close) do |win|
+        self.save_file_list win
+      end
+    end
+    
+    def self.init_drb_listener
+      return if ARGV.include?("--multiple-instance")
+      @drb_service = DrbService.new
+    end
+    
     def self.storage
       @storage ||= Plugin::Storage.new('project_plugin')
     end
@@ -27,6 +49,12 @@ module Redcar
     end
   
     def self.filter_path
+      if Redcar.app.focussed_notebook_tab
+       if path = Redcar.app.focussed_notebook_tab.document.path
+          dir = File.dirname(path)
+          return dir
+        end
+      end      
       Project.storage['last_dir'] || File.expand_path(Dir.pwd)
     end
   
@@ -44,18 +72,26 @@ module Redcar
       end
       Project.open_project_sensitivity.recompute
     end
-    
+
+    # Close the Directory Tree for the given window, if there 
+    # is one.
     def self.close_tree(win)
       win.treebook.remove_tree(window_trees[win])
       Project.open_project_sensitivity.recompute
     end
     
+    # Refresh the DirMirror Tree for the given Window, if 
+    # there is one.
     def self.refresh_tree(win)
       if tree = window_trees[win]
         tree.refresh
       end
     end
     
+    # Finds an EditTab with a mirror for the given path.
+    #
+    # @param [String] path  the path of the file being edited
+    # @return [EditTab, nil] the EditTab that is editing it, or nil
     def self.open_file_tab(path)
       path = File.expand_path(path)
       all_tabs = Redcar.app.windows.map {|win| win.notebooks}.flatten.map {|nb| nb.tabs }.flatten
@@ -67,17 +103,113 @@ module Redcar
       end
     end
     
+    # Opens a new EditTab with a FileMirror for the given path.
+    #
+    # @path  [String] path  the path of the file to be edited
+    # @param [Window] win  the Window to open the File in
+    def self.open_file(path, win = Redcar.app.focussed_window)
+      win ||= Redcar.app.new_window # in case there's not one open
+      tab = win.new_tab(Redcar::EditTab)
+      mirror = FileMirror.new(path)
+      tab.edit_view.document.mirror = mirror
+      tab.edit_view.reset_undo
+      tab.focus
+    end
+    
+    # Opens a new Tree with a DirMirror and DirController for the given
+    # path.
+    #
+    # @param [String] path  the path of the directory to view
+    # @param [Window] win  the Window to open the Tree in
+    def self.open_dir(path, win = Redcar.app.focussed_window)
+      win ||= Redcar.app.new_window # case none open
+      tree = Tree.new(Project::DirMirror.new(path),
+                      Project::DirController.new)
+      Project.open_tree(win, tree)
+      storage['last_open_dir'] = path
+    end
+    
+    # A list of files previously opened in this session
+    #
+    # @return [Array<String>] an array of paths
+    def self.recent_files
+      @recent_files ||= []
+    end
+    
     private
     
+    # restores the directory/files in the last open window
+    def self.restore_last_session
+      if path = storage['last_open_dir']
+        open_dir(path)
+      end
+      
+      if files = Project.storage['files_open_last_session']
+        files.each do |path|
+          open_file(path)
+        end
+      end
+      
+    end
+        
+    # saves away a list of the currently open files in
+    # @param [win]
+    def self.save_file_list(win)
+      # create a list of open files
+      file_list = []
+      win.notebooks[0].tabs.each do |tab|
+        if tab.document && tab.document.path
+          file_list << tab.document.path
+        end
+      end
+      Project.storage['files_open_last_session'] = file_list      
+    end
+    
+    # handles files and/or dirs passed as command line arguments
+    def self.handle_startup_arguments
+      if ARGV
+        dir_args  = ARGV.select {|path| File.directory?(path) }
+        file_args = ARGV.select {|path| File.file?(path)      }
+        
+        dir_args.each {|path| open_dir(path) }
+        file_args.each {|path| open_file(path) }
+        return (dir_args.any? or file_args.any?)
+      end
+    end
+    
+    # Attaches a new listener to tab focus change events, so we can 
+    # keep the current_files list.
+    def self.init_current_files_hooks
+      Redcar.app.add_listener(:tab_focussed) do |tab|
+        if tab and tab.document_mirror.respond_to?(:path)
+          add_to_recent_files(tab.document_mirror.path)
+        end
+      end
+    end
+    
+    def self.add_to_recent_files(new_file)
+      # sanitize paths for doze
+      # like "E:\\installs\\ruby191p376\\bin/rdebug.bat" => "E:/installs/ruby191p376/bin/rdebug.bat"
+      new_file = File.expand_path(new_file) 
+      unless new_file == @last_file
+        recent_files.delete(new_file)
+        recent_files << new_file
+      
+        if @last_file
+          recent_files.delete(@last_file)
+          recent_files.unshift(@last_file)
+        end
+      end
+
+      @last_file = new_file
+    end
+    
     def self.set_tree(win, tree)
       @window_trees[win] = tree
       win.treebook.add_tree(tree)
     end
     
     class FileOpenCommand < Command
-      key :osx     => "Cmd+O",
-          :linux   => "Ctrl+O",
-          :windows => "Ctrl+O"
       
       def initialize(path = nil)
         @path = path
@@ -89,11 +221,7 @@ module Redcar
           if already_open_tab = Project.open_file_tab(path)
             already_open_tab.focus
           else
-            tab  = win.new_tab(Redcar::EditTab)
-            mirror = FileMirror.new(path)
-            tab.edit_view.document.mirror = mirror
-            tab.edit_view.reset_undo
-            tab.focus
+            Project.open_file(path)
           end
         end
       end
@@ -111,9 +239,6 @@ module Redcar
     end
     
     class FileSaveCommand < EditTabCommand
-      key :osx     => "Cmd+S",
-          :linux   => "Ctrl+S",
-          :windows => "Ctrl+S"
 
       def execute
         tab = win.focussed_notebook.focussed_tab
@@ -126,9 +251,6 @@ module Redcar
     end
     
     class FileSaveAsCommand < EditTabCommand
-      key :osx     => "Cmd+Shift+S",
-          :linux   => "Ctrl+Shift+S",
-          :windows => "Ctrl+Shift+S"
       
       def initialize(path = nil)
         @path = path
@@ -158,10 +280,6 @@ module Redcar
     end
     
     class DirectoryOpenCommand < Command
-      key :osx     => "Cmd+Shift+O",
-          :linux   => "Ctrl+Shift+O",
-          :windows => "Ctrl+Shift+O"
-          
           
       def initialize(path=nil)
         @path = path
@@ -169,9 +287,7 @@ module Redcar
       
       def execute
         if path = get_path
-          tree = Tree.new(Project::DirMirror.new(path),
-                          Project::DirController.new)
-          Project.open_tree(win, tree)
+          Project.open_dir(path, win)
         end
       end
       
@@ -202,14 +318,12 @@ module Redcar
     end
     
     class FindFileCommand < ProjectCommand
-      key :osx => "Cmd+T",
-          :linux => "Ctrl+T",
-          :windows => "Ctrl+T"
      
       def execute
-        dialog = FindFileDialog.new
+        dialog = FindFileDialog.new win
         dialog.open
       end
     end
+    
   end
 end