lib/fog/compute/models/slicehost/server.rb in fog-0.8.2 vs lib/fog/compute/models/slicehost/server.rb in fog-0.9.0

@@ -1,10 +1,10 @@
 require 'fog/core/model'
 
 module Fog
-  module Slicehost
-    class Compute
+  module Compute
+    class Slicehost
 
       class Server < Fog::Model
 
         identity :id
 
@@ -108,15 +108,15 @@
           options = {}
           options[:key_data] = [private_key] if private_key
           Fog::SSH.new(addresses.first, username, options).run(commands)
         end
 
-        def scp(local_path, remote_path)
+        def scp(local_path, remote_path, upload_options = {})
           requires :addresses, :username
 
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(addresses.first, username, options).upload(local_path, remote_path)
+          scp_options = {}
+          scp_options[:key_data] = [private_key] if private_key
+          Fog::SCP.new(addresses.first, username, scp_options).upload(local_path, remote_path, upload_options)
         end
 
         def username
           @username ||= 'root'
         end