kitchen-vagrant 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bcdf36e88d6aef140e4c2064a79bda537075114
-  data.tar.gz: 33863859cd3303f848cebbd422fc609de9d0d3b1
+  metadata.gz: 863f689f3db93659089b9fab42bc68af9a95ad4b
+  data.tar.gz: 6dd5c1895f937db1365989ee58f63d5a26ca7c37
 SHA512:
-  metadata.gz: b7b73c8e9312a899cdac7a29cab0e977832186169250d9bbe3e14cdcc206612d43a9412042ec91cdaf69c829c211a4c571135df4a6aae686dcaaf1a5d29d5872
-  data.tar.gz: 39a9416a9f3de64b9571d178f0a34e2a5b69a88fc29230bed61cbb9eda54da62071b09c0b327d89622883bfe169eb0cf29695ae9515e009da5dbe3ad8b479ba5
+  metadata.gz: ba910a7a30032b94668729e5624bfbe982432dff9e92d73f01e13b598a5b907a03c7b803306e4f46d039a2caf8a90667ee267f46b0680d28eb3dcc2846f795f3
+  data.tar.gz: fe28cb8b5d772713b2d9f79afc4010cd73a8d1bcd946a50be31004bce921a2318fd0e4540c89b08c958772eed52d8c4e18674393c1c3e9621517d5c60f03f7e7

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v1.1.1](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.1.1) (2017-07-26)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.1.0...v1.1.1)
+
+**Fixed Bugs**
+
+- Fix detection of vagrant-winrm plugin. [\#309](https://github.com/test-kitchen/kitchen-vagrant/pull/309) ([silverl](https://github.com/silverl))
+- Fix bug in Vagrantfile template related to WinRM options. [\#306](https://github.com/test-kitchen/kitchen-vagrant/pull/306) ([aleksey-hariton](https://github.com/aleksey-hariton))
+- Disable caching, even for bento boxes. [\#313](https://github.com/test-kitchen/kitchen-vagrant/pull/313) ([robbkidd](https://github.com/robbkidd))
+
 ## [v1.1.0](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.1.0) (2017-03-31)
 [Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.0.2...v1.1.0)
 

data/README.md

@@ -56,6 +56,21 @@ If you would like to use Parallels Desktop you must also purchase the software b
 
 [Vagrant Parallels Provider][vagrant_parallels]
 
+#### <a name="unmaintained-virtualization"></a> Unmaintained Virtualization Hypervisors
+
+Some additional hypervisors may be used with this driver but are not officially supported:
+
+[CloudStack][cloudstack] using the unofficial [vagrant-cloudstack][vagrant_cloudstack] plugin for Vagrant.
+
+[KVM][kvm]/[Libvirt][libvirt] using the unofficial [vagrant-libvirt][vagrant_libvirt] plugin for Vagrant.
+
+[LXC][lxc] using the unofficial [vagrant-lxc][vagrant_lxc] plugin for Vagrant.
+
+[OpenStack][openstack] using an unofficial provider plugin for Vagrant.
+
+[RackSpace][rackspace] using the official [vagrant-rackspace][vagrant_rackspace] plugin for Vagrant.
+
+[SoftLayer][softlayer] using the unofficial [vagrant-softlayer][vagrant_softlayer] plugin for Vagrant.
 
 ## <a name="installation"></a> Installation and Setup
 
@@ -598,3 +613,15 @@ Apache 2.0 (see [LICENSE][license])
 [vagrant_parallels]:        https://github.com/Parallels/vagrant-parallels
 [vagrant_cachier]:          https://github.com/fgrehm/vagrant-cachier
 [vbox_ide_boot]:            https://www.virtualbox.org/ticket/6979
+[cloudstack]:               https://cloudstack.apache.org/
+[kvm]:                      https://www.linux-kvm.org/page/Main_Page
+[libvirt]:                  https://libvirt.org/
+[lxc]:                      https://linuxcontainers.org/
+[openstack]:                https://cloudstack.apache.org/
+[rackspace]:                https://www.rackspace.com/
+[softlayer]:                http://www.softlayer.com/
+[vagrant_cloudstack]:       https://github.com/MissionCriticalCloud/vagrant-cloudstack
+[vagrant_libvirt]:          https://github.com/vagrant-libvirt/vagrant-libvirt
+[vagrant_lxc]:              https://github.com/fgrehm/vagrant-lxc
+[vagrant_rackspace]:        https://github.com/mitchellh/vagrant-rackspace
+[vagrant_softlayer]:        https://github.com/audiolize/vagrant-softlayer

data/Rakefile

@@ -11,12 +11,6 @@ end
 desc "Run all test suites"
 task :test => [:spec]
 
-require "cane/rake_task"
-desc "Run cane to check quality metrics"
-Cane::RakeTask.new do |cane|
-  cane.canefile = "./.cane"
-end
-
 require "chefstyle"
 require "rubocop/rake_task"
 RuboCop::RakeTask.new(:style) do |task|
@@ -32,7 +26,7 @@ task :stats do
 end
 
 desc "Run all quality tasks"
-task :quality => [:cane, :style, :stats]
+task :quality => [:style, :stats]
 
 task :default => [:test, :quality]
 

data/kitchen-vagrant.gemspec

@@ -28,5 +28,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "github_changelog_generator", "1.11.3"
 
   gem.add_development_dependency "chefstyle"
-  gem.add_development_dependency "cane", "3.0.0"
 end

data/lib/kitchen/driver/vagrant.rb

@@ -86,7 +86,9 @@ module Kitchen
         driver.windows_os? ? nil : "#{driver.instance.name}.vagrantup.com"
       end
 
-      default_config :cache_directory, false
+      default_config(:cache_directory) do |driver|
+        driver.windows_os? ? "/omnibus/cache" : "/tmp/omnibus/cache"
+      end
 
       default_config :kitchen_cache_directory,
         File.expand_path("~/.kitchen/cache")
@@ -197,10 +199,10 @@ module Kitchen
       # and share a local folder to that directory so that we don't pull them
       # down every single time
       def cache_directory
-        if enable_cache? && !config[:cache_directory]
-          windows_os? ? "/omnibus/cache" : "/tmp/omnibus/cache"
-        else
+        if enable_cache?
           config[:cache_directory]
+        else
+          false
         end
       end
 
@@ -244,9 +246,8 @@ module Kitchen
       # Return true if we found the criteria to enable the cache_directory
       # functionality
       def enable_cache?
-        if safe_share?(config[:box])
-          return true
-        end
+        return false unless config[:cache_directory]
+        return true if safe_share?(config[:box])
         # Otherwise
         false
       end
@@ -561,7 +562,7 @@ module Kitchen
 
         self.class.winrm_plugin_passed = run_silently(
           "#{config[:vagrant_binary]} plugin list", :cwd => Dir.pwd).
-          split("\n").find { |line| line =~ /^vagrant-winrm\s+/ }
+          split("\n").find { |line| line =~ /vagrant-winrm\s+/ }
       end
     end
   end

data/lib/kitchen/driver/vagrant_version.rb

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

data/spec/kitchen/driver/vagrant_spec.rb

@@ -345,6 +345,12 @@ describe Kitchen::Driver::Vagrant do
       expect(driver[:synced_folders]).to eq([cache_directory_array])
     end
 
+    it "does not set :synced_folders when cache_directory is false" do
+      config[:box] = "bento/centos-99"
+      config[:cache_directory] = false
+      expect(driver[:synced_folders]).to eq([])
+    end
+
     it "does not set :synced_folders to cache_directory on freebsd systems" do
       allow(platform).to receive(:name).and_return("freebsd-99")
       expect(driver[:synced_folders]).to eq([])
@@ -484,7 +490,10 @@ describe Kitchen::Driver::Vagrant do
         ]
       end
 
-      before { config[:cache_directory] = 'Z:\\awesome\\cache' }
+      before do
+        config[:box] = "bento/centos-99"
+        config[:cache_directory] = "Z:\\awesome\\cache"
+      end
 
       it "sets :synced_folders with the custom cache_directory" do
         expect(driver[:synced_folders]).to eq([custom_cache_directory_array])

data/templates/Vagrantfile.erb

@@ -68,7 +68,7 @@ Vagrant.configure("2") do |c|
 <% end %>
 <% if config[:winrm] %>
   <% config[:winrm].each do |key, value| %>
-    c.winrm.<%= key %> = <%= value %>
+    c.winrm.<%= key %> = "<%= value %>"
   <% end %>
 <% end %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 description: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 email:
 - fnichol@nichol.ca
@@ -164,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.