vagrant-multi-putty 1.4.1 → 1.4.2

data/README.md

@@ -36,33 +36,41 @@ or convert a private key of your own.
  4. Answer yes when prompted to save without a password.
  5. Save the key using the filename of "insecure_private_key.ppk".
 
-Note: If you do not explicity set the config.putty.private_key_path variable,
-you need to convert the insecure_private_key and store it with a ".ppk"
-extension. The vagrant-multi-putty plugin appends this extension automatically.
+If you do not explicity set the `config.putty.private_key_path`
+variable, you need to convert the insecure_private_key and store it
+with a ".ppk" extension. The vagrant-multi-putty plugin appends this
+extension automatically.
+
+As of Vagrant 1.4.0, the `config.ssh.private_key_path` variable is converted into
+an array. This allows multiple SSH keys to be passed to ssh. PuTTY does not
+allow for a list of ssh keys via the command line. Therefore, if the
+`config.putty.private_key_path` variable is not set, we attempt to use the first
+key in the `config.ssh.private_key_path` list and append the '.ppk' extension
+to it.
 
 ## Configuration
 Most of the ssh configuration options used to control vagrant ssh also
 control vagrant-multi-putty. The following Vagrantfile options are NOT used by
 vagrant-multi-putty:
 
-*    config.ssh.max_tries
-*    config.ssh.timeout
-*    config.ssh.private_key_path
-*    config.ssh.shell
+*    `config.ssh.max_tries`
+*    `config.ssh.timeout`
+*    `config.ssh.private_key_path`
+*    `config.ssh.shell`
 
 All other config.ssh options should work for vagrant-multi-putty just like they
 do for vagrant ssh.
 
 There are currently a few additional configuration parameters available:
 
-*    config.putty.username: Overrides the username set with
-     config.ssh.username.
-*    config.putty.private_key_path: Used to explicity  set the path to the
+*    `config.putty.username`: Overrides the username set with
+    ` config.ssh.username`.
+*    `config.putty.private_key_path`: Used to explicity set the path to the
      private key variable.
-*    config.putty.modal: change vagrant-multi-putty to use modal window mode.
+*    `config.putty.modal`: change vagrant-multi-putty to use modal window mode.
      Execute putty and block the terminal until all putty processes have exited.
-     Can be set on the command line with -m or --modal. This is false by default.
-*    config.putty.after_modal: Configure a post hook block that will be called
+     Can be set on the command line with `-m` or `--modal`. This is false by default.
+*    `config.putty.after_modal`: Configure a post hook block that will be called
      once all child putty processes have exited and modal mode is enabled. The
      default block is empty.
 

data/lib/vagrant-multi-putty/command.rb

@@ -5,7 +5,8 @@ require 'optparse'
 module VagrantMultiPutty
   class Command < Vagrant.plugin(2, :command)
     def execute
-      options = {:modal => @env.config_global.putty.modal }
+      options = {:modal => @env.config_global.putty.modal,
+                 :plain_auth => false }
       opts = OptionParser.new do |opts|
         opts.banner = "Usage: vagrant putty [vm-name...] [-- extra putty args]"
 
@@ -56,25 +57,27 @@ module VagrantMultiPutty
       # If ssh_info is nil, the machine is not ready for ssh.
       raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
 
-      # The config.putty directive overrides the config.ssh private_key_path directive.
-      private_key = vm.config.putty.private_key_path || "#{ssh_info[:private_key_path]}.ppk"
-      pk_path = File.expand_path("#{private_key}", vm.env.root_path)
-      @logger.debug("Putty Private Key: #{pk_path}")
-
       # Load options from machine ssh_info.
       ssh_options = [ssh_info[:host]]
       # config.putty.username overrides the machines ssh_info username.
       ssh_options += ["-l", vm.config.putty.username || ssh_info[:username]]
       ssh_options += ["-P", ssh_info[:port].to_s]
-      ssh_options += ["-i", pk_path] unless options[:plain_auth]
       ssh_options += ["-X"] if ssh_info[:forward_x11]
       ssh_options += ["-A"] if ssh_info[:forward_agent]
 
+      # Putty only allows one ssh key to be passed with the -i option
+      # so we default to choosing the first default key if it is not
+      # explicitly set.
+      private_key = vm.config.putty.private_key_path ||
+        ssh_info[:private_key_path][0] + ".ppk"
+      @logger.debug("Putty Private Keys: #{private_key.to_s}")
+      ssh_options += ["-i", private_key] unless options[:plain_auth]
+
       # Add in additional args from the command line.
       ssh_options.concat(args) if !args.nil?
 
       # Spawn putty and detach it so we can move on.
-      @logger.debug("Putty cmd line options: #{options.to_s}")
+      @logger.debug("Putty cmd line options: #{ssh_options.to_s}")
       pid = spawn("putty", *ssh_options)
       @logger.debug("Putty Child Pid: #{pid}")
       Process.detach(pid)

data/lib/vagrant-multi-putty/version.rb

@@ -1,3 +1,3 @@
 module VagrantMultiPutty
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-multi-putty
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Vagrant plugin to allow VM ssh with PuTTY (multi-vm supported)
 email:
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3685031145220800060
+      hash: -4207126925764807584
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: