vagrant-multi-putty 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bcb1308ea1efd27389c9ed1b0c9a988dd1181c4
-  data.tar.gz: 715f131affcf007ee8371f747f9207dcc8949d09
+  metadata.gz: 795d8f4d8e9e729eb46b8ccf3574a6c3af379ca0
+  data.tar.gz: ee50785a4e5b8570a78548a539e082237cfc209c
 SHA512:
-  metadata.gz: 17562cedbad15454687a397f27c5e63ac0be8353a2513f6c4016c91769c455f892f1b8471bf11aca4c34e567e02388c79fef5e791406c5ba53622b394899e061
-  data.tar.gz: fca69320f02eae511e8abb2afbf0c8c6b81951210b7beadb4d6061e83e2b98d136ec53259d8d952956e576ca275004ee18fd71e2c71818b6a8f96b230ce917bb
+  metadata.gz: 7c4fa3f194ab55417d92c1b76e22d392e5eb10126264fdb54adb9b8293c9ef6c8f5c527a8a176a5e65821e8965504503e042803e71e9dea4a8581192dfbfb61d
+  data.tar.gz: 3298dfb73660a7473feb190c33275b3ef0168f33f80e1947ec4da42154c4053280a7df9e521ad1c3f68231b186bc314383f5c31e07eaa72e89cd475934e7c5c7

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-v1.5.0 (2016-04-04)
--------------------
-
-Added automatic putty .ppk file generation [GH-20]
+v1.6.0 (2016-11-03)
+-------------------
+
+FEATURES:
+ * Added the ability to override the path to the putty or putty like binary via `config.putty.ssh_client`. [GH-22]
+
+v1.5.0 (2016-04-04)
+-------------------
+
+Added automatic putty .ppk file generation [GH-20]

data/README.md

@@ -56,6 +56,7 @@ There are currently a few additional configuration parameters available:
      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.
+*    `config.putty.ssh_client`: Allow end users to control the path to the putty or putty like (kitty for example) binary.
 
 #### 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

@@ -9,14 +9,14 @@ using PuTTY::Key
 module VagrantMultiPutty
   class Command < Vagrant.plugin(2, :command)
     def execute
-      
+
       # config_global is deprecated from v1.5
       if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new('1.5')
         @config = @env.vagrantfile.config
       else
         @config = @env.config_global
       end
-      
+
       options = {:modal => @config.putty.modal,
                  :plain_auth => false }
       opts = OptionParser.new do |opts|
@@ -101,13 +101,13 @@ module VagrantMultiPutty
 
       # Spawn putty and detach it so we can move on.
       @logger.debug("Putty cmd line options: #{ssh_options.to_s}")
-      pid = spawn("putty", *ssh_options)
+      pid = spawn(@config.putty.ssh_client, *ssh_options)
       @logger.debug("Putty Child Pid: #{pid}")
       Process.detach(pid)
     end
-    
+
     private
-    
+
     def get_putty_key_file(ssh_key_path)
       "#{ssh_key_path}.ppk".tap do |ppk_path|
         if !File.exist?(ppk_path) || File.mtime(ssh_key_path) > File.mtime(ppk_path)

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

@@ -5,6 +5,7 @@ module VagrantMultiPutty
 	attr_accessor :after_modal_hook
 	attr_accessor :modal
 	attr_accessor :session
+	attr_accessor :ssh_client
 
 	def after_modal &proc
 	  @after_modal_hook = proc
@@ -16,6 +17,7 @@ module VagrantMultiPutty
 	  @after_modal_hook = UNSET_VALUE
 	  @modal = UNSET_VALUE
 	  @session = UNSET_VALUE
+	  @ssh_client = UNSET_VALUE
 	end
 
 	def finalize!
@@ -24,6 +26,7 @@ module VagrantMultiPutty
 	  @after_modal_hook = Proc.new{  } if @after_modal_hook == UNSET_VALUE
 	  @modal = false if @modal == UNSET_VALUE
 	  @session = nil if @session == UNSET_VALUE
+	  @ssh_client = "putty" if @ssh_client == UNSET_VALUE
 	end
 
 	def validate(machine)

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

@@ -5,7 +5,8 @@ module VagrantMultiPutty
     name "vagrant-multi-putty"
     description <<-DESC
       Vagrant-multi-putty allows you to ssh into your virtual machines using the putty
-      program. This plugin also supports opening putty sessions into multi-vm environments.
+      program (or other compatible ssh clients like kitty). This plugin also supports
+      opening putty sessions into multi-vm environments.
     DESC
 
     command "putty" do

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

@@ -1,3 +1,3 @@
 module VagrantMultiPutty
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-multi-putty
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Nick Downs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: putty-key