vagrant-skytap 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf5d3c0b7fd0393c8740ccae53bb5f25265b057
-  data.tar.gz: fa4d72e87ee859399de360dabb0b81431c789005
+  metadata.gz: c3f08f87dbf9b39c58d1c7ac1d1351b3ebe41dec
+  data.tar.gz: 006b50cbf19f4d81af13616bd06a989b92c89132
 SHA512:
-  metadata.gz: 92bdf1421b8320b29235963ca160804ab6c0890f0965187c4e7a9cecd50e551d8d7257f754057195b9ee40f1daacd8c12991ee11216a4d2e1ddacf714584e5ab
-  data.tar.gz: 7f1d027f8a4909b5da9e3d705f222ec4a2c72f8909f41ae79a3475d74282f106af70a64a95d57b0b9f9f457e9081cf889f05c038451280bd2b3fd2f1e7bc022e
+  metadata.gz: 856903a0c6c66cb584ade420ea622497ce8fe07a5054377d113c1a5c1c1d62057b2b7c84c26b47de157a6776eab0ee515ea02bdfac110b043037d191b6d13521
+  data.tar.gz: 0c409c6828537eae0b230135ebb6e9507f921422deceb584b6e1be27297df5ed913771400c372776dd02d6ddefd2e18dd13c2a8f3d7e03ca756a3fbdec408312

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.3.6 (August 2, 2017)
+
+* Parameterize some Gemfile entries for testing purposes.
+* Fix bug which limited the number of guest VMs to 3 when the host is also a 
+  Skytap VM.
+* Fix a bug in timeout error handling.
+
 # 0.3.5 (January 3, 2017)
 
 * Increase metadata service timeout, improve logging, handle still more errors (actually

data/Gemfile

@@ -2,6 +2,11 @@ source "https://rubygems.org"
 
 gemspec
 
+VAGRANT_GEM_TAG = ENV['VAGRANT_GEM_TAG'] || 'v1.7.4'
+# vagrant-spec made a change in 1d09951e which created a dependency conflict
+# in our test environment. For now, default to the preceding revision.
+VAGRANT_SPEC_GEM_REF = ENV['VAGRANT_SPEC_REF'] || '5006bc73'
+
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
@@ -9,13 +14,13 @@ group :development do
   if File.exist?(File.expand_path("../../vagrant", __FILE__))
     gem 'vagrant', path: "../vagrant"
   else
-    gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.7.2'
+    gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", tag: VAGRANT_GEM_TAG
   end
 
   if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))
     gem 'vagrant-spec', path: "../vagrant-spec"
   else
-    gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"
+    gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git", ref: VAGRANT_SPEC_GEM_REF
   end
 
   gem "rspec-expectations", "~> 2.14.0"

data/lib/vagrant-skytap/action/get_host_vm.rb

@@ -37,7 +37,7 @@ module VagrantPlugins
 
         def call(env)
           unless env[:vagrant_host_vm]
-            if metadata = env[:machine].provider.capability(:host_metadata)
+            if (metadata = env[:machine].provider.host_metadata)
               # The environment will be lazy loaded
               env[:vagrant_host_vm] = vm = API::Vm.new(metadata, nil, env)
               @logger.info("Running Vagrant in a Skytap VM. ID: #{vm.try(:id)}")

data/lib/vagrant-skytap/api/client.rb

@@ -125,7 +125,7 @@ module VagrantPlugins
             end
           rescue Timeout::Error => ex
             raise most_recent_exception if most_recent_exception
-            raise Errors::OperationFailed, "Timeout exceeded"
+            raise Errors::OperationFailed, err: "Timeout exceeded"
           end
         end
 

data/lib/vagrant-skytap/provider.rb

@@ -26,6 +26,9 @@ require "vagrant"
 module VagrantPlugins
   module Skytap
     class Provider < Vagrant.plugin("2", :provider)
+      @@host_metadata = nil
+      @@host_metadata_fetch_attempted = false
+
       def initialize(machine)
         @machine = machine
       end
@@ -63,6 +66,14 @@ module VagrantPlugins
         Vagrant::MachineState.new(state_id, short, long)
       end
 
+      def host_metadata
+        unless @@host_metadata_fetch_attempted
+          @@host_metadata = capability(:host_metadata)
+          @@host_metadata_fetch_attempted = true
+        end
+        @@host_metadata
+      end
+
       def to_s
         id = @machine.id.nil? ? "new" : @machine.id
         "Skytap (#{id})"

data/lib/vagrant-skytap/version.rb

@@ -22,6 +22,6 @@
 
 module VagrantPlugins
   module Skytap
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Eric True
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure