kitchen-vagrant 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ee72d57d556a167ee66c7d6e9feab387a26568d
-  data.tar.gz: 73b264e1d64ca412181265fb9823f52b5a77a992
+  metadata.gz: 05ed2e3e9d5d34674af87a20b09ac774d3981d8e
+  data.tar.gz: 993f6bb3134feaeec34c4f24eebf315a6c79f93b
 SHA512:
-  metadata.gz: b7eebf2687a97c3b7b7b6af8f7047e3ddb166887a5012d47bad1c495902df3751cb84a6f39a6def15a27140925482f269fca6e6678c558ce15cafd42a661aabb
-  data.tar.gz: 3aee9e2aba2d2cc138be17e623d75d3941dabd5cfbb90db8483c78a0fcda9b391687a6deb91fc573e74dca86e38b955275107c57126f9db17aad480dc9d7ba89
+  metadata.gz: e460544290ba5a7f7487f7dcf3269d18a0c64703d551b0ec0e14b5392cc23343d6839914cd46d703dd17e4dd122eb199b497368b4144a50a5319ecc581f808e8
+  data.tar.gz: d0579858e6613e6141f327eb774dc4aecf738bde8bf375f6cc21b2241f5c59a3211eabbc825c299111fadfbc6f598b0b6d78ab08df22b655f604ca6a468f3a6d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Change Log
+
+## [v1.0.2](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.0.2) (2017-02-13)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.0.1...v1.0.2)
+
+**Fixed bugs:**
+
+- Fixed a bug that can occur when `instance` returns `nil` [\#285](https://github.com/test-kitchen/kitchen-vagrant/pull/285) ([Kuniwak](https://github.com/Kuniwak))
+
 ## [v1.0.1](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.0.1) (2017-02-10)
 [Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.0.0...v1.0.1)
 

data/lib/kitchen/driver/vagrant.rb

@@ -469,10 +469,13 @@ module Kitchen
       #   instance's Vagrantfile
       # @api private
       def vagrant_root
-        root = File.join(config[:kitchen_root], %w{.kitchen kitchen-vagrant},
-          "kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}"
-        )
-        @vagrant_root ||= instance.nil? ? nil : root
+        if !@vagrant_root && !instance.nil?
+          @vagrant_root = File.join(
+            config[:kitchen_root], %w{.kitchen kitchen-vagrant},
+            "kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}"
+          )
+        end
+        @vagrant_root
       end
 
       # @param type [Symbol] either `:ssh` or `:winrm`

data/lib/kitchen/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "1.0.1"
+    VAGRANT_VERSION = "1.0.2"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -48,6 +48,10 @@ describe Kitchen::Driver::Vagrant do
     d
   end
 
+  let(:driver_with_no_instance) do
+    driver_object
+  end
+
   let(:instance) do
     Kitchen::Instance.new(
       :verifier => verifier,
@@ -540,6 +544,12 @@ describe Kitchen::Driver::Vagrant do
       driver.verify_dependencies
     end
 
+    it "passes for supported versions of Vagrant when it has no instances" do
+      with_modern_vagrant
+
+      driver_with_no_instance.verify_dependencies
+    end
+
     it "raises a UserError for unsupported versions of Vagrant" do
       with_unsupported_vagrant
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen