make sure :mode parameter to upload() is honored

CHANGELOG

@@ -1,5 +1,7 @@
 *unreleased*
 
+* If :mode is given to upload() helper, do a chmod after to set the mode [Jamis Buck]
+
 * Fix load_from_file method for windows users [Neil Wilson]
 
 * Display a deprecation error if a remote git branch is specified [Tim Harper]

lib/capistrano/configuration/actions/file_transfer.rb

@@ -10,7 +10,6 @@ module FileTransfer
         # set the mode on the file.
         def put(data, path, options={})
           opts = options.dup
-          opts[:permissions] = opts.delete(:mode)
           upload(StringIO.new(data), path, opts)
         end
 
@@ -23,7 +22,12 @@ def get(remote_path, path, options={}, &block)
         end
 
         def upload(from, to, options={}, &block)
+          mode = options.delete(:mode)
           transfer(:up, from, to, options, &block)
+          if mode
+            mode = mode.is_a?(Numeric) ? mode.to_s(8) : mode.to_s
+            run "chmod #{mode} #{to}"
+          end
         end
 
         def download(from, to, options={}, &block)

test/configuration/actions/file_transfer_test.rb

@@ -14,7 +14,8 @@ def setup
 
   def test_put_should_delegate_to_upload
     @config.expects(:upload).with { |from, to, opts|
-      from.string == "some data" && to == "test.txt" && opts == { :permissions => 0777 } }
+      from.string == "some data" && to == "test.txt" && opts == { :mode => 0777 } }
+    @config.expects(:run).never
     @config.put("some data", "test.txt", :mode => 0777)
   end
 
@@ -28,6 +29,24 @@ def test_upload_should_delegate_to_transfer
     @config.upload("testl.txt", "testr.txt", :foo => "bar")
   end
 
+  def test_upload_without_mode_should_not_try_to_chmod
+    @config.expects(:transfer).with(:up, "testl.txt", "testr.txt", :foo => "bar")
+    @config.expects(:run).never
+    @config.upload("testl.txt", "testr.txt", :foo => "bar")
+  end
+
+  def test_upload_with_mode_should_try_to_chmod
+    @config.expects(:transfer).with(:up, "testl.txt", "testr.txt", :foo => "bar")
+    @config.expects(:run).with("chmod 775 testr.txt")
+    @config.upload("testl.txt", "testr.txt", :mode => 0775, :foo => "bar")
+  end
+
+  def test_upload_with_symbolic_mode_should_try_to_chmod
+    @config.expects(:transfer).with(:up, "testl.txt", "testr.txt", :foo => "bar")
+    @config.expects(:run).with("chmod g+w testr.txt")
+    @config.upload("testl.txt", "testr.txt", :mode => "g+w", :foo => "bar")
+  end
+
   def test_download_should_delegate_to_transfer
     @config.expects(:transfer).with(:down, "testr.txt", "testl.txt", :foo => "bar")
     @config.download("testr.txt", "testl.txt", :foo => "bar")