redcar 0.3.9.0dev → 0.3.9

data/CHANGES

@@ -3,9 +3,9 @@ Version 0.3.9 (TBA)
 ===================
 
  * Clojure REPL (David Byrne)
- * Remote edit files (Felipe Coury)
- * Remote directory view (Felipe Coury)
- * Connection manager (Felipe Coury)
+ * Remote edit files (Felipe Coury & Dan Lucraft)
+ * Remote directory view (Felipe Coury & Dan Lucraft)
+ * Connection manager (Felipe Coury & Dan Lucraft)
  * Added a truckload more Textmate themes (Dan Lucraft - thanks github.com/filmgirl !)
  * Fix crashing bug when exceptions have no message (Kieran Pilkington)
  * Runnables tab shows name of process (Delisa Mason)
@@ -23,7 +23,7 @@ Version 0.3.9 (TBA)
  * View keyboard shortcuts help command (Delisa Mason)
  * Clear REPL history command (David Byrne)
  * Change case commands (to uppercase, to lowercase, to titlecase, to opposite case, toggle snake_case/CamelCase/pascalCase) (Mat Schaffer)
- * Took 6.5 seconds off startup time (on my machine) (Dan Lucraft)
+ * Smarter word matching for Ruby (and internal changes to support differing definitions of "words" across languages.) (Johannes Wollert)
 
 Version 0.3.8.4 (24 July 2010)
 ==============================

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.3.9.0dev"
+REDCAR_VERSION = "0.3.9"
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'

data/lib/redcar/installer.rb

@@ -173,6 +173,7 @@ module Redcar
       
       if File.open(path).read(200) =~ /Access Denied/
         puts "\n\n*** Error downloading #{uri}, got Access Denied from S3."
+        FileUtils.rm_rf(path)
         exit
       end
       

data/lib/redcar.rb

@@ -41,7 +41,7 @@ require 'uri'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.9.0dev'
+  VERSION         = '0.3.9'
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 3
   VERSION_RELEASE = 9

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

@@ -1,5 +1,6 @@
 
 Given /^I will choose "([^\"]*)" from the "([^\"]*)" dialog$/ do |path, type|
+  Redcar.gui.dialog_adapter.should_get_message(:any)
   Redcar.gui.dialog_adapter.set(type.to_sym, path)
 end
 

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

@@ -74,7 +74,8 @@ class FakeDialogAdapter
   end
   
   def message_box(*args)
-    if @message
+    if @message == :any
+    elsif @message
       unless @message == args.first
         raise TestingError.new("expected the message #{@message.inspect} got #{args.first.inspect}")
       end
@@ -82,6 +83,7 @@ class FakeDialogAdapter
     else
       raise TestingError.new("got a message box showing #{args.first.inspect} when I didn't expect one")
     end
+    @responses[:message_box].to_sym if @responses[:message_box]
   end
   
   def check_for_raise(result)

data/plugins/declarations/lib/declarations.rb

@@ -46,6 +46,7 @@ module Redcar
       end
       
       def execute
+        return if @project.remote?
         file = Declarations::File.new(Declarations.file_path(@project))
         file.update_files(@file_list)
         file.dump
@@ -89,6 +90,11 @@ module Redcar
     class GoToTagCommand < EditTabCommand
 
       def execute
+        if Project::Manager.focussed_project.remote?
+          Application::Dialog.message_box("Go to declaration doesn't work in remote projects yet :(")
+          return
+        end
+          
         if doc.selection?
           handle_tag(doc.selected_text)
         else

data/plugins/edit_view/lib/edit_view/commands/text_conversion_commands.rb

@@ -32,12 +32,6 @@ module Redcar
       end
     end
     
-    class OppositeCaseTextCommand < TextConversionCommand
-      def convert(text)
-        text.tr('a-zA-Z', 'A-Za-z')
-      end
-    end
-    
     class OppositeCaseTextCommand < TextConversionCommand
       def convert(text)
         text.tr('a-zA-Z', 'A-Za-z')

data/plugins/project/lib/project/adapters/remote_protocols/sftp.rb

@@ -13,12 +13,16 @@ module Redcar
           end
 
           def connection
-            @connection ||= Net::SSH.start(host, user, :password => password, :keys => private_key_files)
+            Redcar.timeout(10) do
+              @connection ||= Net::SSH.start(host, user, :password => password, :keys => private_key_files)
+            end
           rescue OpenSSL::PKey::DSAError => error
             puts "*** Warning, DSA keys not supported."
             # Error with DSA key. Throw us back to a password input. Think this is because jopenssl bugs
             # out on valid dsa keys.
             raise Net::SSH::AuthenticationFailed, "DSA key-based authentication failed."
+          rescue Redcar::TimeoutError
+            raise "connection to #{host} timed out"
           end
           
           def touch(file)
@@ -92,6 +96,10 @@ module Redcar
             contents
           end
           
+          def exists?(path)
+            is_file(path) or is_folder(path)
+          end
+          
           def is_folder(path)
             result = exec(%Q(
               test -d "#{path}" && echo y
@@ -100,6 +108,14 @@ module Redcar
             result =~ /^y/ ? true : false
           end
           
+          def is_file(path)
+            result = exec(%Q(
+              test -f "#{path}" && echo y
+            )) 
+
+            result =~ /^y/ ? true : false
+          end
+          
           def with_cached_directories(dirs)
             @cached_dirs = list_dirs(dirs)
             @use_cache = true
@@ -141,8 +157,7 @@ module Redcar
                 connection.exec!(what)
               end
             rescue Redcar::TimeoutError => e
-              puts "#{host} connection timed out"
-              puts caller
+              connection.shutdown!
               raise "#{host} connection timed out"
             end
           end
@@ -154,6 +169,7 @@ module Redcar
                 connection.sftp.send(method, *args)
               end
             rescue Redcar::TimeoutError
+              connection.shutdown!
               raise "#{host} connection timed out"
             end
           end

data/plugins/project/lib/project/commands.rb

@@ -133,18 +133,18 @@ module Redcar
       end
     end
     
-    class OpenRemoteCommand < Command
-      def initialize(url=nil)
-        @url = url
-      end
-      
-      def execute
-        unless @url
-          @speedbar = OpenRemoteSpeedbar.new
-          win.open_speedbar(@speedbar)
-        end
-      end
-    end
+    #class OpenRemoteCommand < Command
+    #  def initialize(url=nil)
+    #    @url = url
+    #  end
+    #  
+    #  def execute
+    #    unless @url
+    #      @speedbar = OpenRemoteSpeedbar.new
+    #      win.open_speedbar(@speedbar)
+    #    end
+    #  end
+    #end
     
     class FileSaveCommand < EditTabCommand
       def initialize(tab=nil)
@@ -233,6 +233,10 @@ module Redcar
     class FindFileCommand < ProjectCommand
      
       def execute
+        if Manager.focussed_project.remote?
+          Application::Dialog.message_box("Find file doesn't work in remote projects yet :(")
+          return
+        end
         dialog = FindFileDialog.new(Manager.focussed_project)
         dialog.open
       end

data/plugins/project/lib/project/dir_controller.rb

@@ -14,6 +14,11 @@ module Redcar
         end
       end
       
+      def handle_error(tree, error)
+        tree.close
+        Application::Dialog.message_box(error.message, :type => :error)
+      end
+      
       class DragController
         include Redcar::Tree::Controller::DragController
         
@@ -160,6 +165,7 @@ module Redcar
           @pairs = nodes.map {|node| [node, File.basename(node.path)] }
           @match_pattern = ""
           @replace_pattern = ""
+          @adapter = DirController.adapter(nodes.first, tree)
         end
         
         def title
@@ -182,11 +188,15 @@ module Redcar
             old_name = File.basename(node.path)
             new_name = transform_name(old_name)
             new_path = File.join(File.dirname(node.path), new_name)
-            conflicts = (File.exist?(new_path) and new_name != old_name)
+            conflicts = (@adapter.exists?(new_path) and new_name != old_name)
             legal     = (new_name != "" and legal_path?(new_path))
             [new_name, conflicts, legal]
           end
           result
+        rescue => e
+          puts e.class
+          puts e.message
+          puts e.backtrace
         end
         
         def submit(params)
@@ -195,7 +205,8 @@ module Redcar
             new_name = transform_name(old_name)
             next if old_name == new_name
             new_path = File.join(File.dirname(node.path), new_name)
-            FileUtils.mv(node.path, new_path)
+            
+            @adapter.mv(node.path, new_path)
           end
           @tab.close
           @tree.refresh
@@ -240,7 +251,7 @@ module Redcar
         adapter = DirController.adapter(node, tree)
         adapter.mv(node.path, new_path)
         tree.refresh
-        new_node = DirMirror::Node.create_from_path(adapter, new_path)
+        new_node = DirMirror::Node.create_from_path(adapter, {:fullname => new_path})
         tree.select(new_node)
       end
       

data/plugins/project/lib/project/dir_mirror.rb

@@ -56,7 +56,7 @@ module Redcar
       #
       # @return [Node]
       def from_data(path)
-        Node.create_from_path(@adapter, path)
+        Node.create_from_path(@adapter, {:fullname => path})
       end
       
       # Turn the nodes into data.

data/plugins/project/lib/project/manager.rb

@@ -287,7 +287,7 @@ module Redcar
               item "Open", Project::FileOpenCommand
               item "Reload File", Project::FileReloadCommand
               item "Open Directory", Project::DirectoryOpenCommand
-              item "Open Remote...", Project::OpenRemoteCommand
+              #item "Open Remote...", Project::OpenRemoteCommand
               lazy_sub_menu "Open Recent" do
                 Project::RecentDirectories.generate_menu(self)
               end
@@ -324,7 +324,7 @@ module Redcar
               separator
               if tree.selection.length > 1
                 dirs = tree.selection.map {|node| node.parent_dir }
-                if dirs.uniq.length == 1
+                if dirs.uniq.length == 1 and node.adapter.is_a?(Adapters::Local)
                   item("Bulk Rename") { controller.rename(tree, node)   }
                 end
               else

data/plugins/project/lib/project.rb

@@ -42,12 +42,16 @@ module Redcar
       if dir_mirror.exists?
         @tree   = Tree.new(dir_mirror, Project::DirController.new)
         @window = nil
-        file_list_resource.compute
+        file_list_resource.compute unless remote?
       else
         raise "#{path} doesn't seem to exist"
       end
     end
     
+    def remote?
+      adapter.is_a?(Adapters::Remote)
+    end
+    
     def ready?
       @tree && @path
     end
@@ -80,7 +84,7 @@ module Redcar
     # there is one.
     def refresh
       @tree.refresh
-      file_list_resource.compute
+      file_list_resource.compute unless remote?
     end
     
     def contains_path?(path)
@@ -106,6 +110,7 @@ module Redcar
     end
     
     def file_list
+      raise "can't access a file list for a remote project" if remote?
       @file_list ||= FileList.new(path)
     end
     

data/plugins/project/spec/project/adapters/remote_protocols/ftp_spec.rb

@@ -4,7 +4,7 @@ class Redcar::Project
   describe Adapters::RemoteProtocols::FTP do
     let(:conn) { double('connection') }
     subject do
-      Adapters::RemoteProtocols::FTP.new('server', 'user', 'secret', nil, '/creation')
+      Adapters::RemoteProtocols::FTP.new('server', 'user', 'secret', [])
     end
     
     before(:each) do
@@ -20,7 +20,7 @@ class Redcar::Project
     
     describe 'methods' do
       subject do
-        Adapters::RemoteProtocols::FTP.new('server', 'user', 'secret', nil, '/creation').tap do |ftp|
+        Adapters::RemoteProtocols::FTP.new('server', 'user', 'secret', []).tap do |ftp|
           ftp.stub!(:connection).and_return(conn)
         end
       end
@@ -30,8 +30,8 @@ class Redcar::Project
           mtime1 = stub('mtime1')
           mtime2 = stub('mtime2')
           subject.stub!(:fetch).with("/creation").and_return([
-            { :fullname => '/creation/first_file.txt', :name => 'first_file.txt', :type => 'file', :mtime => mtime1 },
-            { :fullname => '/creation/scripts',        :name => 'scripts',        :type => 'dir' , :mtime => mtime2 }
+            { :fullname => '/creation/first_file.txt', :name => 'first_file.txt', :type => :file, :mtime => mtime1 },
+            { :fullname => '/creation/scripts',        :name => 'scripts',        :type => :dir , :mtime => mtime2 }
           ])
           subject.mtime("/creation/first_file.txt").should == mtime1
           subject.mtime("/creation/scripts").should == mtime2

data/plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb

@@ -4,7 +4,7 @@ class Redcar::Project
   describe Adapters::RemoteProtocols::SFTP do
     let(:conn) { double('connection').as_null_object }
     subject do
-      Adapters::RemoteProtocols::SFTP.new('server', 'user', 'secret', nil, '/home/fcoury')
+      Adapters::RemoteProtocols::SFTP.new('server', 'user', 'secret', [])
     end
     
     before(:each) do
@@ -12,64 +12,35 @@ class Redcar::Project
     end
     
     context "Public methods" do
-      describe '#exist?' do
-        it "returns true if fetch throws exception (path does not exist)" do
-          subject.path = '/home/fcoury'
-          subject.should_receive(:exec).with(/test -d "\/home\/fcoury"/).and_return("n\n")
-          subject.exist?.should be_false
-        end
-
-        it "returns true if fetch runs" do
-          subject.path = '/home/fcoury'
-          subject.should_receive(:exec).with(/test -d "\/home\/fcoury"/).and_return("y\n")
-          subject.exist?.should be_true
-        end
-      end
-    
       describe '#directory?' do
         it "fetches the folder if it's not the base folder" do
           subject.stub!(:fetch).with("/home/fcoury").and_return([
-            { :fullname => '/home/fcoury/hello_world.rb', :name => 'hello_world.rb', :type => 'file' },
-            { :fullname => '/home/fcoury/snippets',       :name => 'snippets',       :type => 'dir' }
+            { :fullname => '/home/fcoury/hello_world.rb', :name => 'hello_world.rb', :type => :file },
+            { :fullname => '/home/fcoury/snippets',       :name => 'snippets',       :type => :dir }
           ])
           subject.directory?("/home/fcoury/hello_world.rb").should be_false
           subject.directory?("/home/fcoury/snippets").should be_true
         end
-
-        it "checks for directory flag on the file if it's the base folder" do
-          subject.path = '/home/fcoury'
-          subject.stub!(:check_folder).with('/home/fcoury').and_return(true)
-          subject.directory?("/home/fcoury").should be_true
-        end
       end
     
       describe '#file?' do
         it "fetches the folder for the file" do
           subject.stub!(:fetch).with("/home/fcoury").and_return([
-            { :fullname => '/home/fcoury/hello_world.rb', :name => 'hello_world.rb', :type => 'file' },
-            { :fullname => '/home/fcoury/snippets',       :name => 'snippets',       :type => 'dir' }
+            { :fullname => '/home/fcoury/hello_world.rb', :name => 'hello_world.rb', :type => :file },
+            { :fullname => '/home/fcoury/snippets',       :name => 'snippets',       :type => :dir }
           ])
           subject.file?("/home/fcoury/hello_world.rb").should be_true
           subject.file?("/home/fcoury/snippets").should be_false
         end
       end
     
-      describe '#fetch_contents' do
-        it "return the name for all files retrieved" do
-          subject.stub!(:fetch).with("/home/fcoury").and_return([
-            { :fullname => '/home/fcoury/hello_world.rb', :name => 'hello_world.rb', :type => 'file' },
-            { :fullname => '/home/fcoury/snippets',       :name => 'snippets',       :type => 'dir' }
-          ])
-          subject.fetch_contents("/home/fcoury").should == ['/home/fcoury/hello_world.rb', '/home/fcoury/snippets']
-        end
-      end
       
       describe '#load' do
         let(:conn) { double('connection').as_null_object }
         let(:sftp) { double('sftp connection').as_null_object }
         
         subject do
-          Adapters::RemoteProtocols::SFTP.new('server', 'user', 'secret', nil, '/home/fcoury').tap do |protocol|
+          Adapters::RemoteProtocols::SFTP.new('server', 'user', 'secret', []).tap do |protocol|
             conn.stub!(:sftp).and_return(sftp)
             protocol.stub!(:connection).and_return(conn)
           end
@@ -103,7 +74,7 @@ class Redcar::Project
         let(:sftp) { double('sftp connection').as_null_object }
         
         subject do
-          Adapters::RemoteProtocols::SFTP.new('server', 'user', 'secret', nil, '/home/fcoury').tap do |protocol|
+          Adapters::RemoteProtocols::SFTP.new('server', 'user', 'secret', []).tap do |protocol|
             conn.stub!(:sftp).and_return(sftp)
             protocol.stub!(:connection).and_return(conn)
           end

data/plugins/redcar/redcar.rb

@@ -715,7 +715,7 @@ module Redcar
         link "Cmd+O",       Project::FileOpenCommand
         link "Cmd+U",       Project::FileReloadCommand
         link "Cmd+Shift+O", Project::DirectoryOpenCommand
-        link "Cmd+Ctrl+O",  Project::OpenRemoteCommand
+        #link "Cmd+Ctrl+O",  Project::OpenRemoteCommand
         link "Cmd+S",       Project::FileSaveCommand
         link "Cmd+Shift+S", Project::FileSaveAsCommand
         link "Cmd+Ctrl+R",  Project::RevealInProjectCommand
@@ -784,7 +784,7 @@ module Redcar
         link "Ctrl+Alt+N",   NewWindowCommand
         link "Ctrl+O",       Project::FileOpenCommand
         link "Ctrl+Shift+O", Project::DirectoryOpenCommand
-        link "Alt+Shift+O",  Project::OpenRemoteCommand
+        #link "Alt+Shift+O",  Project::OpenRemoteCommand
         link "Ctrl+S",       Project::FileSaveCommand
         link "Ctrl+Shift+S", Project::FileSaveAsCommand
         link "Ctrl+Shift+R", Project::RevealInProjectCommand

data/plugins/tree/lib/tree.rb

@@ -83,6 +83,11 @@ module Redcar
     def visible_nodes
       controller.visible_nodes
     end
+    
+    # Close the tree (removes it from the Window's Treebook)
+    def close
+      Redcar.app.windows.detect {|win| win.treebook.trees.include?(self) }.treebook.remove_tree(self)
+    end
   end
 end
 

data/plugins/tree_view_swt/lib/tree_view_swt.rb

@@ -23,10 +23,10 @@ module Redcar
       @viewer.get_tree.set_layout_data(grid_data)
       @composite.layout
       JFace::Viewers::ColumnViewerToolTipSupport.enableFor(@viewer)
-      @viewer.set_content_provider(TreeMirrorContentProvider.new)
+      @viewer.set_content_provider(TreeMirrorContentProvider.new(self))
       #@viewer.getTree.setLinesVisible(true)
 	    #@viewer.getTree.setHeaderVisible(true)
-      @viewer.set_label_provider(TreeMirrorLabelProvider.new)
+      @viewer.set_label_provider(TreeMirrorLabelProvider.new(self))
       @viewer.set_input(@model.tree_mirror)
       
       if @model.tree_controller
@@ -40,8 +40,12 @@ module Redcar
       register_dnd if @model.tree_mirror.drag_and_drop?
       
       @model.add_listener(:refresh) do
-        @model.tree_mirror.refresh_operation(@model) do
-          @viewer.refresh
+        begin
+          @model.tree_mirror.refresh_operation(@model) do
+            @viewer.refresh
+          end
+        rescue => e
+          handle_mirror_error(e)
         end
       end
       
@@ -276,6 +280,22 @@ module Redcar
       end
     end
     
+    def handle_mirror_error(e)
+      if @model.tree_controller.respond_to?(:handle_error)
+        begin
+          @model.tree_controller.handle_error(@model, e)
+        rescue => e
+          puts "error in error hander: #{e.class} #{e.message}"
+          puts e.backtrace
+        end
+      else
+        puts e.class
+        puts e.message
+        puts e.backtrace
+        Application::Dialog.message_box(e.message, :type => :error)
+      end
+    end
+    
     class TreeListener
       def tree_collapsed(e)
       end
@@ -340,6 +360,7 @@ module Redcar
         else
           viewer.expandToLevel(double_clicked_element, 1)
         end
+      rescue
       end
     end
     
@@ -357,6 +378,10 @@ module Redcar
     
     class TreeMirrorContentProvider
       include JFace::Viewers::ITreeContentProvider
+      
+      def initialize(tree_view_swt)
+        @tree_view_swt = tree_view_swt
+      end
 
       def input_changed(viewer, _, tree_mirror)
         @viewer, @tree_mirror = viewer, tree_mirror
@@ -364,6 +389,8 @@ module Redcar
 
       def get_elements(tree_mirror)
         tree_mirror.top.to_java
+      rescue => e
+        @tree_view_swt.handle_mirror_error(e)
       end
 
       def has_children(tree_node)
@@ -373,10 +400,14 @@ module Redcar
           children = tree_node.children
           children.any? if children
         end
+      rescue => e
+        @tree_view_swt.handle_mirror_error(e)
       end
 
       def get_children(tree_node)
         tree_node.children.to_java
+      rescue => e
+        @tree_view_swt.handle_mirror_error(e)
       end
       
       def get_parent(tree_node)
@@ -389,6 +420,10 @@ module Redcar
 
     class TreeMirrorLabelProvider
       include JFace::Viewers::ILabelProvider
+      
+      def initialize(tree_view_swt)
+        @tree_view_swt = tree_view_swt
+      end
 
       def add_listener(*_)
       end