vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160118/vm-vanished

@@ -0,0 +1,42 @@
+# HG changeset patch
+# Parent 1b8860f8b5129c2ab846c4464378c7a582ac0a90
+raise error on vm reload if it's gone?
+
+diff -r 1b8860f8b512 lib/vagrant-skytap/api/vm.rb
+--- a/lib/vagrant-skytap/api/vm.rb	Mon Nov 09 20:51:32 2015 -0800
++++ b/lib/vagrant-skytap/api/vm.rb	Mon Nov 09 20:52:02 2015 -0800
+@@ -35,6 +35,7 @@
+         end
+ 
+         def refresh_from_environment
++          raise VmVanished, name: machine.name unless vm = environment.get_vm_by_id(id)
+           refresh(vm.attrs)
+         end
+ 
+diff -r 1b8860f8b512 lib/vagrant-skytap/errors.rb
+--- a/lib/vagrant-skytap/errors.rb	Mon Nov 09 20:51:32 2015 -0800
++++ b/lib/vagrant-skytap/errors.rb	Mon Nov 09 20:52:02 2015 -0800
+@@ -27,6 +27,10 @@
+         error_key(:does_not_exist)
+       end
+ 
++      class VmVanished < VagrantSkytapError
++        error_key(:vm_vanished)
++      end
++
+       class BadVmUrl < VagrantSkytapError
+         error_key(:bad_vm_url)
+       end
+diff -r 1b8860f8b512 locales/en.yml
+--- a/locales/en.yml	Mon Nov 09 20:51:32 2015 -0800
++++ b/locales/en.yml	Mon Nov 09 20:52:02 2015 -0800
+@@ -76,6 +76,9 @@
+       does_not_exist: |-
+         %{object_name} was not found.
+ 
++      vm_vanished: |-
++        The VM '%{name}' no longer exists on Skytap.
++
+       operation_failed: |-
+         The operation failed: %{err}
+ 

data/_patches-20160118a/COMPLETED-ABOVE-THIS-LINE

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

data/_patches-20160118a/COMPLETED-BELOW-THIS-LINE

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

data/_patches-20160118a/CR-ABOVE-THIS-LINE

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

data/_patches-20160118a/CR-BELOW-THIS-LINE

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

data/_patches-20160118a/WIP-ABOVE-THIS-LINE

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

data/_patches-20160118a/WIP-BELOW-THIS-LINE

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

data/_patches-20160118a/acceptance-test-runner

@@ -0,0 +1,29 @@
+# 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-20160118a/ansible-1

@@ -0,0 +1,92 @@
+# 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-20160118a/bar

@@ -0,0 +1,189 @@
+# HG changeset patch
+# Parent ae81e0c2cfef9261fa36ec3f655f1cb5a13b4ed0
+diff -r ae81e0c2cfef -r db3a20145d36 Vagrantfile
+--- a/Vagrantfile	Mon Jan 18 16:16:04 2016 -0800
++++ b/Vagrantfile	Mon Jan 18 17:32:52 2016 -0800
+@@ -125,7 +125,7 @@
+     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 ae81e0c2cfef -r db3a20145d36 lib/vagrant-skytap/action/forward_ports.rb
+--- a/lib/vagrant-skytap/action/forward_ports.rb	Mon Jan 18 16:16:04 2016 -0800
++++ b/lib/vagrant-skytap/action/forward_ports.rb	Mon Jan 18 17:32:52 2016 -0800
+@@ -12,14 +12,10 @@
+ 
+         def call(env)
+           @env = env
+-
+           env[:forwarded_ports] ||= compile_forwarded_ports(env[:machine].config)
+ 
+-          env[:forwarded_ports].each do |fp|
+-            if fp.privileged_host_port?
+-              env[:ui].warn I18n.t("vagrant.actions.vm.forward_ports.privileged_ports")
+-              break
+-            end
++          if env[:forwarded_ports].any?(&:privileged_host_port?)
++            env[:ui].warn I18n.t("vagrant.actions.vm.forward_ports.privileged_ports")
+           end
+ 
+           env[:ui].output(I18n.t("vagrant.actions.vm.forward_ports.forwarding"))
+diff -r ae81e0c2cfef -r db3a20145d36 lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Mon Jan 18 16:16:04 2016 -0800
++++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Mon Jan 18 17:32:52 2016 -0800
+@@ -1,6 +1,6 @@
+ require "vagrant/util/subprocess"
+ require "vagrant/util/safe_chdir"
+-require "vagrant-skytap/models/forwarded_port"
++require "vagrant-skytap/model/forwarded_port"
+ require 'log4r'
+ 
+ module VagrantPlugins
+@@ -13,22 +13,21 @@
+               raise NotImplementedError
+             end
+ 
+-            # Create an ssh tunnel for the given [ForwardedPort]
+-            # on the current machine using autossh. (If autossh
+-            # is not available on the host, an appropriate error
+-            # message will be shown, asking the user to install
+-            # it.)
++            # Create an ssh tunnel for the given [Model::ForwardedPort]
++            # on the given machine using autossh. If autossh is not
++            # available on the host, an appropriate error message will
++            # be shown, asking the user to install it. env_hash should
++            # include a :machine_ssh_info key.
+             #
+             # @return [Vagrant::Util::Subprocess::Result]
+             def start_ssh_tunnel(env, fp, machine, env_hash)
+               args = ssh_args(fp, machine, env_hash[:machine_ssh_info])
+               args << {env: autossh_environment_variables(fp, machine)}
+-              # TODO: ensure that we overwrite any stale pidfile
+               Vagrant::Util::Subprocess.execute("autossh", "-f", *args)
+             end
+ 
+-            # Kill the ssh tunnel for the given [ForwardedPort]
+-            # by terminating the associated autossh process
++            # Kill the ssh tunnel for the given [Model::ForwardedPort]
++            # by terminating the associated autossh process.
+             #
+             # @return [Vagrant::Util::Subprocess::Result]
+             def kill_ssh_tunnel(env, fp, machine)
+@@ -37,47 +36,49 @@
+               end
+             end
+ 
+-            # Convenience method which kills all autossh
+-            # processes for the given machine
++            # Convenience method which kills all autossh processes for
++            # the given machine.
+             #
+-            # @return [Array] of [ForwardedPort] objects
++            # @return [Array] of [Model::ForwardedPort] objects
+             def clear_forwarded_ports(env, machine)
+               get_fp_for_machine(machine).each do |fp|
+                 kill_ssh_tunnel(env, fp, machine)
+               end
+             end
+ 
+-            # Reads the pid from the given pidfile_path (full
+-            # path, not relative to the machine data_dir)
++            # Reads the pid from the given pidfile_path (full path, not
++            # relative to any machine data_dir)
+             #
+             # @return [Integer], or nil if not found.
+             def read_pid(pidfile_path)
+               File.read(pidfile_path).presence.try(:to_i) if File.exist?(pidfile_path)
+             end
+ 
+-            # Reads all the pidfiles from the machine's data_dir
+-            # TODO make this return [ForwardedPort] objects
++            # Gets forwarded ports for the given machine. Currently
++            # implemented by reading pidfiles from the machine's data_dir.
+             #
+-            # @return [Array] of [ForwardedPort] objects
++            # @return [Array] of [Model::ForwardedPort] objects
+             def get_fp_for_machine(machine)
+               pidfiles = []
+               Vagrant::Util::SafeChdir.safe_chdir(machine.data_dir) do
+                 pidfiles = Dir.glob("*.pid")
+               end
+               pidfiles.collect do |pidfile|
+-                pidfile =~ /(\w+)(\d+)\.pid/
++                debugger
++                pidfile =~ /(\w\w\w)(\d+)\.pid/
+                 protocol, hostport, guestport = $1, $2, nil
+-                ForwardedPort.new("#{protocol}#{hostport}", hostport, guestport, protocol: protocol)
++                Model::ForwardedPort.new("#{protocol}#{hostport}", hostport, guestport, protocol: protocol)
+               end
+             end
+ 
+-            # Gets the args to be passed to ssh for the given
+-            # [ForwardedPort] on the given machine.
++            # Gets the arguments to be passed to ssh for the given
++            # [Model::ForwardedPort] on the given machine. (This
++            # method may be overridden for specific OSes by
++            # creating a new host capability file.)
+             #
+             # @return [Array] of [String]
+             def ssh_args(fp, machine, ssh_info)
+-              # TODO read ssh_info without having to pass it in
+-              ssh_info = env_hash[:machine_ssh_info]
++              # TODO: tune these settings
+               ssh_options = {
+                 "ServerAliveInterval" => 10,
+                 "ServerAliveCountMax" => 3,
+diff -r ae81e0c2cfef -r db3a20145d36 spec/unit/hosts/common/cap/ssh_tunnel_spec.rb
+--- a/spec/unit/hosts/common/cap/ssh_tunnel_spec.rb	Mon Jan 18 16:16:04 2016 -0800
++++ b/spec/unit/hosts/common/cap/ssh_tunnel_spec.rb	Mon Jan 18 17:32:52 2016 -0800
+@@ -6,23 +6,16 @@
+     VagrantPlugins::Skytap::Plugin.components.host_capabilities[:bsd].get(:start_ssh_tunnel)
+   end
+ 
+-  let(:machine)        { double("machine") }
+-  let(:forwarded_port) { VagrantPlugins::Skytap::Model::ForwardedPort.new('tcp9000', 9000, 80, {}) }
+-  let(:ssh_info)       { {username: 'user', host: '10.0.0.1'} }
+-  let(:env_path)       { Pathname.new(File.expand_path("../../../../support/forwarded_ports", __FILE__)) }
++  let(:machine)         { double("machine") }
++  let(:forwarded_port1) { VagrantPlugins::Skytap::Model::ForwardedPort.new('tcp9000', 9000, 80, {}) }
++  let(:forwarded_port2) { VagrantPlugins::Skytap::Model::ForwardedPort.new('tcp9001', 9001, 81, {}) }
++  let(:ssh_info)        { {username: 'user', host: '10.0.0.1'} }
++  let(:env_path)        { Pathname.new(File.expand_path("../../../../support/forwarded_ports", __FILE__)) }
+ 
+   before do
+     allow(machine).to receive(:data_dir).and_return(env_path.join("machines/vm1/skytap"))
+   end
+ 
+-  describe "clear_forwarded_ports" do
+-    it "calls kill_ssh_tunnel for each pidfile found" do
+-      expect(described_class).to receive(:kill_ssh_tunnel).with(nil, "tcp9000.pid", {machine: machine})
+-      expect(described_class).to receive(:kill_ssh_tunnel).with(nil, "tcp9001.pid", {machine: machine})
+-      described_class.clear_forwarded_ports(nil, {machine: machine})
+-    end
+-  end
+-
+   describe "read_pid" do
+     it "reads the pid" do
+       pid = described_class.read_pid(env_path.join("machines/vm1/skytap/tcp9000.pid"))
+@@ -37,7 +30,7 @@
+ 
+   describe "ssh_args" do
+     it "returns expected args" do
+-      args = described_class.ssh_args(forwarded_port, {machine: machine, machine_ssh_info: ssh_info})
++      args = described_class.ssh_args(forwarded_port1, machine, ssh_info)
+       expect(args).to eq(["-q", "-N",
+         "-i", env_path.join("machines/vm1/skytap/private_key").to_s,
+         "-L", "9000:localhost:80",
+@@ -51,7 +44,7 @@
+ 
+   describe "autossh_environment_variables" do
+     it "defaults monitoring port to 0" do
+-      vars = described_class.autossh_environment_variables('tcp9000.pid', {machine: machine})
++      vars = described_class.autossh_environment_variables(forwarded_port1, machine)
+       expect(vars).to eq({
+         "AUTOSSH_PIDFILE" => env_path.join("machines/vm1/skytap/tcp9000.pid").to_s,
+         "AUTOSSH_PORT"    => 0,

data/_patches-20160118a/cache-api-client-in-up

@@ -0,0 +1,40 @@
+# 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-20160118a/dead-code-in-actions

@@ -0,0 +1,44 @@
+# 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-20160118a/debug-changes

@@ -0,0 +1,55 @@
+# HG changeset patch
+# Parent 7e9e3ef348d477de33cc44c1eb0ab7ea3cac1f63
+# Parent  b2aa1fa1e5603d434a08013f830ca256a0944559
+debug changes
+
+diff -r b2aa1fa1e560 lib/vagrant-skytap.rb
+--- a/lib/vagrant-skytap.rb	Fri Jan 08 11:51:56 2016 -0800
++++ b/lib/vagrant-skytap.rb	Wed Jan 13 12:22:02 2016 -0800
+@@ -7,6 +7,9 @@
+ require "vagrant-skytap/core_ext/try"
+ require "vagrant-skytap/plugin"
+ 
++require 'byebug'
++require 'awesome_print'
++
+ module VagrantPlugins
+   module Skytap
+     lib_path = Pathname.new(File.expand_path("../vagrant-skytap", __FILE__))
+diff -r b2aa1fa1e560 spec/unit/base.rb
+--- a/spec/unit/base.rb	Fri Jan 08 11:51:56 2016 -0800
++++ b/spec/unit/base.rb	Wed Jan 13 12:22:02 2016 -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 b2aa1fa1e560 vagrant-skytap.gemspec
+--- a/vagrant-skytap.gemspec	Fri Jan 08 11:51:56 2016 -0800
++++ b/vagrant-skytap.gemspec	Wed Jan 13 12:22:02 2016 -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.