Merge pull request capistrano#109 from dbackeus/master

Better errors when trying to upload non-existent files.

(This patch comes with brittle tests, if you have problems, please report them on the issue tracker.)

lib/capistrano/transfer.rb

@@ -203,6 +203,8 @@ def normalize(argument, session)
       end
 
       def handle_error(error)
+        raise error if error.message.include?('expected a file to upload')
+
         transfer = session_map[error.session]
         transfer[:error] = error
         transfer[:failed] = true

test/transfer_test.rb

@@ -133,6 +133,14 @@ def test_errors_raised_for_a_scp_session_should_abort_session_and_continue_with_
     transfer.process!
   end
 
+  def test_uploading_a_non_existing_file_should_raise_an_understandable_error
+    s = session('app1')
+    error = Capistrano::Processable::SessionAssociation.on(ArgumentError.new('expected a file to upload'), s)
+    transfer = Capistrano::Transfer.new(:up, "from", "to", [], :via => :scp)
+    transfer.expects(:process_iteration).raises(error)
+    assert_raise(ArgumentError, 'expected a file to upload') { transfer.process! }
+  end
+
   private
 
     class ExceptionWithSession < ::Exception