vagrant-skytap 0.2.2 → 0.2.3

data/.byebug_history

@@ -1,256 +0,0 @@
-c
-q
-action_result[:api_client].url
-action_result[:api_client].base_url
-action_result[:api_client]
-action_result.keys
-action_result.class
-action_result
-c
-$!
-c
-@env[:initial_states]
-vm_ids
-n
-q
-env[:initial_states]
-vm_ids
-n
-c
-environment.current_vm.id
-env[:machine].id
-environment.current_vm
-vm_ids = env[:machines].try(:collect, &:id)
-env[:vm_ids]
-env[:first_machine]
-env[:initial_states]
-env.keys
-env
-env.keys
-c
-initial_states
-c
-machine
-c
-machine
-c
-n
-c
-finish
-n
-c
-n
-machine.name
-c 89
-c
-names
-c
-n
-c
-display name
-c
-name
-c
-@env.default_provider
-finish
-s
-@env
-@sub_args
-n
-finish
-Skytap::Command::Up
-n
-c
-n
-display opts
-display name
-c
-name
-n
-name
-n
-@ui.machine("metadata", "provider", provider_name)
-n
-finish
-result
-n
-name
-n
-c
-env[:machines].collect(&:name)
-env[:machines]
-machines
-machines.keys
-vm.from_template?
-vm.configuration_url
-vm.configuration_id
-vm.id
-vm
-puts h
-h[:foo]
-puts h[:boo]
-puts h
-h[:boo] << 2
-puts h
-h
-h=Hash.new{|h, k| h[k] = []}
-new_machines.first.name
-machine.name
-vm.template_url
-vm.configuration_url
-vm.name
-vm = API::Vm.fetch(env, vm_url)
-vm_url
-vm.attrs
-vm = API::Vm.fetch(vm_url, env)
-vm = API::Vm.fetch(vm_url)
-vm = Vm.fetch(vm_url)
-vm_url = new_machines.first.provider_config.vm_url
-vm_url = machine.provider_config.vm_url
-env[:environment]
-active_machines
-new_machines
-c
-machines.first.provider_name
-machines.first.provider.name
-machines.first.provider.id
-machines.first.provider.to_s
-machines.first.provider
-machines
-@env.machines
-$!
-n
-q
-env[:environment].url
-env[:environment]
-active_machines
-new_machines
-c
-n
-c
-Hash[@env.active_machines].values.first
-Hash[@env.active_machines].values
-Hash[@env.active_machines].first
-Hash[@env.active_machines]
-@env.active_machines.to_h
-@env.active_machines.first.last
-@env.active_machines
-@env
-env
-machines.first.provider.name
-machines.first.provider
-c
-n
-finish
-n
-machines
-$!
-finish
-result
-n
-entry
-n
-result
-$!
-finish
-options
-s
-names
-n
-c
-n
-c
-n
-c
-q
-c
-skytap_environment.class
-c
-q
-c
-API::Environment.properties(nil)
-API::Environment.properties
-n
-c
-s
-API::Environment.properties
-n
-c
-props
-n
-env[:environment]
-c
-API::Environment.properties(env)
-c
-API::Environment.properties(env)
-n
-c
-n
-c
-env[:environment]
-n
-c
-{'url' => 'foo'}
-{'url':'foo'}
-API::Environment.properties(env)
-n
-ap env.keys
-ap env
-c
-cc
-c
-machine2
-n
-machine1
-c
-display names
-c
-display names
-c
-n
-s
-n
-machine
-c
-display names
-c
-machines.count
-c
-b 101
-display names
-c
-names
-c
-environment
-n
-c
-display names
-c
-puts i
-c
-b 101
-puts i
-i
-c 101
-n
-c
-display names
-c
-display names
-c
-c 96
-n
-c 86
-n
-names
-c
-names
-c
-names
-c
-names
-c
-b 96
-b
-names
-finish

data/.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>vagrant_skytap</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

data/_patches-20160112/0

@@ -1,388 +0,0 @@
-# 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