Merge branch 'master' into 2.0

Author: delano

lib/net/sftp/operations/upload.rb

@@ -31,7 +31,7 @@ module Net; module SFTP; module Operations
   # and their contents, recursively, to "/path/to/remote" on the remote server.
   #
   # For uploading a directory without creating it, do
-  # sftp.upload!("/path/to/directory", "/path/to/remote", :create_dir => false)
+  # sftp.upload!("/path/to/directory", "/path/to/remote", :mkdir => false)
   #
   # If you want to send data to a file on the remote server, but the data is
   # in memory, you can pass an IO object and upload it's contents:
@@ -160,7 +160,7 @@ def initialize(sftp, local, remote, options={}, &progress) #:nodoc:
         @remote_cwd = remote
 
         @active += 1
-        if @options[:create_dir]
+        if @options[:mkdir]
           sftp.mkdir(remote) do |response|
             @active -= 1
             raise StatusException.new(response, "mkdir `#{remote}'") unless response.ok?

test/test_upload.rb

@@ -110,15 +110,15 @@ def test_upload_directory_should_mirror_directory_structure_remotely
     prepare_directory
 
     assert_scripted_command do
-      sftp.upload("/path/to/local", "/path/to/remote")
+      sftp.upload("/path/to/local", "/path/to/remote", :mkdir => true)
     end
   end
 
   def test_upload_directory_with_handler_should_report_progress
     prepare_directory
 
     assert_scripted_command do
-      sftp.upload("/path/to/local", "/path/to/remote") { |*args| record_progress(args) }
+      sftp.upload("/path/to/local", "/path/to/remote", :mkdir => true) { |*args| record_progress(args) }
     end
 
     assert_progress_reported_open(:remote => "/path/to/remote/file1")
@@ -230,4 +230,4 @@ def expect_file_transfer(local, remote, data)
 
       expect_file(local, data)
     end
-end
+end