vagrant-skytap 0.2.2 → 0.2.3

data/_patches-20160112/1

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

data/_patches-20160112/2

@@ -1,239 +0,0 @@
-# HG changeset patch
-# Parent 74d169c04caec5d9ccb8355c531b767d9225cf95
-diff -r 74d169c04cae -r 5e40023c756c Vagrantfile
---- a/Vagrantfile	Tue Jan 12 14:38:22 2016 -0800
-+++ b/Vagrantfile	Tue Jan 12 18:07:03 2016 -0800
-@@ -120,12 +120,12 @@
-     box.ssh.password    = vms[vm1_key][:password]
-     box.vm.communicator = vms[vm1_key][:communicator]
-     #box.vm.synced_folder "vm1", "/synced", type: :nfs, mount_options: ['actimeo=1']
--    box.vm.synced_folder ".", "/vagrant-skytap", type: :nfs, mount_options: ['actimeo=1']
-+    #box.vm.synced_folder ".", "/vagrant-skytap", type: :nfs, mount_options: ['actimeo=1']
-     #box.vm.provision "shell", path: "provisioning/trivial.sh"
-     box.vm.provision "shell", path: "provisioning/apache.sh"
-     box.vm.provision "shell", path: "provisioning/vagrant.sh"
- 
--    #box.vm.network :forwarded_port, guest: 80, host: 9000
-+    box.vm.network :forwarded_port, guest: 80, host: 9000
-     #box.vm.network :forwarded_port, guest: 21, host: 9001
-   end
- 
-diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/action/clear_forwarded_ports.rb
---- a/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Tue Jan 12 14:38:22 2016 -0800
-+++ b/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Tue Jan 12 18:07:03 2016 -0800
-@@ -8,12 +8,11 @@
-       class ClearForwardedPorts
-         def initialize(app, env)
-           @app = app
--          @env = env
-         end
- 
-         def call(env)
-           env[:ui].info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
--          pidfiles = @env[:host].capability(:kill_forwarded_ports, @env)
-+          env[:host].capability(:kill_forwarded_ports, env)
- 
-           @app.call(env)
-         end
-diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/action/prepare_forwarded_port_collision_params.rb
---- a/lib/vagrant-skytap/action/prepare_forwarded_port_collision_params.rb	Tue Jan 12 14:38:22 2016 -0800
-+++ b/lib/vagrant-skytap/action/prepare_forwarded_port_collision_params.rb	Tue Jan 12 18:07:03 2016 -0800
-@@ -1,3 +1,4 @@
-+require 'byebug'
- module VagrantPlugins
-   module Skytap
-     module Action
-@@ -9,22 +10,23 @@
-         def call(env)
-           # Get the forwarded ports used by other virtual machines and
-           # consider those in use as well.
--          env[:port_collision_extra_in_use] = @env[:host].capability(:read_used_ports, @env)
-+          env[:port_collision_extra_in_use] = env[:host].capability(:read_used_ports, env)
- 
-           # Build the remap for any existing collision detections
-           remap = {}
-           env[:port_collision_remap] = remap
--          env[:host].capability(:read_forwarded_ports, env).each do |_nic, name, hostport, _guestport|
-+          env[:host].capability(:read_forwarded_ports, env).each do |name, hostport|
-             env[:machine].config.vm.networks.each do |type, options|
-               next if type != :forwarded_port
- 
-               # If the ID matches the name of the forwarded port, then remap.
-               if options[:id] == name
--                remap[options[:host]] = hostport
-+                remap[options[:host]] = hostport # what happens with 'ssh' ?????
-                 break
-               end
-             end
-           end
-+#          debugger
- 
-           @app.call(env)
-         end
-@@ -32,3 +34,6 @@
-     end
-   end
- end
-+
-+#[_nic,ssh,    2222,22]
-+#[_nic,tcp3001,3001,3001]
-diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb
---- a/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb	Tue Jan 12 14:38:22 2016 -0800
-+++ b/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb	Tue Jan 12 18:07:03 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 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
---- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 14:38:22 2016 -0800
-+++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 18:07:03 2016 -0800
-@@ -19,18 +19,25 @@
-           # 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)))
--            if pid && autossh_pid?(pid)
--              logger.info("An autossh process already exists with pid #{pid}.")
--            else
--              args = autossh_args(fp, pidfile, env_hash)
--              Vagrant::Util::Subprocess.execute("autossh", *args)
-+            pidfile = File.join(env_hash[:machine].data_dir, pidfile_name(fp))
-+            if pid = read_pid(pidfile)
-+              debugger
-+              if autossh_pid?(pid)
-+                logger.info("An autossh process already exists with pid #{pid}.")
-+                return
-+              else
-+                logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
-+                Vagrant::Util::Subprocess.execute("rm", pidfile)
-+              end
-             end
-+            debugger
-+            args = autossh_args(fp, env_hash)
-+            Vagrant::Util::Subprocess.execute("autossh", *args)
-           end
- 
-           # called for machine by ClearForwardedPorts
-           def self.kill_forwarded_ports(env, env_hash)
-+#            debugger
-             get_pidfiles_for_machine(env_hash[:machine]).each do |pidfile|
-               kill_ssh_tunnel(env, pidfile, env_hash)
-             end
-@@ -40,33 +47,48 @@
-           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))
--            if pid && autossh_pid?(pid)
--              Vagrant::Util::Subprocess.execute("kill", pid.to_s)
-+            pidfile = File.join(machine.data_dir, pidfile)
-+            if pid = read_pid(pidfile)
-+              debugger
-+              if autossh_pid?(pid)
-+                myenv = {env: {"AUTOSSH_PIDFILE" => pidfile}}
-+                Vagrant::Util::Subprocess.execute("kill", pid.to_s, myenv)
-+              else
-+                logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
-+                Vagrant::Util::Subprocess.execute("rm", pidfile)
-+              end
-             else
--              logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
--              Vagrant::Util::Subprocess.execute("rm", pidfile)
-+              debugger
-+              logger.info("Pidfile #{pidfile} not found.")
-             end
-           end
- 
-           ####################################
- 
--          def self.read_forwarded_ports(env, env_hash, machine = nil)
--            logger = create_logger
--            machine ||= env_hash[:machine]
-+          # forwarded ports used by ALL OTHER machines
-+          def self.read_used_ports(env, env_hash)
-+            # pretend for the moment that we don't care
-+            []
-+          end
-+
-+          # forwarded ports used by THIS machine
-+          def self.read_forwarded_ports(env, env_hash)
-+            machine = env_hash[:machine]
-             get_pidfiles_for_machine(machine).collect do |pidfile|
--              read_pid(File.join(machine.data_dir, pidfile))
-+              pidfile =~ /(.*)(\d+)/
-+              [pidfile,$2]
-             end
-           end
- 
-           ####################################
- 
-           def self.pidfile_name(fp)
--            "#{fp[:host_ip]}.pid"
-+            # there's one that's just named ssh, what do we do about it?
-+            "#{fp.protocol}#{fp.host_port}.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)
-@@ -95,7 +117,7 @@
- 
-           ####################################
- 
--          def self.autossh_args(fp, pidfile, env_hash)
-+          def self.autossh_args(fp, env_hash)
-             machine = env_hash[:machine]
-             ssh_info = env_hash[:machine_ssh_info]
-             ssh_options = {
-@@ -105,7 +127,7 @@
-             }
-             environment_variables = {
-               env: {
--                "AUTOSSH_PIDFILE" => pidfile,
-+                "AUTOSSH_PIDFILE" => File.join(machine.data_dir, pidfile_name(fp)),
-                 "AUTOSSH_PORT" => 0, # turn off monitoring
-               }
-             }
-@@ -115,7 +137,7 @@
-             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 << "-L" << "#{fp.host_port}:localhost:#{fp.guest_port}"
-             ssh_options.each do |k, v|
-               autossh_args << "-o" << "#{k}=#{v}"
-             end
-diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb
---- a/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb	Tue Jan 12 14:38:22 2016 -0800
-+++ b/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb	Tue Jan 12 18:07:03 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 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb
---- a/lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb	Tue Jan 12 14:38:22 2016 -0800
-+++ b/lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb	Tue Jan 12 18:07:03 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

data/_patches-20160112/COMPLETED-ABOVE-THIS-LINE

@@ -1,4 +0,0 @@
-# HG changeset patch
-# Parent 21dbd7fc56837b7c7949396f0f1058790d265a5b
-(basically) finished work above this line not yet sent for CR --------------------------------------
-

data/_patches-20160112/COMPLETED-BELOW-THIS-LINE

@@ -1,4 +0,0 @@
-# HG changeset patch
-# Parent e1ec4738b4fbbd2ef83c29f221c19cf3798cf8f0
-(basically) finished work below this line not yet sent for CR --------------------------------------
-

data/_patches-20160112/CR-ABOVE-THIS-LINE

@@ -1,4 +0,0 @@
-# HG changeset patch
-# Parent 05bfba1f21950dc1331bb355bb60789499208a63
-Out for CR above this line ------------------------------------
-

data/_patches-20160112/CR-BELOW-THIS-LINE

@@ -1,4 +0,0 @@
-# HG changeset patch
-# Parent faddc6f9d7ed6653fe7d86ab0943f901860b2872
-out for CR below this line ------------------------------------------
-

data/_patches-20160112/WIP-ABOVE-THIS-LINE

@@ -1,4 +0,0 @@
-# HG changeset patch
-# Parent d9c2f15e01d69f7f9ed90c5a8504a635536409b7
-Work in progress above this line --------------------------------------------
-

data/_patches-20160112/WIP-BELOW-THIS-LINE

@@ -1,4 +0,0 @@
-# HG changeset patch
-# Parent 1350d8d01c04611ef082a637cf69eb289b88559a
-Work in progress below this line ---------------------------------------------------------------
-

data/_patches-20160112/acceptance-test-runner

@@ -1,29 +0,0 @@
-# HG changeset patch
-# Parent e03c705cadffcf6ca578330597f15624260a9d46
-script to run acceptance tests
-
-diff --git a/acceptance.sh b/acceptance.sh
-new file mode 100755
---- /dev/null
-+++ b/acceptance.sh
-@@ -0,0 +1,20 @@
-+#!/bin/bash
-+
-+VAGRANT_LOG=info \
-+VAGRANT_SKYTAP_USERNAME=etrue \
-+VAGRANT_SKYTAP_API_TOKEN=fcb2620b72efddbc8239e25db9d812f510c7e166 \
-+  rake acceptance:run \
-+  COMPONENTS=provider/skytap/up
-+
-+#VAGRANT_SKYTAP_USERNAME=vagrant_provider_admin \
-+#VAGRANT_SKYTAP_API_TOKEN=7c5718531a32eb90e92c804ce1f73da98be22cdf \
-+#VAGRANT_SKYTAP_BASE_URL=https://test.skytap.com/ \
-+
-+
-+
-+#vagrant-spec test --config=vagrant-spec.config.rb --components="$COMPONENTS"
-+
-+
-+# How do I get log output??
-+# This needs to run in vagrant-spec, not just rake. Boxes have
-+# to install.

data/_patches-20160112/ansible-1

@@ -1,92 +0,0 @@
-# HG changeset patch
-# Parent 0bb10bac847b6ff55e16bc18e9e9e98b49f58444
-try to get sbrady's ansible provisioning (codename: "chuck") to work
-
-diff --git a/Vagrantfile.chuck b/Vagrantfile.chuck
-new file mode 100644
---- /dev/null
-+++ b/Vagrantfile.chuck
-@@ -0,0 +1,55 @@
-+# -*- mode: ruby -*-
-+# vi: set ft=ruby :
-+
-+VM_CPU = 4    # Cores
-+VM_RAM = 4096 # GB
-+GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
-+
-+Vagrant.configure("2") do |config|
-+
-+  config.vm.provider :skytap do |skytap, override|
-+    skytap.username = "etrue"
-+    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
-+  end
-+
-+  config.vm.define :dev do |dev|
-+    # VMWare and VirtualBox
-+    # https://vagrantcloud.com/hashicorp/boxes/precise64
-+    # TODO how to specify different box files for skytap provider
-+    #dev.vm.box     = "hashicorp/precise64"
-+    #dev.vm.box_url = "hashicorp/precise64"
-+
-+
-+    # dev.vm.network :private_network, ip: "10.10.10.5"
-+    dev.vm.network :private_network, ip: "10.1.130.252"
-+    dev.vm.network :forwarded_port, guest: 3001, host: 3001
-+    dev.vm.network :forwarded_port, guest: 1080, host: 1080
-+
-+    dev.vm.synced_folder "~/src", "/var/www/skytap", :nfs => true, :mount_options => ['actimeo=1']
-+
-+    dev.vm.provider :vmware_fusion do |box|
-+      box.vmx["memsize"]  = VM_RAM
-+      box.vmx["numvcpus"] = VM_CPU
-+    end
-+
-+    dev.vm.provider :virtualbox do |box|
-+      box.customize ["modifyvm", :id, "--memory", VM_RAM]
-+      box.customize ["modifyvm", :id, "--cpus",   VM_CPU]
-+      box.customize ["modifyvm", :id, "--ioapic",   "on"]
-+    end
-+
-+    dev.vm.provider :skytap do |box|
-+      dev.vm.box = "skytap-dummy"
-+      box.vm_url = GENERIC_UBUNTU
-+      box.cpus = VM_CPU
-+      box.ram = VM_RAM
-+      box.guestos = "ubuntu"
-+    end
-+
-+    dev.vm.provision :ansible do |ansible|
-+      ansible.playbook       = "ansible/playbooks/webservers.yml"
-+      # with the skytap provider, let it generate the inventory (.vagrant/provisioners/..)
-+      #ansible.inventory_path = "ansible/environments/dev"
-+    end
-+  end
-+end
-diff --git a/ansible b/ansible
-new file mode 120000
---- /dev/null
-+++ b/ansible
-@@ -0,0 +1,1 @@
-+../chuck/ansible
-
-diff --git a/ansible.cfg b/ansible.cfg
-new file mode 120000
---- /dev/null
-+++ b/ansible.cfg
-@@ -0,0 +1,1 @@
-+../chuck/ansible.cfg
-
-diff --git a/rake b/rake
-new file mode 120000
---- /dev/null
-+++ b/rake
-@@ -0,0 +1,1 @@
-+../chuck/rake
-
-diff --git a/rakefile.rb b/rakefile.rb
-new file mode 120000
---- /dev/null
-+++ b/rakefile.rb
-@@ -0,0 +1,1 @@
-+../chuck/rakefile.rb
-

data/_patches-20160112/cache-api-client-in-up

@@ -1,40 +0,0 @@
-# HG changeset patch
-# Parent 1397b5a1cf5158f68afa12477b1de4101b8da248
-[mq]: cache-api-client-in-up
-
-diff -r 1397b5a1cf51 lib/vagrant-skytap/action/initialize_api_client.rb
---- a/lib/vagrant-skytap/action/initialize_api_client.rb	Mon Dec 07 19:47:09 2015 -0800
-+++ b/lib/vagrant-skytap/action/initialize_api_client.rb	Wed Dec 09 16:03:46 2015 -0800
-@@ -13,11 +13,15 @@
-         end
- 
-         def call(env)
--          @logger.info("Connecting to Skytap...")
-+          unless env[:api_client]
-+            @logger.info("Connecting to Skytap...")
- 
--          client = API::Client.new(env[:machine].provider_config)
--          if client.get('/configurations').code == '200'
--            env[:api_client] = client
-+            client = API::Client.new(env[:machine].provider_config)
-+            if client.get('/configurations').code == '200'
-+              env[:api_client] = client
-+            end
-+          else
-+            @logger.info("Using cached API client")
-           end
- 
-           @app.call(env)
-diff -r 1397b5a1cf51 lib/vagrant-skytap/command/up.rb
---- a/lib/vagrant-skytap/command/up.rb	Mon Dec 07 19:47:09 2015 -0800
-+++ b/lib/vagrant-skytap/command/up.rb	Wed Dec 09 16:03:46 2015 -0800
-@@ -76,7 +76,8 @@
-                 provider: machine.provider_name))
- 
-               machines << machine
--              machine.action(:create, options)
-+              result = machine.action(:create, options)
-+              options[:api_client] ||= result[:api_client]
-               machine.action(:update_hardware, options)
-             end
- 

data/_patches-20160112/dead-code-in-actions

@@ -1,44 +0,0 @@
-# HG changeset patch
-# Parent 376d225699f6e5edced626762b20690f8a86e566
-remove dead code in actions.rb
-
-diff -r 376d225699f6 -r 57b84d076d7f lib/vagrant-skytap/action.rb
---- a/lib/vagrant-skytap/action.rb	Tue Oct 20 13:31:40 2015 -0700
-+++ b/lib/vagrant-skytap/action.rb	Tue Oct 20 13:31:55 2015 -0700
-@@ -86,17 +86,11 @@
-           b.use FetchEnvironment
-           b.use Call, EnvironmentExists do |env, b2|
-             if env[:result]
--              b2.use Call, RunEnvironment do |env2, b3|
--                if env2[:result]
--                  b3.use PrepareNFSSettings
--                  b3.use PrepareNFSValidIds
--                  b3.use Provision
--                  b3.use SyncedFolders
--                else
--                  #TODO:NLA IMPLEMENT ME
--                  # b2.use RunFailed
--                end
--              end
-+              b2.use RunEnvironment
-+              b2.use PrepareNFSSettings
-+              b2.use PrepareNFSValidIds
-+              b2.use Provision
-+              b2.use SyncedFolders
-             else
-               b2.use DeleteEnvironment
-               b2.use MessageNotCreated
-@@ -217,12 +211,7 @@
-             end
-           end
-           b.use action_prepare_boot
--          b.use Call, RunVm do |env, b1|
--            unless env[:result]
--              #TODO:NLA IMPLEMENT ME
--              # b2.use RunFailed
--            end
--          end
-+          b.use RunVm
-         end
-       end
- 

data/_patches-20160112/debug-changes

@@ -1,42 +0,0 @@
-# HG changeset patch
-# Parent 7e9e3ef348d477de33cc44c1eb0ab7ea3cac1f63
-# Parent  ee39a0f00daf0a442a0050fd9875879c9770c886
-debug changes
-
-diff -r 7e9e3ef348d4 spec/unit/base.rb
---- a/spec/unit/base.rb	Tue Dec 15 15:08:20 2015 -0800
-+++ b/spec/unit/base.rb	Tue Dec 15 15:08:41 2015 -0800
-@@ -5,6 +5,7 @@
- require "checkpoint"
- require "rspec/autorun"
- require "webmock/rspec"
-+require "byebug"
- 
- # Require Vagrant itself so we can reference the proper
- # classes to test.
-diff -r 7e9e3ef348d4 vagrant-skytap.gemspec
---- a/vagrant-skytap.gemspec	Tue Dec 15 15:08:20 2015 -0800
-+++ b/vagrant-skytap.gemspec	Tue Dec 15 15:08:41 2015 -0800
-@@ -17,6 +17,11 @@
- 
-   s.add_runtime_dependency "json_pure"
- 
-+  # MAKE SURE YOU POP THIS PATCH BEFORE DISTRIBUTING OR PUSHING THE GEM!
-+  s.add_runtime_dependency "byebug"
-+  s.add_runtime_dependency "pry", "~> 0.10"
-+  s.add_runtime_dependency "awesome_print"
-+
-   s.add_development_dependency "rake"
-   s.add_development_dependency "rspec-core", "~> 2.14.0"
-   s.add_development_dependency "rspec-expectations", "~> 2.14.0"
-@@ -24,6 +29,10 @@
-   s.add_development_dependency "vagrant-spec", "~> 1.4.0"
-   s.add_development_dependency "webmock", "~> 1.20"
- 
-+  s.add_development_dependency "byebug"#, "~> 5.0.0"
-+  s.add_development_dependency "pry", "~> 0.10"
-+  s.add_development_dependency "awesome_print"
-+
-   # The following block of code determines the files that should be included
-   # in the gem. It does this by reading all the files in the directory where
-   # this gemspec is, and parsing out the ignored files from the gitignore.