Added option to create directory on directory upload

Author: Pablo Merino

InstalledFiles

@@ -0,0 +1,29 @@
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/constants.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/errors.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/packet.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/request.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/response.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/session.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/version.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/operations/dir.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/operations/download.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/operations/file.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/operations/file_factory.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/operations/upload.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/base.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/01/attributes.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/01/base.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/01/name.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/02/base.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/03/base.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/04/attributes.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/04/base.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/04/name.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/05/base.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/06/attributes.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/protocol/06/base.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/operations/upload.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/operations/upload.rb
+/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/lib/ruby/site_ruby/1.9.1/net/sftp/operations/upload.rb

config.save

@@ -0,0 +1,12 @@
+prefix=/Users/pablo/.rvm/rubies/ruby-1.9.3-p125
+std-ruby=$prefix/lib/ruby/1.9.1
+site-ruby-common=$prefix/lib/ruby/site_ruby
+site-ruby=$prefix/lib/ruby/site_ruby/1.9.1
+bin-dir=$prefix/bin
+rb-dir=$site-ruby
+so-dir=$prefix/lib/ruby/site_ruby/1.9.1/x86_64-darwin11.3.0
+data-dir=$prefix/share
+ruby-path=/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/bin/ruby
+ruby-prog=/Users/pablo/.rvm/rubies/ruby-1.9.3-p125/bin/ruby
+make-prog=make
+without-ext=no

lib/net/sftp/operations/upload.rb

@@ -30,6 +30,9 @@ module Net; module SFTP; module Operations
   # This will upload "/path/to/directory", it's contents, it's subdirectories,
   # 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)
+  #
   # 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:
   #
@@ -157,12 +160,17 @@ def initialize(sftp, local, remote, options={}, &progress) #:nodoc:
         @remote_cwd = remote
 
         @active += 1
-        sftp.mkdir(remote) do |response|
-          @active -= 1
-          raise StatusException.new(response, "mkdir `#{remote}'") unless response.ok?
-          (options[:requests] || RECURSIVE_READERS).to_i.times do
-            break unless process_next_entry
+        if @options[:create_dir]
+          sftp.mkdir(remote) do |response|
+            @active -= 1
+            raise StatusException.new(response, "mkdir `#{remote}'") unless response.ok?
+            (options[:requests] || RECURSIVE_READERS).to_i.times do
+              break unless process_next_entry
+            end
           end
+        else
+          @active -= 1
+          process_next_entry
         end
       else
         raise ArgumentError, "expected a file to upload" unless local.respond_to?(:read) || ::File.exists?(local)