vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160112/0

@@ -0,0 +1,388 @@
+# HG changeset patch
+# Parent 015f2d2d5173e7df1f47a07a16eef1a331713c7b
+[mq]: 0
+
+diff -r 015f2d2d5173 lib/vagrant-skytap/action/clear_forwarded_ports.rb
+--- a/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Tue Jan 12 18:20:49 2016 -0800
++++ b/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Tue Jan 12 18:29:09 2016 -0800
+@@ -14,8 +14,9 @@
+         def call(env)
+           if pidfiles = read_pidfiles.presence
+             env[:ui].info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
+-            kill_tunnels(pidfiles)
++            #kill_tunnels(pidfiles)
+           end
++          pidfiles = @env[:host].capability(:kill_forwarded_ports, @env)
+ 
+           @app.call(env)
+         end
+diff -r 015f2d2d5173 lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb	Tue Jan 12 18:20:49 2016 -0800
++++ b/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb	Tue Jan 12 18:29:09 2016 -0800
+@@ -1,109 +1,12 @@
+-require "pathname"
+-require "tmpdir"
+-require 'childprocess'
+-require "vagrant/util/subprocess"
+-#require 'byebug'
+-#require 'ap'
+-require 'log4r'
+-require "vagrant/util/safe_chdir"
++require "vagrant-skytap/hosts/common/cap/ssh_tunnel"
+ 
+ module VagrantPlugins
+   module Skytap
+     module HostBSD
+       module Cap
+-        class SSHTunnel
+-          def self.start_ssh_tunnel(env, fp, env_hash)
+-            logger = Log4r::Logger.new("vagrant::hosts::bsd")
+-            port = {
+-              adapter:   fp.adapter,
+-              guestip:   fp.guest_ip,
+-              guestport: fp.guest_port,
+-              hostip:    fp.host_ip,
+-              hostport:  fp.host_port,
+-              name:      fp.id,
+-              protocol:  fp.protocol
+-            }
+-
+-            pidfile = pidfile_name(port, env_hash)
+-            pid = read_pid(pidfile)
+-            if pid && autossh_pid?(pid)
+-              logger.info("An autossh process already exists with pid #{pid}.")
+-            else
+-              args = autossh_args(port, pidfile, env_hash)
+-              Vagrant::Util::Subprocess.execute("autossh", *args)
+-            end
+-          end
+-
+-          def self.kill_ssh_tunnel(env, pidfile, env_hash)
+-            logger = Log4r::Logger.new("vagrant::hosts::bsd")
+-            pidfile = File.join(env_hash[:machine].data_dir, pidfile)
+-            pid = read_pid(pidfile)
+-            if pid && autossh_pid?(pid)
+-              Vagrant::Util::Subprocess.execute("kill", pid.to_s)
+-            else
+-              logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
+-              Vagrant::Util::Subprocess.execute("rm", pidfile)
+-            end
+-          end
+-
+-          private
+-
+-          def self.pidfile_name(port, env_hash)
+-            tunnel_name = [port[:hostip], port[:name]].compact.join('_')
+-            File.join(env_hash[:machine].data_dir, "#{tunnel_name}.pid")
+-          end
+-
+-          def self.read_pid(pidfile)
+-            File.read(pidfile).presence.try(:to_i) if File.exist?(pidfile)
+-          end
+-
+-          # Checks that the pid is actually an autossh process (and not
+-          # something else using a recycled pid).
+-          def self.autossh_pid?(pid)
+-            # get_comm_for_pid(pid) == 'autossh'
+-            true
+-          end
+-
+-          # Get the command, minus any arguments, for the given
+-          # pid. I don't expect this to be compatible cross-platform yet...
+-          # This could be complicated cross-platform, and Sys::ProcTable
+-          # could likewise be complicated cross-platform ...
+-          def self.get_comm_for_pid(pid)
+-            result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
+-            result.stdout.split("\n").last
+-          end
+-
+-          def self.autossh_args(port, pidfile, env_hash)
+-            ssh_info = env_hash[:machine_ssh_info]
+-            ssh_options = {
+-              "ServerAliveInterval" => 10,
+-              "ServerAliveCountMax" => 3,
+-              "StrictHostKeyChecking" => "no",
+-            }
+-            environment_variables = {
+-              env: {
+-                "AUTOSSH_PIDFILE" => pidfile,
+-                "AUTOSSH_PORT" => 0, # turns off monitoring
+-                #"AUTOSSH_LOGFILE" => "./autossh.log",
+-              }
+-            }
+-            forward_string = [
+-              port[:hostport],
+-              "localhost",
+-              port[:guestport]
+-            ].join(':')
+-
+-            autossh_args = []
+-            autossh_args << "-q"
+-            autossh_args << "-N"
+-            autossh_args << "-f"
+-            autossh_args << "-i" << env_hash[:machine].data_dir.join("private_key").to_s
+-            autossh_args << "-L" << forward_string
+-            ssh_options.each do |k, v|
+-              autossh_args << "-o" << "#{k}=#{v}"
+-            end
+-            autossh_args << "#{ssh_info[:username]}@#{ssh_info[:host]}"
+-            autossh_args << environment_variables
++        class SSHTunnel < VagrantPlugins::Skytap::Common::Cap::SSHTunnel
++          def self.create_logger
++            Log4r::Logger.new("vagrant::hosts::bsd")
+           end
+         end
+       end
+diff -r 015f2d2d5173 lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 18:20:49 2016 -0800
++++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 18:29:09 2016 -0800
+@@ -12,35 +12,32 @@
+     module HostCommon
+       module Cap
+         class SSHTunnel
+-          def self.create_logger
+-            Log4r::Logger.new("vagrant::hosts::common")
+-          end
++          def self.start_ssh_tunnel(env, fp, env_hash)
++            logger = Log4r::Logger.new("vagrant::hosts::bsd")
++            port = {
++              adapter:   fp.adapter,
++              guestip:   fp.guest_ip,
++              guestport: fp.guest_port,
++              hostip:    fp.host_ip,
++              hostport:  fp.host_port,
++              name:      fp.id,
++              protocol:  fp.protocol
++            }
+ 
+-          # called per port by ForwardPorts
+-          def self.start_ssh_tunnel(env, fp, env_hash)
+-            logger = create_logger
+-            machine = env_hash[:machine]
+-            pid = read_pid(File.join(machine.data_dir, pidfile_name(fp)))
++            pidfile = pidfile_name(port, env_hash)
++            pid = read_pid(pidfile)
+             if pid && autossh_pid?(pid)
+               logger.info("An autossh process already exists with pid #{pid}.")
+             else
+-              args = autossh_args(fp, pidfile, env_hash)
++              args = autossh_args(port, pidfile, env_hash)
+               Vagrant::Util::Subprocess.execute("autossh", *args)
+             end
+           end
+ 
+-          # called for machine by ClearForwardedPorts
+-          def self.kill_forwarded_ports(env, env_hash)
+-            get_pidfiles_for_machine(env_hash[:machine]).each do |pidfile|
+-              kill_ssh_tunnel(env, pidfile, env_hash)
+-            end
+-          end
+-
+-          # exposed but not called currently from any action
+           def self.kill_ssh_tunnel(env, pidfile, env_hash)
+-            logger = create_logger
+-            machine = env_hash[:machine]
+-            pid = read_pid(File.join(machine.data_dir, pidfile))
++            logger = Log4r::Logger.new("vagrant::hosts::bsd")
++            pidfile = File.join(env_hash[:machine].data_dir, pidfile)
++            pid = read_pid(pidfile)
+             if pid && autossh_pid?(pid)
+               Vagrant::Util::Subprocess.execute("kill", pid.to_s)
+             else
+@@ -49,26 +46,17 @@
+             end
+           end
+ 
+-          ####################################
++          private
+ 
+-          def self.pidfile_name(fp)
+-            "#{fp[:host_ip]}.pid"
++          def self.pidfile_name(port, env_hash)
++            tunnel_name = [port[:hostip], port[:name]].compact.join('_')
++            File.join(env_hash[:machine].data_dir, "#{tunnel_name}.pid")
+           end
+ 
+-          def self.read_pid(pidfile_path)
+-            File.read(pidfile_path).presence.try(:to_i) if File.exist?(pidfile_path)
++          def self.read_pid(pidfile)
++            File.read(pidfile).presence.try(:to_i) if File.exist?(pidfile)
+           end
+ 
+-          def self.get_pidfiles_for_machine(machine)
+-            pidfiles = []
+-            Vagrant::Util::SafeChdir.safe_chdir(machine.data_dir) do
+-              pidfiles = Dir.glob("*.pid")
+-            end
+-            pidfiles
+-          end
+-
+-          ####################################
+-
+           # Checks that the pid is actually an autossh process (and not
+           # something else using a recycled pid).
+           def self.autossh_pid?(pid)
+@@ -77,16 +65,15 @@
+           end
+ 
+           # Get the command, minus any arguments, for the given
+-          # pid. This probably needs to be overridden per host cap
++          # pid. I don't expect this to be compatible cross-platform yet...
++          # This could be complicated cross-platform, and Sys::ProcTable
++          # could likewise be complicated cross-platform ...
+           def self.get_comm_for_pid(pid)
+             result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
+             result.stdout.split("\n").last
+           end
+ 
+-          ####################################
+-
+-          def self.autossh_args(fp, pidfile, env_hash)
+-            machine = env_hash[:machine]
++          def self.autossh_args(port, pidfile, env_hash)
+             ssh_info = env_hash[:machine_ssh_info]
+             ssh_options = {
+               "ServerAliveInterval" => 10,
+@@ -96,16 +83,22 @@
+             environment_variables = {
+               env: {
+                 "AUTOSSH_PIDFILE" => pidfile,
+-                "AUTOSSH_PORT" => 0, # turn off monitoring
++                "AUTOSSH_PORT" => 0, # turns off monitoring
++                #"AUTOSSH_LOGFILE" => "./autossh.log",
+               }
+             }
++            forward_string = [
++              port[:hostport],
++              "localhost",
++              port[:guestport]
++            ].join(':')
+ 
+             autossh_args = []
+             autossh_args << "-q"
+             autossh_args << "-N"
+             autossh_args << "-f"
+-            autossh_args << "-i" << machine.data_dir.join("private_key").to_s
+-            autossh_args << "-L" << "#{fp[:host_port]}:localhost:#{fp[:guest_port]}"
++            autossh_args << "-i" << env_hash[:machine].data_dir.join("private_key").to_s
++            autossh_args << "-L" << forward_string
+             ssh_options.each do |k, v|
+               autossh_args << "-o" << "#{k}=#{v}"
+             end
+diff -r 015f2d2d5173 lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb	Tue Jan 12 18:20:49 2016 -0800
++++ b/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb	Tue Jan 12 18:29:09 2016 -0800
+@@ -1,109 +1,12 @@
+-require "pathname"
+-require "tmpdir"
+-require 'childprocess'
+-require "vagrant/util/subprocess"
+-#require 'byebug'
+-#require 'ap'
+-require 'log4r'
+-require "vagrant/util/safe_chdir"
++require "vagrant-skytap/hosts/common/cap/ssh_tunnel"
+ 
+ module VagrantPlugins
+   module Skytap
+     module HostLinux
+       module Cap
+-        class SSHTunnel
+-          def self.start_ssh_tunnel(env, fp, env_hash)
+-            logger = Log4r::Logger.new("vagrant::hosts::bsd")
+-            port = {
+-              adapter:   fp.adapter,
+-              guestip:   fp.guest_ip,
+-              guestport: fp.guest_port,
+-              hostip:    fp.host_ip,
+-              hostport:  fp.host_port,
+-              name:      fp.id,
+-              protocol:  fp.protocol
+-            }
+-
+-            pidfile = pidfile_name(port, env_hash)
+-            pid = read_pid(pidfile)
+-            if pid && autossh_pid?(pid)
+-              logger.info("An autossh process already exists with pid #{pid}.")
+-            else
+-              args = autossh_args(port, pidfile, env_hash)
+-              Vagrant::Util::Subprocess.execute("autossh", *args)
+-            end
+-          end
+-
+-          def self.kill_ssh_tunnel(env, pidfile, env_hash)
+-            logger = Log4r::Logger.new("vagrant::hosts::bsd")
+-            pidfile = File.join(env_hash[:machine].data_dir, pidfile)
+-            pid = read_pid(pidfile)
+-            if pid && autossh_pid?(pid)
+-              Vagrant::Util::Subprocess.execute("kill", pid.to_s)
+-            else
+-              logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
+-              Vagrant::Util::Subprocess.execute("rm", pidfile)
+-            end
+-          end
+-
+-          private
+-
+-          def self.pidfile_name(port, env_hash)
+-            tunnel_name = [port[:hostip], port[:name]].compact.join('_')
+-            File.join(env_hash[:machine].data_dir, "#{tunnel_name}.pid")
+-          end
+-
+-          def self.read_pid(pidfile)
+-            File.read(pidfile).presence.try(:to_i) if File.exist?(pidfile)
+-          end
+-
+-          # Checks that the pid is actually an autossh process (and not
+-          # something else using a recycled pid).
+-          def self.autossh_pid?(pid)
+-            # get_comm_for_pid(pid) == 'autossh'
+-            true
+-          end
+-
+-          # Get the command, minus any arguments, for the given
+-          # pid. I don't expect this to be compatible cross-platform yet...
+-          # This could be complicated cross-platform, and Sys::ProcTable
+-          # could likewise be complicated cross-platform ...
+-          def self.get_comm_for_pid(pid)
+-            result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
+-            result.stdout.split("\n").last
+-          end
+-
+-          def self.autossh_args(port, pidfile, env_hash)
+-            ssh_info = env_hash[:machine_ssh_info]
+-            ssh_options = {
+-              "ServerAliveInterval" => 10,
+-              "ServerAliveCountMax" => 3,
+-              "StrictHostKeyChecking" => "no",
+-            }
+-            environment_variables = {
+-              env: {
+-                "AUTOSSH_PIDFILE" => pidfile,
+-                "AUTOSSH_PORT" => 0, # turns off monitoring
+-                #"AUTOSSH_LOGFILE" => "./autossh.log",
+-              }
+-            }
+-            forward_string = [
+-              port[:hostport],
+-              "localhost",
+-              port[:guestport]
+-            ].join(':')
+-
+-            autossh_args = []
+-            autossh_args << "-q"
+-            autossh_args << "-N"
+-            autossh_args << "-f"
+-            autossh_args << "-i" << env_hash[:machine].data_dir.join("private_key").to_s
+-            autossh_args << "-L" << forward_string
+-            ssh_options.each do |k, v|
+-              autossh_args << "-o" << "#{k}=#{v}"
+-            end
+-            autossh_args << "#{ssh_info[:username]}@#{ssh_info[:host]}"
+-            autossh_args << environment_variables
++        class SSHTunnel < VagrantPlugins::Skytap::Common::Cap::SSHTunnel
++          def self.create_logger
++            Log4r::Logger.new("vagrant::hosts::linux")
+           end
+         end
+       end

data/_patches-20160112/1

@@ -0,0 +1,82 @@
+# HG changeset patch
+# Parent 52eca9fb4e0ee45e8dd01b28163ac10c5d298015
+diff -r 52eca9fb4e0e -r f28264f2e998 lib/vagrant-skytap/action/forward_ports.rb
+--- a/lib/vagrant-skytap/action/forward_ports.rb	Tue Jan 12 14:34:08 2016 -0800
++++ b/lib/vagrant-skytap/action/forward_ports.rb	Tue Jan 12 18:17:33 2016 -0800
+@@ -1,5 +1,5 @@
+ require 'vagrant-skytap/util/compile_forwarded_ports'
+-#require 'byebug'
++require 'byebug'
+ 
+ module VagrantPlugins
+   module Skytap
+@@ -9,11 +9,12 @@
+ 
+         def initialize(app, env)
+           @app = app
++          @env = env
+         end
+ 
+         def call(env)
+-          @env = env
+-          env[:forwarded_ports] ||= compile_forwarded_ports(env[:machine].config)
++          debugger
++          @env[:forwarded_ports] ||= compile_forwarded_ports(env[:machine].config)
+ 
+           env[:forwarded_ports].each do |fp|
+             if fp.host_port <= 1024
+diff -r 52eca9fb4e0e -r f28264f2e998 lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb	Tue Jan 12 14:34:08 2016 -0800
++++ b/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb	Tue Jan 12 18:17:33 2016 -0800
+@@ -4,7 +4,7 @@
+   module Skytap
+     module HostBSD
+       module Cap
+-        class SSHTunnel < VagrantPlugins::Skytap::Common::Cap::SSHTunnel
++        class SSHTunnel < VagrantPlugins::Skytap::HostCommon::Cap::SSHTunnel
+           def self.create_logger
+             Log4r::Logger.new("vagrant::hosts::bsd")
+           end
+diff -r 52eca9fb4e0e -r f28264f2e998 lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 14:34:08 2016 -0800
++++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 18:17:33 2016 -0800
+@@ -21,6 +21,7 @@
+             logger = create_logger
+             machine = env_hash[:machine]
+             pid = read_pid(File.join(machine.data_dir, pidfile_name(fp)))
++            debugger
+             if pid && autossh_pid?(pid)
+               logger.info("An autossh process already exists with pid #{pid}.")
+             else
+@@ -41,6 +42,7 @@
+             logger = create_logger
+             machine = env_hash[:machine]
+             pid = read_pid(File.join(machine.data_dir, pidfile))
++            debugger
+             if pid && autossh_pid?(pid)
+               Vagrant::Util::Subprocess.execute("kill", pid.to_s)
+             else
+diff -r 52eca9fb4e0e -r f28264f2e998 lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb	Tue Jan 12 14:34:08 2016 -0800
++++ b/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb	Tue Jan 12 18:17:33 2016 -0800
+@@ -4,7 +4,7 @@
+   module Skytap
+     module HostLinux
+       module Cap
+-        class SSHTunnel < VagrantPlugins::Skytap::Common::Cap::SSHTunnel
++        class SSHTunnel < VagrantPlugins::Skytap::HostCommon::Cap::SSHTunnel
+           def self.create_logger
+             Log4r::Logger.new("vagrant::hosts::linux")
+           end
+diff -r 52eca9fb4e0e -r f28264f2e998 lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb	Tue Jan 12 14:34:08 2016 -0800
++++ b/lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb	Tue Jan 12 18:17:33 2016 -0800
+@@ -4,7 +4,7 @@
+   module Skytap
+     module HostWindows
+       module Cap
+-        class SSHTunnel < VagrantPlugins::Skytap::Common::Cap::SSHTunnel
++        class SSHTunnel < VagrantPlugins::Skytap::HostCommon::Cap::SSHTunnel
+           def self.create_logger
+             Log4r::Logger.new("vagrant::hosts::windows")
+           end