vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160118a/foo

@@ -0,0 +1,169 @@
+# HG changeset patch
+# Parent 82e4386bb899141c5b7712207b63e01b1a765c6e
+[mq]: foo
+
+diff -r 82e4386bb899 lib/vagrant-skytap/action/clear_forwarded_ports.rb
+--- a/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Mon Jan 18 14:01:22 2016 -0800
++++ b/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Mon Jan 18 16:16:04 2016 -0800
+@@ -8,7 +8,7 @@
+ 
+         def call(env)
+           env[:ui].info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
+-          env[:host].capability(:clear_forwarded_ports, env)
++          env[:host].capability(:clear_forwarded_ports, env[:machine])
+ 
+           @app.call(env)
+         end
+diff -r 82e4386bb899 lib/vagrant-skytap/action/forward_ports.rb
+--- a/lib/vagrant-skytap/action/forward_ports.rb	Mon Jan 18 14:01:22 2016 -0800
++++ b/lib/vagrant-skytap/action/forward_ports.rb	Mon Jan 18 16:16:04 2016 -0800
+@@ -10,16 +10,11 @@
+           @app = app
+         end
+ 
+-        #--------------------------------------------------------------
+-        # Execution
+-        #--------------------------------------------------------------
+         def call(env)
+           @env = env
+ 
+-          # Get the ports we're forwarding
+           env[:forwarded_ports] ||= compile_forwarded_ports(env[:machine].config)
+ 
+-          # Warn if we're port forwarding to any privileged ports...
+           env[:forwarded_ports].each do |fp|
+             if fp.privileged_host_port?
+               env[:ui].warn I18n.t("vagrant.actions.vm.forward_ports.privileged_ports")
+diff -r 82e4386bb899 lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Mon Jan 18 14:01:22 2016 -0800
++++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Mon Jan 18 16:16:04 2016 -0800
+@@ -1,6 +1,3 @@
+-# unused libs?
+-require "pathname"
+-require "tmpdir"
+ require "vagrant/util/subprocess"
+ require "vagrant/util/safe_chdir"
+ require "vagrant-skytap/models/forwarded_port"
+@@ -16,75 +13,70 @@
+               raise NotImplementedError
+             end
+ 
+-            def start_ssh_tunnel(env, fp, env_hash)
+-              logger = create_logger
+-              machine = env_hash[:machine]
+-              pidfile = pidfile_name(fp)
+-              pid = read_pid(machine.data_dir.join(pidfile))
++            # 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.)
++            #
++            # @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
+ 
+-              if pid && autossh_pid?(pid)
+-                logger.info("An autossh process already exists with pid #{pid}.")
+-              else
+-                args = ssh_args(fp, env_hash)
+-                vars = autossh_environment_variables(pidfile, env_hash)
+-                args << {env: vars}
+-                Vagrant::Util::Subprocess.execute("autossh", "-f", *args)
++            # Kill the ssh tunnel for the given [ForwardedPort]
++            # by terminating the associated autossh process
++            #
++            # @return [Vagrant::Util::Subprocess::Result]
++            def kill_ssh_tunnel(env, fp, machine)
++              if pid = read_pid(machine.data_dir.join(fp.pidfile_name))
++                Vagrant::Util::Subprocess.execute("kill", pid.to_s)
+               end
+             end
+ 
+-            def clear_forwarded_ports(env, env_hash)
+-              get_pidfiles_for_machine(env_hash[:machine]).each do |pidfile|
+-                kill_ssh_tunnel(env, pidfile, env_hash)
++            # Convenience method which kills all autossh
++            # processes for the given machine
++            #
++            # @return [Array] of [ForwardedPort] objects
++            def clear_forwarded_ports(env, machine)
++              get_fp_for_machine(machine).each do |fp|
++                kill_ssh_tunnel(env, fp, machine)
+               end
+             end
+ 
+-            def kill_ssh_tunnel(env, pidfile, env_hash)
+-              logger = create_logger
+-              machine = env_hash[:machine]
+-              pid = read_pid(machine.data_dir.join(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
+-
+-
+-            def pidfile_name(fp)
+-              "#{fp.protocol}#{fp.host_port}.pid"
+-            end
+-
++            # Reads the pid from the given pidfile_path (full
++            # path, not relative to the 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
+ 
+-            def get_pidfiles_for_machine(machine)
++            # Reads all the pidfiles from the machine's data_dir
++            # TODO make this return [ForwardedPort] objects
++            #
++            # @return [Array] of [ForwardedPort] objects
++            def get_fp_for_machine(machine)
+               pidfiles = []
+               Vagrant::Util::SafeChdir.safe_chdir(machine.data_dir) do
+                 pidfiles = Dir.glob("*.pid")
+               end
+-              pidfiles
++              pidfiles.collect do |pidfile|
++                pidfile =~ /(\w+)(\d+)\.pid/
++                protocol, hostport, guestport = $1, $2, nil
++                ForwardedPort.new("#{protocol}#{hostport}", hostport, guestport, protocol: protocol)
++              end
+             end
+ 
+-            # Checks that the pid is actually an autossh process (and not
+-            # something else using a recycled pid).
+-            def autossh_pid?(pid)
+-              # get_comm_for_pid(pid) == 'autossh'
+-              true
+-            end
+-
+-            # Get the command, minus any arguments, for the given
+-            # pid. This probably needs to be overridden per host cap
+-            def get_comm_for_pid(pid)
+-              result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
+-              result.stdout.split("\n").last
+-            end
+-
+-            # these args seem to work on MacOS and Ubuntu ...
+-            # untested on other implementations
+-            def ssh_args(fp, env_hash)
+-              machine = env_hash[:machine]
++            # Gets the args to be passed to ssh for the given
++            # [ForwardedPort] on the given machine.
++            #
++            # @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]
+               ssh_options = {
+                 "ServerAliveInterval" => 10,

data/_patches-20160118a/frickin-vagrant-spec

@@ -0,0 +1,163 @@
+# HG changeset patch
+# Parent 02c7d9d9d39e1ec55dfd0636c2b043b1837782d2
+imported patch frickin-vagrant-spec
+
+diff --git a/boxes/acceptance/README.md b/boxes/acceptance/README.md
+new file mode 100644
+--- /dev/null
++++ b/boxes/acceptance/README.md
+@@ -0,0 +1,13 @@
++# Vagrant Skytap Example Box
++
++Vagrant providers each require a custom provider-specific box format.
++This folder shows the example contents of a box for the `skytap` provider.
++To turn this into a box:
++
++```
++$ tar cvzf skytap.box ./metadata.json ./Vagrantfile
++```
++
++This box works by using Vagrant's built-in Vagrantfile merging to setup
++defaults for Skytap. These defaults can easily be overwritten by higher-level
++Vagrantfiles (such as project root Vagrantfiles).
+diff --git a/boxes/acceptance/Vagrantfile b/boxes/acceptance/Vagrantfile
+new file mode 100644
+--- /dev/null
++++ b/boxes/acceptance/Vagrantfile
+@@ -0,0 +1,8 @@
++# -*- mode: ruby -*-
++# vi: set ft=ruby :
++
++Vagrant.configure(2) do |config|
++  config.vm.provider :skytap do |skytap|
++    skytap.vm_url = "https://cloud.skytap.com/vms/3157858"
++  end
++end
+diff --git a/boxes/acceptance/empty.box b/boxes/acceptance/empty.box
+new file mode 100644
+index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..64bf34aa4fd03ff9c06c88f1dd7c6a992a0005c8
+GIT binary patch
+literal 166
+zc$|~(=3pq7bPQu)etX`L>yUv!>%(=`T@#qEc=ihJ@m-*~BEx$Ym(snv83$Vv%3WLj
+z-`>MH^XTlXQm&Kcc0XSklsr%3RC=@~^!y#G?_MjHe^1#PxU6jJm1A8Js>hx!4A|r`
+zoB#2InlqtJUCA?Up3cs-{%jw+=-yBDyrri~<aeLm#~Jv3id^6IC)Kg{PRCDYW<Ult
+PUm51x&704l!N33jadS%=
+
+diff --git a/boxes/acceptance/metadata.json b/boxes/acceptance/metadata.json
+new file mode 100644
+--- /dev/null
++++ b/boxes/acceptance/metadata.json
+@@ -0,0 +1,3 @@
++{
++    "provider": "skytap"
++}
+diff --git a/spec/acceptance/provider/up_spec.rb b/spec/acceptance/provider/up_spec.rb
+--- a/spec/acceptance/provider/up_spec.rb
++++ b/spec/acceptance/provider/up_spec.rb
+@@ -16,25 +16,46 @@
+     assert_execute('vagrant', 'destroy', '--force')
+   end
+ 
+-  it 'should bring up the machine and halt it' do
+-    status("Test: machine can be brought up, parallel by default")
+-    up_result = execute("vagrant", "up")
++  it 'should bring up the machine' do
++    status("Test: machine can be brought up")
++    up_result = execute("vagrant", "up", "vm1")
+     expect(up_result).to exit_with(0)
+ 
+     status("Test: machine is running after up")
+-    echo_result = execute("vagrant", "ssh", "-c", "echo foo")
++    echo_result = execute("vagrant", "ssh", "vm1", "-c", "echo foo")
+     expect(echo_result).to exit_with(0)
+     expect(echo_result.stdout).to match(/foo\n$/)
+   end
+-
+-  it 'should bring up the machine and halt it' do
+-    status("Test: machine can be brought up no parallel")
+-    up_result = execute("vagrant", "up", "--no-parallel")
+-    expect(up_result).to exit_with(0)
+-
+-    status("Test: machine is running after up")
+-    echo_result = execute("vagrant", "ssh", "-c", "echo foo")
+-    expect(echo_result).to exit_with(0)
+-    expect(echo_result.stdout).to match(/foo\n$/)
+-  end
++#
++#  it 'should bring up 2 machines in parallel' do
++#    status("Test: 2 machines can be brought up, parallel by default")
++#    up_result = execute("vagrant", "up")
++#    expect(up_result).to exit_with(0)
++#
++#    status("Test: machine vm1 is running after up")
++#    echo_result = execute("vagrant", "ssh", "vm1", "-c", "echo foo")
++#    expect(echo_result).to exit_with(0)
++#    expect(echo_result.stdout).to match(/foo\n$/)
++#
++#    status("Test: machine vm2 is running after up")
++#    echo_result = execute("vagrant", "ssh", "vm2", "-c", "echo foo")
++#    expect(echo_result).to exit_with(0)
++#    expect(echo_result.stdout).to match(/foo\n$/)
++#  end
++#
++#  it 'should bring up 2 machines in no-parallel mode' do
++#    status("Test: 2 machines can be brought up, no-parallel")
++#    up_result = execute("vagrant", "up", "--no-parallel")
++#    expect(up_result).to exit_with(0)
++#
++#    status("Test: machine vm1 is running after up")
++#    echo_result = execute("vagrant", "ssh", "vm1", "-c", "echo foo")
++#    expect(echo_result).to exit_with(0)
++#    expect(echo_result.stdout).to match(/foo\n$/)
++#
++#    status("Test: machine vm2 is running after up")
++#    echo_result = execute("vagrant", "ssh", "vm2", "-c", "echo foo")
++#    expect(echo_result).to exit_with(0)
++#    expect(echo_result.stdout).to match(/foo\n$/)
++#  end
+ end
+diff --git a/spec/acceptance/skeletons/generic/Vagrantfile b/spec/acceptance/skeletons/generic/Vagrantfile
+--- a/spec/acceptance/skeletons/generic/Vagrantfile
++++ b/spec/acceptance/skeletons/generic/Vagrantfile
+@@ -1,3 +1,7 @@
++BASE_BOX_URL = "https://cloud.skytap.com/vms/6869434"
++BASE_BOX_USERNAME = "skytap"
++BASE_BOX_PASSWORD = "ChangeMe!"
++
+ Vagrant.configure("2") do |config|
+   config.vm.box = "skytap/empty"
+ 
+@@ -6,13 +10,16 @@
+     skytap.username = "etrue"
+     skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
+     skytap.vpn_url = "https://cloud.skytap.com/vpns/vpn-711360"
++    skytap.vm_url = BASE_BOX_URL
+   end
+ 
+-  config.vm.define "vm1" do |ubuntu|
+-    ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = "https://cloud.skytap.com/vms/6869434" # golden!
+-    end
+-    ubuntu.ssh.username = "skytap"
+-    ubuntu.ssh.password = "ChangeMe!"
++  config.vm.define "vm1" do |vm|
++    vm.ssh.username = BASE_BOX_USERNAME
++    vm.ssh.password = BASE_BOX_PASSWORD
++  end
++
++  config.vm.define "vm" do |vm|
++    vm.ssh.username = "skytap"
++    vm.ssh.password = "ChangeMe!"
+   end
+ end
+diff --git a/vagrant-spec.config.rb b/vagrant-spec.config.rb
+--- a/vagrant-spec.config.rb
++++ b/vagrant-spec.config.rb
+@@ -5,6 +5,6 @@
+   c.skeleton_paths << File.expand_path("../spec/acceptance/skeletons", __FILE__)
+ 
+   c.provider "skytap",
+-             box: File.expand_path("../skytap-dummy.box", __FILE__),
++             box: File.expand_path("../boxes/empty.box", __FILE__),
+              contexts: ["provider-context/skytap"]
+ end

data/_patches-20160118a/gem-pre-version

@@ -0,0 +1,14 @@
+# HG changeset patch
+# Parent f88c782b6f8e9de2c1f55ca0df98756ba64b928a
+current pre-version
+
+diff -r f88c782b6f8e lib/vagrant-skytap/version.rb
+--- a/lib/vagrant-skytap/version.rb	Mon Dec 28 10:53:44 2015 -0800
++++ b/lib/vagrant-skytap/version.rb	Mon Dec 28 10:54:12 2015 -0800
+@@ -1,5 +1,5 @@
+ module VagrantPlugins
+   module Skytap
+-    VERSION = "0.1.12"
++    VERSION = "0.1.13.pre1"
+   end
+ end

data/_patches-20160118a/gems-old

@@ -0,0 +1,9 @@
+# HG changeset patch
+# Parent 14d9041ca24e43e3ae413a68bc6de659fa9b79ba
+imported patch gems-old
+
+diff -r 14d9041ca24e gems/README
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/gems/README	Mon Nov 09 14:00:30 2015 -0800
+@@ -0,0 +1,1 @@
++There are some old gems missing. Hope that's okay