vagrant-multi-putty 1.4.2 → 1.4.3

data/README.md

@@ -73,6 +73,7 @@ There are currently a few additional configuration parameters available:
 *    `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.
+*    `config.putty.session`: Load settings from a saved putty session.
 
 #### Example usage of after_modal post hook
 This is an example which uses the the win32-activate gem written by nazoking. This

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

@@ -57,8 +57,18 @@ module VagrantMultiPutty
       # If ssh_info is nil, the machine is not ready for ssh.
       raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
 
+      ssh_options = []
+
+      # Load a saved putty session if provided. Putty (v0.63 at least) appears
+      # to have a weird bug where a hostname specified on the command line will
+      # not override the hostname in a session unless the hostname comes after
+      # the -load option. This doesn't appear to affect any other command line
+      # options aside from hostname.
+      ssh_options += ["-load", vm.config.putty.session] if
+        vm.config.putty.session
+
       # Load options from machine ssh_info.
-      ssh_options = [ssh_info[:host]]
+      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]

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

@@ -4,6 +4,7 @@ module VagrantMultiPutty
 	attr_accessor :private_key_path
 	attr_accessor :after_modal_hook
 	attr_accessor :modal
+	attr_accessor :session
 
 	def after_modal &proc
 	  @after_modal_hook = proc
@@ -14,6 +15,7 @@ module VagrantMultiPutty
 	  @private_key_path = UNSET_VALUE
 	  @after_modal_hook = UNSET_VALUE
 	  @modal = UNSET_VALUE
+	  @session = UNSET_VALUE
 	end
 
 	def finalize!
@@ -21,6 +23,7 @@ module VagrantMultiPutty
 	  @private_key_path = nil if @private_key_path == UNSET_VALUE
 	  @after_modal_hook = Proc.new{  } if @after_modal_hook == UNSET_VALUE
 	  @modal = false if @modal == UNSET_VALUE
+	  @session = nil if @session == UNSET_VALUE
 	end
 
 	def validate(machine)

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-multi-putty
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-01-12 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: -4207126925764807584
+      hash: -1411506420703789958
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: