From 8ccbd4917dba487329c2df50dc11f3a88902e6fa Mon Sep 17 00:00:00 2001 From: Allan Date: Fri, 25 Feb 2011 03:40:15 +0800 Subject: [PATCH] added basic scp support --- lib/fog/compute/models/aws/server.rb | 8 ++++ lib/fog/core.rb | 1 + lib/fog/core/scp.rb | 67 ++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 lib/fog/core/scp.rb diff --git a/lib/fog/compute/models/aws/server.rb b/lib/fog/compute/models/aws/server.rb index b20d3ef31..4630edc03 100644 --- a/lib/fog/compute/models/aws/server.rb +++ b/lib/fog/compute/models/aws/server.rb @@ -186,6 +186,14 @@ module Fog Fog::SSH.new(ip_address, username, options).run(commands) end + def scp(local_path, remote_path) + requires :ip_address, :username + + options = {} + options[:key_data] = [private_key] if private_key + Fog::SCP.new(ip_address, username, options).upload(local_path, remote_path) + end + def start requires :id connection.start_instances(id) diff --git a/lib/fog/core.rb b/lib/fog/core.rb index 31af5822b..0d7561b36 100644 --- a/lib/fog/core.rb +++ b/lib/fog/core.rb @@ -27,5 +27,6 @@ require 'fog/core/mock' require 'fog/core/provider' require 'fog/core/service' require 'fog/core/ssh' +require 'fog/core/scp' require 'fog/core/time' require 'fog/core/wait_for' diff --git a/lib/fog/core/scp.rb b/lib/fog/core/scp.rb new file mode 100644 index 000000000..608f9f9b7 --- /dev/null +++ b/lib/fog/core/scp.rb @@ -0,0 +1,67 @@ +module Fog + module SCP + + def self.new(address, username, options = {}) + if Fog.mocking? + Fog::SCP::Mock.new(address, username, options) + else + Fog::SCP::Real.new(address, username, options) + end + end + + def self.reset_data(keys=Mock.data.keys) + Mock.reset_data(keys) + end + + class Mock + + def self.data + @data ||= Hash.new do |hash, key| + hash[key] = {} + end + end + + def initialize(address, username, options) + @address = address + @username = username + @options = options + end + + def run(commands) + Fog::Mock.not_implemented + end + + end + + class Real + + def initialize(address, username, options) + require 'net/scp' + + key_manager = Net::SSH::Authentication::KeyManager.new(nil, options) + + unless options[:key_data] || options[:keys] || options[:password] || key_manager.agent + raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH') + end + + @address = address + @username = username + @options = { :paranoid => false }.merge(options) + end + + def upload(local_path, remote_path) + begin + Net::SCP.start(@address, @username, @options) do |scp| + scp.upload!(local_path, remote_path) do |ch, name, sent, total| + # TODO: handle progress display? + end + end + rescue Exception => error + raise error + end + end + + end + + end +end