beaker 2.15.1 → 2.16.0

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -208,8 +208,9 @@ module Beaker
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @param [Hash{Symbol=>String}] opts
         # @option opts [String] :version Version of puppet to download
+        # @option opts [String] :puppet_agent_version Version of puppet agent to download
         # @option opts [String] :mac_download_url Url to download msi pattern of %url%/puppet-%version%.msi
-        # @option opts [String] :win_download_url Url to download dmg  pattern of %url%/(puppet|hiera|facter)-%version%.msi
+        # @option opts [String] :win_download_url Url to download dmg pattern of %url%/(puppet|hiera|facter)-%version%.msi
         #
         # @return nil
         # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
@@ -219,7 +220,8 @@ module Beaker
 
           # If version isn't specified assume the latest in the 3.x series
           if opts[:version] and not version_is_less(opts[:version], '4.0.0')
-            opts[:version] = opts[:puppet_agent_version]
+            # backwards compatability
+            opts[:puppet_agent_version] ||= opts[:version]
             install_puppet_agent_on(hosts, opts)
 
           else
@@ -260,8 +262,8 @@ module Beaker
         #Install Puppet Agent based on specified hosts using provided options
         # @example will install puppet-agent 1.1.0 from native puppetlabs provided packages wherever possible and will fail over to gem installing latest puppet
         #  install_puppet_agent_on(hosts, {
-        #    :version          => '1.1.0',
-        #    :default_action   => 'gem_install',
+        #    :puppet_agent_version          => '1.1.0',
+        #    :default_action                => 'gem_install',
         #   })
         #
         #
@@ -275,10 +277,10 @@ module Beaker
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @param [Hash{Symbol=>String}] opts
-        # @option opts [String] :version Version of puppet to download
+        # @option opts [String] :puppet_agent_version Version of puppet to download
         # @option opts [String] :puppet_gem_version Version of puppet to install via gem if no puppet-agent package is available
         # @option opts [String] :mac_download_url Url to download msi pattern of %url%/puppet-agent-%version%.msi
-        # @option opts [String] :win_download_url Url to download dmg  pattern of %url%/puppet-agent-%version%.msi
+        # @option opts [String] :win_download_url Url to download dmg pattern of %url%/puppet-agent-%version%.msi
         # @option opts [String] :puppet_collection Defaults to 'pc1'
         #
         # @return nil
@@ -287,6 +289,10 @@ module Beaker
         def install_puppet_agent_on(hosts, opts)
           opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
           opts[:puppet_collection] ||= 'pc1' #hi!  i'm case sensitive!  be careful!
+          opts[:puppet_agent_version] ||= opts[:version] #backwards compatability with old parameter name
+          if not opts[:puppet_agent_version]
+            raise "must provide :puppet_agent_version (puppet-agent version) for install_puppet_agent_on"
+          end
 
           block_on hosts do |host|
             host[:type] = 'aio' #we are installing agent, so we want aio type
@@ -296,15 +302,15 @@ module Beaker
               logger.warn("install_puppet_agent_on for pe-only platform #{host['platform']} - use install_puppet_agent_pe_promoted_repo_on")
             when /el-|fedora/
               install_puppetlabs_release_repo(host, opts[:puppet_collection])
-              if opts[:version]
-                host.install_package("puppet-agent-#{opts[:version]}")
+              if opts[:puppet_agent_version]
+                host.install_package("puppet-agent-#{opts[:puppet_agent_version]}")
               else
                 host.install_package('puppet-agent')
               end
             when /debian|ubuntu|cumulus/
               install_puppetlabs_release_repo(host, opts[:puppet_collection])
-              if opts[:version]
-                host.install_package("puppet-agent=#{opts[:version]}-1#{host['platform'].codename}")
+              if opts[:puppet_agent_version]
+                host.install_package("puppet-agent=#{opts[:puppet_agent_version]}-1#{host['platform'].codename}")
               else
                 host.install_package('puppet-agent')
               end
@@ -522,7 +528,7 @@ module Beaker
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @param [Hash{Symbol=>String}] opts An options hash
-        # @option opts [String] :version The version of Puppet Agent to install
+        # @option opts [String] :puppet_agent_version The version of Puppet Agent to install
         # @option opts [String] :win_download_url The url to download puppet from
         #
         # @note on windows, the +:ruby_arch+ host parameter can determine in addition
@@ -530,13 +536,14 @@ module Beaker
         def install_puppet_agent_from_msi_on(hosts, opts)
           block_on hosts do |host|
 
+            host[:type] = 'aio' #we are installing agent, so we want aio type
             is_config_32 = true == (host['ruby_arch'] == 'x86') || host['install_32'] || opts['install_32']
             should_install_64bit = host.is_x86_64? && !is_config_32
             arch = should_install_64bit ? 'x64' : 'x86'
 
             # If we don't specify a version install the latest MSI for puppet-agent
-            if opts[:version]
-              host['dist'] = "puppet-agent-#{opts[:version]}-#{arch}"
+            if opts[:puppet_agent_version]
+              host['dist'] = "puppet-agent-#{opts[:puppet_agent_version]}-#{arch}"
             else
               host['dist'] = "puppet-agent-#{arch}-latest"
             end
@@ -585,6 +592,7 @@ module Beaker
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @param [Hash{Symbol=>String}] opts An options hash
         # @option opts [String] :version The version of Puppet to install
+        # @option opts [String] :puppet_version The version of puppet-agent to install
         # @option opts [String] :facter_version The version of Facter to install
         # @option opts [String] :hiera_version The version of Hiera to install
         # @option opts [String] :mac_download_url Url to download msi pattern of %url%/puppet-%version%.msi
@@ -593,14 +601,14 @@ module Beaker
         # @api private
         def install_puppet_from_dmg_on( hosts, opts )
           block_on hosts do |host|
-            if opts[:version] && !version_is_less(opts[:version], '4.0.0')
+            # install puppet-agent if puppet version > 4.0 OR not puppet version is provided
+            if (opts[:version] && !version_is_less(opts[:version], '4.0.0')) || !opts[:version]
               if opts[:puppet_agent_version].nil?
                 raise "You must specify the version of puppet-agent you " +
                       "want to install if you want to install Puppet 4.0 " +
                       "or greater on OSX"
               end
 
-              opts[:version] = opts[:puppet_agent_version]
               install_puppet_agent_from_dmg_on(host, opts)
 
             else
@@ -626,22 +634,36 @@ module Beaker
         end
         alias_method :install_puppet_from_dmg, :install_puppet_from_dmg_on
 
-        # Installs Puppet and dependencies from dmg on provided host(s).
+        # Installs puppet-agent and dependencies from dmg on provided host(s).
         #
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @param [Hash{Symbol=>String}] opts An options hash
-        # @option opts [String] :version The version of Puppet Agent to install
-        # @option opts [String] :mac_download_url Url to download msi pattern of %url%/puppet-%version%.msi
+        # @option opts [String] :puppet_agent_version The version of Puppet Agent to install, defaults to latest
+        # @option opts [String] :mac_download_url Url to download msi pattern of %url%/puppet-%version%.dmg
+        # @option opts [String] :puppet_collection Defaults to 'PC1'
         #
         # @return nil
         # @api private
         def install_puppet_agent_from_dmg_on(hosts, opts)
+          opts[:puppet_collection] ||= 'PC1'
+          opts[:puppet_collection] = opts[:puppet_collection].upcase #needs to be upcase, more lovely consistency
           block_on hosts do |host|
-            version = opts[:version] || 'latest'
-            on host, "curl -O #{opts[:mac_download_url]}/puppet-agent-#{version}.dmg"
 
-            host.install_package("puppet-agent-#{version}")
+            host[:type] = 'aio' #we are installing agent, so we want aio type
+
+            variant, version, arch, codename = host['platform'].to_array
+            agent_version = opts[:puppet_agent_version] || 'latest'
+            pkg_name = "puppet-agent-#{agent_version}*"
+            if agent_version == 'latest'
+              dmg_name = "puppet-agent-#{agent_version}.dmg"
+              on host, "curl -O #{opts[:mac_download_url]}/#{dmg_name}"
+            else
+              dmg_name = "puppet-agent-#{agent_version}-osx-#{version}-x86_64.dmg"
+              on host, "curl -O #{opts[:mac_download_url]}/#{opts[:puppet_collection]}/#{dmg_name}"
+            end
+
+            host.install_package(pkg_name)
 
             configure_foss_defaults_on( host )
           end
@@ -941,12 +963,14 @@ module Beaker
         end
 
         # Install development repo of the puppet-agent on the given host(s).  Downloaded from 
-        # location of the form DOWNLOAD_URL/puppet-agent/AGENT_VERSION
+        # location of the form DEV_BUILDS_URL/puppet-agent/AGENT_VERSION/repos
         #
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @param [Hash{Symbol=>String}] opts An options hash
-        # @option opts [String] :version The version of puppet-agent to install
+        # @option opts [String] :puppet_agent_version The version of puppet-agent to install
+        # @option opts [String] :puppet_agent_sha The sha of puppet-agent to install, defaults to provided
+        #                       puppet_agent_version
         # @option opts [String] :copy_base_local Directory where puppet-agent artifact
         #                       will be stored locally
         #                       (default: 'tmp/repo_configs')
@@ -954,18 +978,35 @@ module Beaker
         #                       artifact will be pushed to on the external machine
         #                       (default: '/root')
         # @option opts [String] :puppet_collection Defaults to 'PC1'
-        # @option opts [String] :download_url Base url to look for build at
+        # @option opts [String] :dev_builds_url Base URL to pull artifacts from
+        # @option opts [String] :copy_base_local Directory where puppet-agent artifact
+        #                       will be stored locally
+        #                       (default: 'tmp/repo_configs')
+        # @option opts [String] :copy_dir_external Directory where puppet-agent
+        #                       artifact will be pushed to on the external machine
+        #                       (default: '/root')
         #
         # @note on windows, the +:ruby_arch+ host parameter can determine in addition
         # to other settings whether the 32 or 64bit install is used
         #
+        # @example
+        #   install_puppet_agent_dev_repo_on(host, { :puppet_agent_sha => 'd3377feaeac173aada3a2c2cedd141eb610960a7', :puppet_agent_version => '1.1.1.225.gd3377fe'  })
+        #
         # @return nil
-        def install_puppet_agent_repo_on( hosts, opts )
+        def install_puppet_agent_dev_repo_on( hosts, opts )
 
+          opts[:puppet_agent_version] ||= opts[:version] #backward compatability
+          if not opts[:puppet_agent_version]
+            raise "must provide :puppet_agent_version (puppet-agent version) for install_puppet_agent_dev_repo_on"
+          end
           block_on hosts do |host|
+            variant, version, arch, codename = host['platform'].to_array
+            opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
+            opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{ opts[:puppet_agent_sha] || opts[:puppet_agent_version] }/repos/"
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= File.join('/', 'root')
             opts[:puppet_collection] ||= 'PC1'
+            host[:type] = 'aio' #we are installing agent, so we want aio type
             release_path = opts[:download_url]
             variant, version, arch, codename = host['platform'].to_array
             copy_dir_local = File.join(opts[:copy_base_local], variant)
@@ -975,10 +1016,13 @@ module Beaker
             when /^(fedora|el|centos|sles)$/
               variant = ((variant == 'centos') ? 'el' : variant)
               release_path << "#{variant}/#{version}/#{opts[:puppet_collection]}/#{arch}"
-              release_file = "puppet-agent-#{opts[:version]}-1.#{variant}#{version}.#{arch}.rpm"
+              release_file = "puppet-agent-#{opts[:puppet_agent_version]}-1.#{variant}#{version}.#{arch}.rpm"
             when /^(debian|ubuntu|cumulus)$/
+              if arch == 'x86_64'
+                arch = 'amd64'
+              end
               release_path << "deb/#{codename}/#{opts[:puppet_collection]}"
-              release_file = "puppet-agent_#{opts[:version]}-1#{codename}_#{arch}.deb"
+              release_file = "puppet-agent_#{opts[:puppet_agent_version]}-1#{codename}_#{arch}.deb"
             when /^windows$/
               release_path << 'windows'
               onhost_copy_base = '`cygpath -smF 35`/'
@@ -989,6 +1033,11 @@ module Beaker
               # - we do not have install_32 set globally
               arch_suffix = should_install_64bit ? '64' : '86'
               release_file = "puppet-agent-x#{arch_suffix}.msi"
+            when /^osx$/
+              onhost_copy_base = File.join('/var', 'root')
+              mac_pkg_name = "puppet-agent-#{opts[:puppet_agent_version]}"
+              release_path << "/apple/#{opts[:puppet_collection]}"
+              release_file = "#{mac_pkg_name}-#{variant}-#{version}-x86_64.dmg"
             else
               raise "No repository installation step for #{variant} yet..."
             end
@@ -1007,10 +1056,13 @@ module Beaker
               result = on host, "echo #{onhost_copied_file}"
               onhost_copied_file = result.raw_output.chomp
               on host, Command.new("start /w #{onhost_copied_file}", [], { :cmdexe => true })
+            when /^osx$/
+              host.install_package("#{mac_pkg_name}*")
             end
-            add_aio_defaults_on( host )
+            configure_foss_defaults_on( host )
           end
         end
+        alias_method :install_puppetagent_dev_repo, :install_puppet_agent_dev_repo_on
 
         # Install shared repo of the puppet-agent on the given host(s).  Downloaded from 
         # location of the form PE_PROMOTED_BUILDS_URL/PE_VER/puppet-agent/AGENT_VERSION/repo
@@ -1018,8 +1070,7 @@ module Beaker
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @param [Hash{Symbol=>String}] opts An options hash
-        # @option opts [String] :version The version of puppet-agent to install
-        # @option opts [String] :sha The sha of puppet-agent to install
+        # @option opts [String] :puppet_agent_version The version of puppet-agent to install, defaults to 'latest'
         # @option opts [String] :pe_ver The version of PE (will also use host['pe_ver']), defaults to '4.0'
         # @option opts [String] :copy_base_local Directory where puppet-agent artifact
         #                       will be stored locally
@@ -1034,53 +1085,82 @@ module Beaker
         # to other settings whether the 32 or 64bit install is used
         #
         # @example
-        #   install_puppet_agent_pe_promoted_repo_on(host, { :sha => '1.1.0.227', :version => '1.1.0.227.g1d8334c', :pe_ver => '4.0.0-rc1'})
+        #   install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_version => '1.1.0.227', :pe_ver => '4.0.0-rc1'})
         #
         # @return nil
         def install_puppet_agent_pe_promoted_repo_on( hosts, opts )
+          opts[:puppet_agent_version] ||= 'latest'
           block_on hosts do |host|
             pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0'
             variant, version, arch, codename = host['platform'].to_array
             opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
-            opts[:download_url] = "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{pe_ver}/#{opts[:sha]}/repos/"
-            install_puppet_agent_repo_on( host, opts )
-          end
-        end
+            opts[:download_url] = "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{ pe_ver }/#{ opts[:puppet_agent_version] }/repos/"
+            opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
+            opts[:copy_dir_external]  ||= File.join('/', 'root')
+            opts[:puppet_collection] ||= 'PC1'
+            host[:type] = 'aio' #we are installing agent, so we want aio type
+            release_path = opts[:download_url]
+            variant, version, arch, codename = host['platform'].to_array
+            copy_dir_local = File.join(opts[:copy_base_local], variant)
+            onhost_copy_base = opts[:copy_dir_external]
 
+            case variant
+            when /^(fedora|el|centos|sles)$/
+              variant = ((variant == 'centos') ? 'el' : variant)
+              release_file = "/repos/#{variant}/#{version}/#{opts[:puppet_collection]}/#{arch}/puppet-agent-*.rpm"
+              download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
+            when /^(debian|ubuntu|cumulus)$/
+              if arch == 'x86_64'
+                arch = 'amd64'
+              end
+              release_file = "/repos/apt/#{codename}/pool/#{opts[:puppet_collection]}/p/puppet-agent/puppet-agent*#{arch}.deb"
+              download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
+            when /^windows$/
+              onhost_copy_base = '`cygpath -smF 35`/'
+              is_config_32 = host['ruby_arch'] == 'x86' || host['install_32'] || opts['install_32']
+              should_install_64bit = host.is_x86_64? && !is_config_32
+              # only install 64bit builds if
+              # - we do not have install_32 set on host
+              # - we do not have install_32 set globally
+              arch_suffix = should_install_64bit ? '64' : '86'
+              release_path += "windows/"
+              release_file = "/puppet-agent-x#{arch_suffix}.msi"
+              download_file = "puppet-agent-x#{arch_suffix}.msi"
+            when /^osx$/
+              onhost_copy_base = File.join('/var', 'root')
+              release_file = "/repos/apple/#{opts[:puppet_collection]}/puppet-agent-*"
+              download_file = "puppet-agent-#{variant}-#{version}.tar.gz"
+            else
+              raise "No pe-promoted installation step for #{variant} yet..."
+            end
 
-        # Install development repo of the puppet-agent on the given host(s).  Downloaded from 
-        # location of the form DEV_BUILDS_URL/puppet-agent/AGENT_VERSION/repos
-        #
-        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
-        #                            or a role (String or Symbol) that identifies one or more hosts.
-        # @param [Hash{Symbol=>String}] opts An options hash
-        # @option opts [String] :version The version of puppet-agent to install
-        # @option opts [String] :sha The sha of puppet-agent to install
-        # @option opts [String] :copy_base_local Directory where puppet-agent artifact
-        #                       will be stored locally
-        #                       (default: 'tmp/repo_configs')
-        # @option opts [String] :copy_dir_external Directory where puppet-agent
-        #                       artifact will be pushed to on the external machine
-        #                       (default: '/root')
-        # @option opts [String] :puppet_collection Defaults to 'PC1'
-        # @option opts [String] :dev_builds_url Base URL to pull artifacts from
-        #
-        # @note on windows, the +:ruby_arch+ host parameter can determine in addition
-        # to other settings whether the 32 or 64bit install is used
-        #
-        # @example
-        #   install_puppet_agent_dev_repo_on(host, { :sha => 'd3377feaeac173aada3a2c2cedd141eb610960a7', :version => '1.1.1.225.gd3377fe'  })
-        #
-        # @return nil
-        def install_puppet_agent_dev_repo_on( hosts, opts )
-          block_on hosts do |host|
-            variant, version, arch, codename = host['platform'].to_array
-            opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
-            opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{opts[:sha]}/repos/"
-            install_puppet_agent_repo_on( host, opts )
+            onhost_copied_download = File.join(onhost_copy_base, download_file)
+            onhost_copied_file = File.join(onhost_copy_base, release_file)
+            fetch_http_file( release_path, download_file, copy_dir_local)
+            scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
+
+            case variant
+            when /^(fedora|el|centos|sles)$/
+              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
+              on host, "rpm -ivh #{onhost_copied_file}"
+            when /^(debian|ubuntu|cumulus)$/
+              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
+              on host, "dpkg -i --force-all #{onhost_copied_file}"
+              on host, "apt-get update"
+            when /^windows$/
+              result = on host, "echo #{onhost_copied_file}"
+              onhost_copied_file = result.raw_output.chomp
+              on host, Command.new("start /w #{onhost_copied_file}", [], { :cmdexe => true })
+            when /^osx$/
+              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
+              # move to better location
+              on host, "mv #{onhost_copied_file}.dmg ."
+              host.install_package("puppet-agent-*")
+            end
+            configure_foss_defaults_on( host )
           end
         end
-        alias_method :install_puppetagent_dev_repo, :install_puppet_agent_dev_repo_on
+
 
         # This method will install a pem file certifcate on a windows host
         #

data/lib/beaker/dsl/install_utils/pe_utils.rb

@@ -415,7 +415,10 @@ module Beaker
           install_hosts.each do |host|
             if agent_only_check_needed && hosts_agent_only.include?(host)
               host['type'] = 'aio'
-              install_puppet_agent_pe_promoted_repo_on(host, opts)
+              install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_version => opts[:puppet_agent_version],
+                                                               :puppet_agent_sha => opts[:puppet_agent_sha],
+                                                               :pe_ver => opts[:pe_ver],
+                                                               :puppet_collection => opts[:puppet_collection] })
               setup_defaults_and_config_helper_on(host, master, [0, 1])
             elsif host['platform'] =~ /windows/
               on host, installer_cmd(host, opts)
@@ -542,11 +545,12 @@ module Beaker
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @!macro common_opts
-        # @option opts [String] :sha      The sha of puppet-agent to install. Required for PE agent
-        #                                 only hosts on 4.0+
-        # @option opts [String] :version  Version of puppet-agent to install. Required for PE agent
+        # @option opts [String] :puppet_agent_version  Version of puppet-agent to install. Required for PE agent
         #                                 only hosts on 4.0+
+        # @option opts [String] :puppet_agent_sha The sha of puppet-agent to install, defaults to puppet-agent-version.
+        #                                 Required for PE agent only hosts on 4.0+
         # @option opts [String] :pe_ver   The version of PE (will also use host['pe_ver']), defaults to '4.0'
+        # @option opts [String] :puppet_collection   The puppet collection for puppet-agent install.
         #
         # @example
         #  install_pe_on(hosts, {})

data/lib/beaker/host.rb

@@ -400,22 +400,28 @@ module Beaker
 
       Rsync.host = hostname_with_user
 
-      if ssh_opts.has_key?('keys') and
-        ssh_opts.has_key?('auth_methods') and
-        ssh_opts['auth_methods'].include?('publickey')
+      # vagrant uses temporary ssh configs in order to use dynamic keys
+      # without this config option using ssh may prompt for password
+      if ssh_opts[:config] and File.exists?(ssh_opts[:config])
+        ssh_args << "-F #{ssh_opts[:config]}"
+      else
+        if ssh_opts.has_key?('keys') and
+            ssh_opts.has_key?('auth_methods') and
+            ssh_opts['auth_methods'].include?('publickey')
 
-        key = ssh_opts['keys']
+          key = ssh_opts['keys']
 
-        # If an array was set, then we use the first value
-        if key.is_a? Array
-          key = key.first
-        end
+          # If an array was set, then we use the first value
+          if key.is_a? Array
+            key = key.first
+          end
 
-        # We need to expand tilde manually as rsync can be
-        # funny sometimes
-        key = File.expand_path(key)
+          # We need to expand tilde manually as rsync can be
+          # funny sometimes
+          key = File.expand_path(key)
 
-        ssh_args << "-i #{key}"
+          ssh_args << "-i #{key}"
+        end
       end
 
       if ssh_opts.has_key?(:port)