vagrant-skytap 0.2.2 → 0.2.3

data/_patches-20160112a/eng-12301

@@ -1,50 +0,0 @@
-# HG changeset patch
-# Parent 7bf28b483ba4495c173d9316aee2d8482d9705ab
-ENG-12301 release machine lock
-
-diff -r 7bf28b483ba4 lib/vagrant-skytap/action/mixin_machine_index.rb
---- a/lib/vagrant-skytap/action/mixin_machine_index.rb	Thu Dec 03 19:36:57 2015 -0800
-+++ b/lib/vagrant-skytap/action/mixin_machine_index.rb	Mon Dec 07 14:42:07 2015 -0800
-@@ -14,6 +14,7 @@
-         # NOTE: #get locks the machine. Make sure to #release(entry)
-         # when finished.
-         def machine_index_entry
-+          @logger.debug("Locking machine #{index_uuid}") if @logger
-           entry = machine_index.get(env[:machine].index_uuid)
-         end
-       end
-diff -r 7bf28b483ba4 lib/vagrant-skytap/action/store_extra_data.rb
---- a/lib/vagrant-skytap/action/store_extra_data.rb	Thu Dec 03 19:36:57 2015 -0800
-+++ b/lib/vagrant-skytap/action/store_extra_data.rb	Mon Dec 07 14:42:07 2015 -0800
-@@ -17,6 +17,7 @@
- 
-         def call(env)
-           entry = machine_index_entry
-+          puts  "Machine locked. Pausing 5 seconds so you can kill me"
-           entry.extra_data.merge!(provider_extra_data)
-           entry = machine_index.set(entry)
-           machine_index.release(entry)
-diff -r 7bf28b483ba4 lib/vagrant-skytap/provider.rb
---- a/lib/vagrant-skytap/provider.rb	Thu Dec 03 19:36:57 2015 -0800
-+++ b/lib/vagrant-skytap/provider.rb	Mon Dec 07 14:42:07 2015 -0800
-@@ -6,6 +6,7 @@
-     class Provider < Vagrant.plugin("2", :provider)
-       def initialize(machine)
-         @machine = machine
-+        @logger = Log4r::Logger.new("vagrant_skytap::plugin::provider")
-       end
- 
-       def action(name)
-@@ -26,10 +27,11 @@
-       end
- 
-       def state
-+        @logger.debug("Entered Provider#state")
-         # Run a custom action we define called "read_state" which does
-         # what it says. It puts the state in the `:machine_state_id`
-         # key in the environment.
--        env = @machine.action("read_state")
-+        env = @machine.action("read_state", lock: false) # can't be this easy
- 
-         state_id = env[:machine_state_id]
- 

data/_patches-20160112a/eng-12843

@@ -1,95 +0,0 @@
-# HG changeset patch
-# Parent d12ff92a5f45243523ff63f49b559dd3793fe41e
-ENG-12843 make Up command work without hacking a copy of the command
-
-diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/action.rb
---- a/lib/vagrant-skytap/action.rb	Mon Dec 28 10:54:14 2015 -0800
-+++ b/lib/vagrant-skytap/action.rb	Tue Jan 05 13:21:52 2016 -0800
-@@ -190,6 +190,16 @@
-       # and initial states for all machines to be run, potentially
-       # with a single REST call.
- 
-+      def self.action_up
-+        Vagrant::Action::Builder.new.tap do |b|
-+          b.use HandleBox
-+          #b.use action_fetch_environment
-+          b.use ConfigValidate
-+#          b.use InitializeAPIClient
-+#          b.use FetchEnvironment
-+        end
-+      end
-+
-       def self.action_create
-         Vagrant::Action::Builder.new.tap do |b|
-           b.use HandleBox
-@@ -320,6 +330,7 @@
-       autoload :MessageEnvironmentUrl, action_root.join("message_environment_url")
-       autoload :MessageResuming, action_root.join("message_resuming")
-       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
-+      autoload :PostActionUp, action_root.join("post_action_up")
-       autoload :PrepareForwardedPortCollisionParams, action_root.join("prepare_forwarded_port_collision_params")
-       autoload :PrepareNFSSettings, action_root.join("prepare_nfs_settings")
-       autoload :PrepareNFSValidIds, action_root.join("prepare_nfs_valid_ids")
-diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/action/post_action_up.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/action/post_action_up.rb	Tue Jan 05 13:21:52 2016 -0800
-@@ -0,0 +1,26 @@
-+require 'byebug'
-+require_relative "mixin_machine_index"
-+
-+module VagrantPlugins
-+  module Skytap
-+    module Action
-+      # This can be used with "Call" built-in to check if the action
-+      # is being performed as part of a parallel operation.
-+      class PostActionUp
-+        include MixinMachineIndex
-+        def initialize(app, env)
-+          @app = app
-+          @logger = Log4r::Logger.new("vagrant_skytap::action::post_action_up")
-+        end
-+
-+        def call(env)
-+          @logger.info env[:action_name]
-+          @logger.info env[:machine].try(:name)
-+          debugger
-+
-+          @app.call(env)
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/plugin.rb
---- a/lib/vagrant-skytap/plugin.rb	Mon Dec 28 10:54:14 2015 -0800
-+++ b/lib/vagrant-skytap/plugin.rb	Tue Jan 05 13:21:52 2016 -0800
-@@ -3,7 +3,7 @@
- rescue LoadError
-   raise "The Vagrant Skytap plugin must be run within Vagrant."
- end
--
-+require 'byebug'
- # This is a sanity check to make sure no one is attempting to install
- # this into an early Vagrant version.
- if Vagrant::VERSION < "1.2.0"
-@@ -34,9 +34,17 @@
-         Provider
-       end
- 
--      command("up", primary: true) do
--        require_relative "command/up"
--        Skytap::Command::Up
-+#      command("up", primary: true) do
-+#        require_relative "command/up"
-+#        Skytap::Command::Up
-+#      end
-+
-+      action_hook(:post_up_behavior1, :environment_unload) do |hook|
-+        hook.prepend(VagrantPlugins::Skytap::Action::PostActionUp)
-+      end
-+
-+      action_hook(:post_up_behavior4, :machine_action_up) do |hook|
-+        hook.append(VagrantPlugins::Skytap::Action::PostActionUp)
-       end
- 
-       command("publish-url", primary: true) do

data/_patches-20160112a/env-source

@@ -1,112 +0,0 @@
-# HG changeset patch
-# Parent 2d0352ab9e88823add32c339d95d9782c00fba51
-ENG-11604 support using environment vms (this is impossible without an API change)
-
-diff -r 2d0352ab9e88 Vagrantfile
---- a/Vagrantfile	Wed Nov 04 16:26:46 2015 -0800
-+++ b/Vagrantfile	Wed Nov 04 16:28:24 2015 -0800
-@@ -39,7 +39,7 @@
-   config.vm.define "vm1" do |ubuntu|
-     ubuntu.vm.hostname = "vm1"
-     ubuntu.vm.provider :skytap do |box|
--      box.vm_url = UBUNTU1#GENERIC_UBUNTU
-+      box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A#GENERIC_UBUNTU
-       #box.cpus = 1
-       #box.cpuspersocket = 1
-       #box.ram = 1024
-@@ -64,7 +64,7 @@
-   config.vm.define "vm3" do |ubuntu|
-     ubuntu.vm.hostname = "vm3"
-     ubuntu.vm.provider :skytap do |box|
--      box.vm_url = UBUNTU2#GENERIC_UBUNTU
-+      box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B#GENERIC_UBUNTU
-     end
-     ubuntu.vm.communicator = :ssh
-     ubuntu.ssh.username = "skytap"
-diff -r 2d0352ab9e88 lib/vagrant-skytap/api/environment.rb
---- a/lib/vagrant-skytap/api/environment.rb	Wed Nov 04 16:26:46 2015 -0800
-+++ b/lib/vagrant-skytap/api/environment.rb	Wed Nov 04 16:28:24 2015 -0800
-@@ -18,8 +18,27 @@
-             vm = Vm.fetch(env, vm_url)
-             check_vm_before_adding(env, vm)
- 
--            resp = env[:api_client].post(RESOURCE_ROOT, JSON.dump(template_id: vm.template_id, vm_ids: [vm.id]))
--            fetch(env, resp['Location'])
-+            params = {
-+              vm_ids: [vm.id]
-+            }.tap do |params|
-+              if vm.from_template?
-+                params[:template_id] = vm.template_id
-+              else
-+                params[:configuration_id] = vm.environment_id
-+              end
-+            end
-+
-+            puts params
-+            debugger
-+
-+            resp = env[:api_client].post(RESOURCE_ROOT, JSON.dump(params))#_for_add(vm)))
-+            if resp['Location']
-+              puts "Redirected to #{resp['Location']}"
-+              fetch(env, resp['Location'])
-+            else
-+              puts "call returned #{resp.body}"
-+              new(JSON.load(resp.body), env)
-+            end
-           end
- 
-           def fetch(env, url)
-@@ -31,6 +50,16 @@
-             EnvironmentProperties.read(env[:machine].env.local_data_path)
-           end
- 
-+          def params_for_add(vm)
-+            {
-+              vm_ids: [vm.id]
-+            }.tap do |params|
-+              unless params[:merge_configuration] = vm.environment_id
-+                params[:template_id] = vm.template_id
-+              end
-+            end
-+          end
-+
-           def check_vm_before_adding(env, vm)
-             raise Errors::NotTemplateVm, url: vm.url unless vm.from_template?
-             raise Errors::SourceVmNotStopped, name: env[:machine].name, url: vm.url unless vm.stopped?
-@@ -90,7 +119,20 @@
-           check_vm_before_adding(env, vm)
-           vm_ids = vms.collect(&:id)
- 
--          update_with_retry(template_id: vm.template_id, vm_ids: [vm.id])
-+          params = {
-+            vm_ids: [vm.id]
-+          }.tap do |params|
-+            if vm.from_template?
-+              params[:template_id] = vm.template_id
-+            else
-+              params[:merge_configuration] = vm.environment_id
-+            end
-+          end
-+
-+
-+          puts params
-+          debugger
-+          update_with_retry(params)#self.class.params_for_add(vm))
-           new_vm_ids = vms.collect(&:id) - vm_ids
-           get_vm_by_id(new_vm_ids.last)
-         end
-diff -r 2d0352ab9e88 lib/vagrant-skytap/api/vm.rb
---- a/lib/vagrant-skytap/api/vm.rb	Wed Nov 04 16:26:46 2015 -0800
-+++ b/lib/vagrant-skytap/api/vm.rb	Wed Nov 04 16:28:24 2015 -0800
-@@ -60,6 +60,11 @@
-           !!get_api_attribute('template_url')
-         end
- 
-+        def environment_id
-+          get_api_attribute('configuration_url') =~ /configurations\/(\d+)/
-+          $1
-+        end
-+
-         def template_id
-           get_api_attribute('template_url') =~ /templates\/(\d+)/
-           $1

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

@@ -1,163 +0,0 @@
-# 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-20160112a/gem-pre-version

@@ -1,14 +0,0 @@
-# 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-20160112a/gems-old

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