cloudflock 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5caf060aa6dffa12338aee4f8e6bc50a7d924ca0
-  data.tar.gz: 7dc01d5bb4c01a7037bc848e8d46911da697c5e3
+  metadata.gz: 77bad0c9dba5e0acc40d97db07f2275c580ccd83
+  data.tar.gz: ea1c657a195ab4a6643e6c8b9267d6db074f7339
 SHA512:
-  metadata.gz: 78c8c3e2a955ce7b0cbf0d201121f4ff3c8c6186079955657b23c4a5cbe53ffdbcab0e175805f068037a0a848c54d74b48973d098af4352c3888110126a37690
-  data.tar.gz: 77435605a9983bc72686a472b948a8ce061ba4387fe5f551dbd58cbe8de40d122c7f7742168296ae6af112101d5b5959d5a883fb6b63562bdc02f0149a57cd46
+  metadata.gz: 3a827d7f5a0882d97e6d8d3be223b24e66580d89e59b91123f19e0b1f5bafb15f0ce076876806e6e3b501859a1b2c59d4f24883ccf05605b90218b2307f4fa0e
+  data.tar.gz: 6bc57df99c5cb032eba75095634eb974cea9050f7f063d4195978739391772532acfdefda92e4d711c3fe2fb580cacefcdc842b2f7a04faa14145201844decd5

data/lib/cloudflock/app/common/rackspace.rb

@@ -39,7 +39,7 @@ module CloudFlock; module App
     def define_rackspace_cloudservers_region(api)
       api.merge(define_rackspace_service_region(api, 'cloudServersOpenStack'))
     end
-    
+
     # Public: Wrap define_rackspace_service_region, specifying 'cloudFiles' as
     # the service type.
     #

data/lib/cloudflock/app/common/servers.rb

@@ -93,6 +93,57 @@ module CloudFlock; module App
       host
     end
 
+    # Public: Attempt to log in to a source server to be migrated.
+    #
+    # source_host - Hash containing any options which may pertain to the host.
+    #
+    # Returns a CloudFlock::Remote::SSH object logged in to a remote host.
+    def connect_source(source_host)
+      connect_host(source_host, :define_source)
+    end
+
+    # Public: Attempt to log in to a destination server to which data will be
+    # migrated.
+    #
+    # dest_host - Hash containing any options which may pertain to the host.
+    #
+    # Returns a CloudFlock::Remote::SSH object logged in to a remote host.
+    def connect_destination(dest_host)
+      connect_host(source_host, :define_destination)
+    end
+
+    # Public: Attempt to log in to a target host.
+    #
+    # host          - Hash containing any applicable options mappings for the
+    #                 server in question.
+    # define_method - Name of the method to call when re-defining host to
+    #                 recover from an exception.
+    #
+    # Returns a CloudFlock::Remote::SSH object logged in to the target host.
+    def connect_host(host, define_method)
+      UI.spinner("Logging in to #{host[:hostname]}") do
+        SSH.new(host)
+      end
+    rescue CloudFlock::Remote::SSH::InvalidHostname => e
+      error = "Cannot look up #{host[:hostname]}"
+      retry_exit(e.message, 'Try another host? (Y/N)')
+
+      host = self.send(define_method, (host.merge({hostname: nil})))
+      retry
+    rescue CloudFlock::Remote::SSH::SSHCannotConnect => e
+      retry if retry_prompt(e.message)
+      retry_exit('', 'Try another host? (Y/N)')
+
+      host = self.send(define_method, (host.merge({hostname: nil})))
+      retry
+    rescue Net::SSH::AuthenticationFailed => e
+      retry_exit("Cannot log in as #{host[:username]}.")
+
+      options = {username: nil, password: nil}
+      host = self.send(define_method, (host.merge(options)))
+      retry
+    end
+
     # Public: Have the user select from a list of available images to provision
     # a new host.
     #
@@ -142,8 +193,8 @@ module CloudFlock; module App
       end
       image_list.map! { |image| { name: image.name, id: image.id } }
     rescue Excon::Errors::Timeout
-      retry if retry_prompt('Unable to fetch a list of available images.')
-      raise
+      retry_exit('Unable to fetch a list of available images.')
+      retry
     end
 
     # Public: Have the user select from a list of available flavors to
@@ -191,6 +242,9 @@ module CloudFlock; module App
         flavor_list.select! { |flavor| flavor.disk > hdd && flavor.ram > ram }
       end
       flavor_list.map! { |flavor| { name: flavor.name, id: flavor.id } }
+    rescue Fog::Errors::TimeoutError, Excon::Errors::Timeout
+      retry_exit('Unable to fetch flavor list.')
+      retry
     end
 
     # Public: Prompt user for the name of a new host to be created, presenting
@@ -242,7 +296,7 @@ module CloudFlock; module App
       { username: 'root', port: '22' }.merge(get_host_details(host))
     rescue Fog::Errors::TimeoutError, Excon::Errors::Timeout
       retry if retry_prompt('Provisioning failed.')
-      raise
+      exit
     end
 
     # Public: Wait for a Rackspace Cloud instance to be provisioned.
@@ -260,7 +314,7 @@ module CloudFlock; module App
 
       retry if UI.prompt_yn("#{error}  Continue waiting? (Y/N)",
                             default_answer: 'Y')
-      raise
+      exit
     end
 
     # Public: Wait for a Rackspace Cloud instance with Managed service level to
@@ -277,6 +331,11 @@ module CloudFlock; module App
       UI.spinner('Waiting for managed cloud automation to complete') do
         ssh.as_root("while [ ! -f #{finished} ]; do sleep 5; done", 3600)
       end
+    rescue Timeout::Error
+      retry if retry_prompt('Managed cloud automation timed out.')
+      host.destroy if UI.prompt_yn('Delete newly created host?')
+
+      exit
     end
 
     # Public: Get details for a Fog::Compute instance.
@@ -305,10 +364,12 @@ module CloudFlock; module App
         retry if retry_prompt('Timeout exceeded waiting for the host.')
 
         host.destroy
-        raise
+        exit
       end
     rescue Excon::Errors::Timeout
-      retry if retry_prompt('API timed out waiting for server status update.')
+      retry if retry_prompt('API timed out.', 'Continue waiting?')
+
+      exit
     end
 
     # Public: Connect to a host via SSH, automatically retrying a set number of
@@ -333,8 +394,27 @@ module CloudFlock; module App
         end
       end
     rescue Net::SSH::Disconnect
-      retry if retry_prompt('Unable to establish a connection.')
-      raise
+      retry_exit('Unable to establish a connection.')
+      retry
+    rescue ArgumentError
+      retry_exit('Incorrect passphrase provided for ssh key.')
+
+      host.delete(:passphrase)
+      check_option_pw(host, :passphrase, "Key passphrase", default_answer: '',
+                      allow_empty: true)
+      retry
+    end
+
+    # Public: Get details for a Fog::Compute instance.
+    #
+    # host - Fog::Compute instance.
+    #
+    # Returns a Hash containing the host's address and root password.
+    def destroy_host(host)
+      host.destroy
+    rescue Fog::Errors::TimeoutError, Excon::Errors::Timeout
+      retry_exit('API Timed out trying to delete the host.')
+      retry
     end
 
     # Public: Perform the final preperatory steps necessary as well as the
@@ -346,37 +426,113 @@ module CloudFlock; module App
     #
     # Returns a String containing the host's new ssh public key.
     def migrate_server(source_shell, dest_shell, exclusions)
-      pubkey = UI.spinner('Generating a keypair for the source environment') do
-        generate_keypair(source_shell)
+      pubkey = prepare_source_ssh_keygen(source_shell)
+      prepare_source_exclusions(source_shell, exclusions)
+      setup_destination(dest_shell, pubkey)
+      rsync = prepare_source_rsync(source_shell, dest_shell)
+      dest_address = prepare_source_servicenet(source_shell, dest_shell)
+
+      rsync = "#{rsync} -azP -e 'ssh #{SSH_ARGUMENTS} -i #{PRIVATE_KEY}' " +
+              "--exclude-from='#{EXCLUSIONS}' / #{dest_address}:#{MOUNT_POINT}"
+      rsync_migrate(source_shell, rsync)
+    end
+
+    # Public: Generate a new ssh keypair to be used for the migration.
+    #
+    # shell  - SSH object logged in to the source host.
+    #
+    # Returns a String containing the new public key.
+    def prepare_source_ssh_keygen(shell)
+      UI.spinner('Generating a keypair for the source environment') do
+        generate_keypair(shell)
       end
+    rescue Timeout::Error
+      retry_exit('Host is taking a long time generating an ssh keypair.')
+      retry
+    end
 
-      UI.spinner('Preparing the destination environment') do
-        setup_destination(dest_shell, pubkey)
+    # Public: Generate a new ssh keypair to be used for the migration.
+    #
+    # shell      - SSH object logged in to the source host.
+    # exclusions - String containing the exclusions list for the source host.
+    #
+    # Returns a String containing the new public key.
+    def prepare_source_exclusions(shell, exclusions)
+      UI.spinner('Setting up migration exclusions') do
+        shell.as_root("cat <<EOF> #{EXCLUSIONS}\n#{exclusions}\nEOF")
       end
+    rescue Timeout::Error
+      retry_exit('Host is taking a long time to respond.')
+      retry
+    end
 
-      rsync = UI.spinner('Preparing the source environment') do
-        location = setup_source(source_shell, exclusions)
-        if location.empty?
-          location = transfer_rsync(source_shell, dest_shell)
-        end
+    # Public: Generate a new ssh keypair to be used for the migration.
+    #
+    # source_shell - SSH object logged in to the source host.
+    # dest_shell   - SSH object logged in to the destination host.
+    #
+    # Returns a String containing the location rsync on the source host.
+    def prepare_source_rsync(source_shell, dest_shell)
+      UI.spinner('Determining rsync location') do
+        location = determine_rsync(source_shell)
+        location = transfer_rsync(source_shell, dest_shell) if location.empty?
 
         location
       end
+    rescue Timeout::Error
+      retry_exit('Host is taking a long detecting/installing rsync.')
+      retry
+    end
 
+    # Public: Determine the target IP address to use for rsync.
+    #
+    # source_shell - SSH object logged in to the source host.
+    # dest_shell   - SSH object logged in to the destination host.
+    #
+    # Returns a String containing the new IP address to use.
+    def prepare_source_servicenet(source_shell, dest_shell)
       dest_address = UI.spinner('Checking for ServiceNet') do
         determine_target_address(source_shell, dest_shell)
       end
+    rescue Timeout::Error
+      retry_exit('Host is taking a long detecting available networks.')
+      retry
+    end
 
-      rsync = "#{rsync} -azP -e 'ssh #{SSH_ARGUMENTS} -i #{PRIVATE_KEY}' " +
-              "--exclude-from='#{EXCLUSIONS}' / #{dest_address}:#{MOUNT_POINT}"
-
+    # Public: Wrap performing an rsync migration.
+    #
+    # shell - SSH object logged in to the source host.
+    # rsync - Command to be run on the source host.
+    #
+    # Returns nothing.
+    def rsync_migrate(shell, rsync)
       UI.spinner('Performing rsync migration') do
         2.times do
-          # TODO: this dies in exceptional cases
-          source_shell.as_root(rsync, 7200)
-          source_shell.as_root("sed -i 's/\/var\/log//g' #{EXCLUSIONS}")
+          rsync_migrate_commands(shell, rsync)
         end
+        shell.logout!
       end
+    rescue Timeout::Error
+      retry if retry_prompt('Server sync is taking a very long time')
+      exit
+    end
+
+    # Public: Issue an rsync command, keeping track of how many times a timeout
+    # has occurred, raising an error past a threshhold of 3 timeouts.
+    #
+    # shell   - SSH object logged in to the source host.
+    # rsync   - Rsync command to be run on the source host.
+    # timeout - Number of times the timeout has been reached. (default: 0)
+    #
+    # Returns nothing.
+    def rsync_migrate_commands(shell, rsync, timeout = 0)
+      shell.as_root(rsync, 7200)
+      shell.as_root("sed -i 's/\/var\/log//g' #{EXCLUSIONS}")
+    rescue Timeout::Error
+      timeout += 1
+      retry if timeout < 3
+
+      raise
     end
 
     # Public: Create a temporary ssh key to be used for passwordless access to
@@ -396,11 +552,9 @@ module CloudFlock; module App
     # location of rsync on the system.
     #
     # shell      - SSH object logged in to the source host.
-    # exclusions - String containing the exclusions list for the source host.
     #
     # Returns a String containing path to rsync on the host if present.
-    def setup_source(shell, exclusions)
-      shell.as_root("cat <<EOF> #{EXCLUSIONS}\n#{exclusions}\nEOF")
+    def determine_rsync(shell)
       shell.as_root('which rsync 2>/dev/null')
     end
 
@@ -410,8 +564,6 @@ module CloudFlock; module App
     # source_shell - SSH object logged in to the source host.
     # dest_shell   - SSH object logged in to the source host.
     #
-    # Raises NoRsyncAvailable if rsync doesn't exist on the destination host.
-    #
     # Returns a String.
     def transfer_rsync(source_shell, dest_shell)
       host     = dest_shell.hostname
@@ -436,33 +588,86 @@ module CloudFlock; module App
     #
     # Returns nothing.
     def setup_destination(shell, pubkey)
+      prepare_destination_filesystem(shell)
+      prepare_destination_rsync(shell)
+      prepare_destination_pubkey(shell, pubkey)
+    end
+
+    # Public: Mount the destination host's target device and make backups of
+    # authentication-related files (passwd, group, shadow).
+    #
+    # shell  - SSH object logged in to the destination host.
+    #
+    # TODO: Dynamic mountpoint/block device support
+    # Presently mount point and block device are hard-coded.  This will be
+    # changed in a future release.
+    #
+    # Returns nothing.
+    def prepare_destination_filesystem(shell)
       preserve_files = ['passwd', 'shadow', 'group']
       path = "#{MOUNT_POINT}/etc"
 
-      # TODO: Dynamic mountpoint/block device support
-      # Presently mount point and block device are hard-coded.  This will be
-      # changed in a future release.
-      shell.as_root("mkdir -p #{MOUNT_POINT}")
-      shell.as_root("mount -o acl /dev/xvdb1 #{MOUNT_POINT}")
+      UI.spinner('Preparing the destination filesystem') do
+        shell.as_root("mkdir -p #{MOUNT_POINT}")
+        shell.as_root("mount -o acl /dev/xvdb1 #{MOUNT_POINT}")
 
-      preserve_files.each do |file|
-        original = "#{path}/#{file}"
-        backup   = "#{original}.migration"
-        shell.as_root("[ -f #{backup} ] || /bin/cp -a #{original} #{backup}")
+        preserve_files.each do |file|
+          original = "#{path}/#{file}"
+          backup   = "#{original}.migration"
+          shell.as_root("[ -f #{backup} ] || /bin/cp -a #{original} #{backup}")
+        end
       end
+    rescue Timeout::Error
+      retry_exit('Host is slow to respond while preparing the destination.')
+      retry
+    end
 
-      # TODO: Better distro support
-      # Only Debian- and RedHat-based Unix hosts support automatic rsync
-      # installation at this time.  This will be fixed in a future release.
-      unless /rsync error/.match(shell.as_root('rsync'))
-        package_manager = shell.as_root('which {yum,apt-get} 2>/dev/null')
-        raise NoRsyncAvailable if package_manager.empty?
-        shell.as_root("#{package_manager} install rsync -y", 300)
+    # Public: Verify that rsync is installed on the destination host,
+    # installing needed.
+    #
+    # shell  - SSH object logged in to the destination host.
+    #
+    # TODO: Better distro support
+    # Only Debian- and RedHat-based Unix hosts support automatic rsync
+    # installation at this time.  This will be fixed in a future release.
+    #
+    # Raises NoRsyncAvailable if rsync doesn't exist on the destination host.
+    #
+    # Returns nothing.
+    def prepare_destination_rsync(shell)
+      UI.spinner('Verifying rsync is present on the destination host') do
+        unless /rsync error/.match(shell.as_root('rsync'))
+          package_manager = shell.as_root('which {yum,apt-get} 2>/dev/null')
+          raise NoRsyncAvailable if package_manager.empty?
+          shell.as_root("#{package_manager} install rsync -y", 300)
+        end
       end
+    rescue Timeout::Error
+      retry_exit('Host is slow to respond while preparing the destination.')
+      retry
+    end
 
-      ssh_key = "mkdir $HOME/.ssh; chmod 0700 $HOME/.ssh; printf " +
-                "'#{pubkey}\\n' >> $HOME/.ssh/authorized_keys"
-      shell.as_root(ssh_key)
+    # Public: Verify that rsync is installed on the destination host,
+    # installing needed.
+    #
+    # shell  - SSH object logged in to the destination host.
+    #
+    # TODO: Better distro support
+    # Only Debian- and RedHat-based Unix hosts support automatic rsync
+    # installation at this time.  This will be fixed in a future release.
+    #
+    # Raises NoRsyncAvailable if rsync doesn't exist on the destination host.
+    #
+    # Returns nothing.
+    def prepare_destination_pubkey(shell, pubkey)
+      UI.spinner('Installing source host public key') do
+        ssh_key = "mkdir $HOME/.ssh; chmod 0700 $HOME/.ssh; printf " +
+                  "'#{pubkey}\\n' >> $HOME/.ssh/authorized_keys"
+        shell.as_root(ssh_key)
+      end
+    rescue Timeout::Error
+      retry_exit('Host is slow to respond while preparing the destination.')
+      retry
     end
 
     # Public: Determine what address should be used when connecting from source
@@ -659,14 +864,27 @@ module CloudFlock; module App
       end
     end
 
+    # Public: Wrap retry_prompt, exiting the application if the prompt is
+    # declined.
+    #
+    # message - String containing a failure message.
+    # prompt  - Prompt to present to the user (default: 'Try again? (Y/N)').
+    #
+    # Returns false, or exits.
+    def retry_exit(message, prompt = 'Try again? (Y/N)')
+      error = UI.red { "#{message}  #{prompt}" }
+      exit unless UI.prompt_yn(error, default_answer: 'Y')
+    end
+
     # Public: Display a failure message to the user and prompt whether to
     # retry.
     #
     # message - String containing a failure message.
+    # prompt  - Prompt to present to the user (default: 'Try again? (Y/N)').
     #
     # Returns true or false indicating whether the user wishes to retry.
-    def retry_prompt(message)
-      error = UI.red { "#{message}  Try again? (Y/N)" }
+    def retry_prompt(message, prompt = 'Try again? (Y/N)')
+      error = UI.red { "#{message}  #{prompt}".strip }
       UI.prompt_yn(error, default_answer: 'Y')
     end
   end

data/lib/cloudflock/app/server-migrate.rb

@@ -25,7 +25,6 @@ module CloudFlock; module App
       exclusions = build_exclusions(profile.cpe)
       migrate_server(source_host, dest_host, exclusions)
 
-      source_host.logout!
       cleanup_destination(dest_host, profile.cpe)
       configure_ips(dest_host, profile)
 
@@ -263,6 +262,11 @@ module CloudFlock; module App
                   'SSH identity to use for the source host') do |key|
             options[:ssh_key] = key
           end
+
+          opts.on('--src-identity-password PASSWORD',
+                  "Password to unlock the source host's SSH key") do |pass|
+            options[:passphrase] = key
+          end
         end
 
         opts.separator ''
@@ -306,6 +310,11 @@ module CloudFlock; module App
                   'SSH identity to use for the destination host') do |key|
             options[:dest_ssh_key] = key
           end
+
+          opts.on('--dest-identity-password PASSWORD',
+                  "Password to unlock the destination host's SSH key") do |pass|
+            options[:dest_passphrase] = key
+          end
         end
 
         opts.separator ''

data/lib/cloudflock/app/server-profile.rb

@@ -12,12 +12,11 @@ module CloudFlock; module App
     # Public: Connect to and profile a remote host, then display the gathered
     # information.
     def initialize
-      options = parse_options
+      options     = parse_options
+      source_host = options.dup
 
       source_host = define_source(options)
-      source_ssh = UI.spinner("Logging in to #{source_host[:hostname]}") do
-        SSH.new(source_host)
-      end
+      source_ssh  = connect_source(source_host)
 
       profile = UI.spinner("Checking source host") do
         CloudFlock::Task::ServerProfile.new(source_ssh)

data/lib/cloudflock/app.rb

@@ -95,9 +95,10 @@ module CloudFlock
       opts.separator ''
       opts.separator 'Global Options:'
 
-      opts.on('-c', '--config FILE', 'Specify configuration file') do |file|
-        options[:config_file] = File.expand_path(file)
-      end
+# TODO: Add config file support.
+#      opts.on('-c', '--config FILE', 'Specify configuration file') do |file|
+#        options[:config_file] = File.expand_path(file)
+#      end
 
       opts.on_tail('--version', 'Show Version Information') do
         puts "CloudFlock v#{CloudFlock::VERSION}"

data/lib/cloudflock/errstr.rb

@@ -2,7 +2,7 @@ module CloudFlock
   module App
     module Common
       module Errstr
-        NO_RSYNC = 'Cannot find rsync on the destination host'
+        NO_RSYNC = 'Cannot find rsync on the destination host.'
       end
     end
   end
@@ -10,9 +10,9 @@ module CloudFlock
   module Remote
     class SSH
       module Errstr
-        NOHOST         = 'No host specified'
-        INVALID_HOST   = 'Unable to look up host: %s'
-        CANNOT_CONNECT = 'Unable to connect to host: %s'
+        NOHOST         = 'No host specified.'
+        INVALID_HOST   = 'Unable to look up host: %s.'
+        CANNOT_CONNECT = 'Unable to connect to host: %s.'
       end
     end
   end
@@ -20,12 +20,12 @@ module CloudFlock
   module Target
     module Servers
       class Profile
-        NOT_SSH = 'SSH session expected'
+        NOT_SSH = 'SSH session expected.'
       end
 
       class Platform
-        NOT_CPE        = 'Expected a CPE object'
-        CPE_INCOMPLETE = 'CPE must contain at least vendor and version'
+        NOT_CPE        = 'Expected a CPE object.'
+        CPE_INCOMPLETE = 'CPE must contain at least vendor and version.'
       end
     end
   end

data/lib/cloudflock/remote/ssh.rb

@@ -42,18 +42,17 @@ module CloudFlock; module Remote
     #
     # args - Hash containing arguments relating to the SSH session. (default
     #        defined in DEFAULT_ARGS):
-    #        :hostname       - String containing the address of the remote
-    #                          host.
-    #        :username       - String containing the remote user with which to
-    #                          log in.  (default: '')
-    #        :password       - String containing the password with which to log
-    #                          in.  (default: '')
-    #        :port           - Fixnum specifying the port to which to connect.
-    #                          (default: 22)
-    #        :ssh_key        - String containing the path to an ssh private
-    #                          key.  (default: '')
-    #        :key_passphrase - The passphrase for the ssh key if applicable.
-    #                          (default: '')
+    #        :hostname   - String containing the address of the remote host.
+    #        :username   - String containing the remote user with which to log
+    #                      in.  (default: '')
+    #        :password   - String containing the password with which to log in.
+    #                      (default: '')
+    #        :port       - Fixnum specifying the port to which to connect.
+    #                      (default: 22)
+    #        :ssh_key    - String containing the path to an ssh private key.
+    #                      (default: '')
+    #        :passphrase - The passphrase for the ssh key if applicable.
+    #                      (default: '')
     #
     # Raises InvalidHostname if host lookup fails.
     # Raises LoginFailed if logging into the host fails.
@@ -192,18 +191,17 @@ module CloudFlock; module Remote
     # Internal: Sanitize arguments to be used
     #
     # args - Hash containing arguments relating to the SSH session:
-    #        :host           - String containing the address of the remote
-    #                          host.
-    #        :username       - String containing the remote user with which to
-    #                          log in.  (default: '')
-    #        :password       - String containing the password with which to log
-    #                          in.  (default: '')
-    #        :port           - Fixnum specifying the port to which to connect.
-    #                          (default: 22)
-    #        :ssh_key        - String containing the path to an ssh private
-    #                          key.  (default: '')
-    #        :key_passphrase - The passphrase for the ssh key if applicable.
-    #                          (default: '')
+    #        :host       - String containing the address of the remote host.
+    #        :username   - String containing the remote user with which to log
+    #                      in.  (default: '')
+    #        :password   - String containing the password with which to log in.
+    #                      (default: '')
+    #        :port       - Fixnum specifying the port to which to connect.
+    #                      (default: 22)
+    #        :ssh_key    - String containing the path to an ssh private key.
+    #                      (default: '')
+    #        :passphrase - The passphrase for the ssh key if applicable.
+    #                      (default: '')
     #
     # Returns a Hash containing sanitized arguments suitable for passing to
     # Net::SSH.  Not that #filter_ssh_arguments should be called to guarantee
@@ -237,9 +235,9 @@ module CloudFlock; module Remote
     # args - Hash containing arguments to filter.
     #
     # Returns a Hash with only the keys :port, :password, :key_data and
-    # :key_passphrase defined.
+    # :passphrase defined.
     def filter_ssh_options(args)
-      valid_arguments = [:port, :password, :key_data, :key_passphrase]
+      valid_arguments = [:port, :password, :key_data, :passphrase]
       args.select { |opt| valid_arguments.include? opt }.merge(NET_SSH_OPTIONS)
     end
 

data/lib/cloudflock.rb

@@ -4,5 +4,5 @@ require 'cloudflock/errstr'
 # Public: Encapsulate all functionality related to the CloudFlock API and any
 # apps built with such.
 module CloudFlock
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudflock
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
-- Chris Wuest
+- Tina Wuest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-json
@@ -85,7 +85,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.1
 description: CloudFlock is a library and toolchain focused on migration
-email: chris@chriswuest.com
+email: tina@wuest.me
 executables:
 - cloudflock
 - cloudflock-files