kitchen-vagrant 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0dc4619e60934c3bee08b3a56a3f443d1507e81
-  data.tar.gz: 1b12e75c49a66943965fbfcffef1dd57f91d84fd
+  metadata.gz: 8aa643733a8bf6bd645efc9fa0194c06011c74ee
+  data.tar.gz: 6c27247da25efbeacdddc37a185e578ec92d3d06
 SHA512:
-  metadata.gz: 4bfd34c4956cda9d30fa4537e63b21a0b42e2133cae2e8bae9abe43da8627df4c0144a37734dd8b38daeed871c1ecb2115d0bb49a3aa91ad2dc72ac948c1e6f1
-  data.tar.gz: c306ce6aafdcfd0f303d0a681da0857c07f6e847b09ba0df643faee89763098cc97ad386117c7df1bc760154a92dbbe9880511eb1678cbd0023a81ddc3c817cc
+  metadata.gz: 2d941b21d57414cae57419b423c5ff5032d4320a7cd28bb81c1f0bf4047fcfdaf464dde79925d9ccbe24c7d1390977a8ffc61ce3fcae143b363edb54387f4968
+  data.tar.gz: 48ee12e85af4eeb36976ad354a6ef9f1771fee7e3072e67899a8efffb0b97a9e0a8a1672611047fb6e88d6f4277b7ac52ef160c12f08bb193a7f67fb514edb60

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0.0
+  - 2.3.1
+  - 2.2.5
   - ruby-head
 
 bundler_args: --without guard
@@ -14,6 +13,10 @@ matrix:
   allow_failures:
     - rvm: ruby-head
 
+branches:
+  only:
+    - master
+
 notifications:
   irc: "chat.freenode.net#kitchenci"
 

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.21.0](https://github.com/test-kitchen/kitchen-vagrant/tree/0.21.0) (2016-11-29)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v0.20.0...0.21.0)
+
+**Fixed bugs:**
+
+- Generated Vagrantfile has type issues [\#236](https://github.com/test-kitchen/kitchen-vagrant/issues/236)
+- Fix ssh boolean values in Vagrantfile template [\#231](https://github.com/test-kitchen/kitchen-vagrant/pull/231) ([zuazo](https://github.com/zuazo))
+
+**Merged pull requests:**
+
+- Add a synced folder to persist chef omnibus packages [\#248](https://github.com/test-kitchen/kitchen-vagrant/pull/248) ([afiune](https://github.com/afiune))
+- Fix generated Vagrantfile type issues [\#243](https://github.com/test-kitchen/kitchen-vagrant/pull/243) ([OBrienCommaJosh](https://github.com/OBrienCommaJosh))
+- Bump travis rubies to the modern age [\#242](https://github.com/test-kitchen/kitchen-vagrant/pull/242) ([mwrock](https://github.com/mwrock))
+- Fix the name of "Parallels Desktop for Mac" [\#233](https://github.com/test-kitchen/kitchen-vagrant/pull/233) ([legal90](https://github.com/legal90))
+- Add support for ovirt3 vagrant provider [\#223](https://github.com/test-kitchen/kitchen-vagrant/pull/223) ([xiboy](https://github.com/xiboy))
+
 ## [0.20.0](https://github.com/test-kitchen/kitchen-vagrant/tree/v0.20.0) (2016-04-07)
 [Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v0.19.0...v0.20.0)
 

data/README.md

@@ -49,10 +49,10 @@ software from VMware and then must also purchase the Vagrant VMware plugin.
 
 [VMware Workstation][workstation_dl]
 
-If you would like to use Parallels you must also purchase the software but the
+If you would like to use Parallels Desktop you must also purchase the software but the
 `vagrant-parallels` plugin is freely available.
 
-[Parllels][parallels_dl]
+[Parallels Desktop for Mac][parallels_dl]
 
 [Vagrant Parallels Provider][vagrant_parallels]
 

data/lib/kitchen/driver/vagrant.rb

@@ -169,6 +169,13 @@ module Kitchen
         instance.transport.name.downcase =~ /win_?rm/
       end
 
+      # Setting up the `cache_directory` to store omnibus packages in cache
+      # and share a local folder to that directory so that we don't pull them
+      # down every single time
+      def cache_directory
+        windows_os? ? "$env:TEMP\\omnibus\\cache" : "/tmp/omnibus/cache"
+      end
+
       protected
 
       WEBSITE = "http://www.vagrantup.com/downloads.html".freeze
@@ -248,6 +255,21 @@ module Kitchen
               options || "nil"
             ]
           end
+        add_extra_synced_folders!
+      end
+
+      # We would like to sync a local folder to the instance so we can
+      # take advantage of the packages that we might have in cache,
+      # therefore we wont download a package we already have
+      def add_extra_synced_folders!
+        if cache_directory
+          FileUtils.mkdir_p(local_kitchen_cache)
+          config[:synced_folders].push([
+            local_kitchen_cache,
+            cache_directory,
+            "create: true"
+          ])
+        end
       end
 
       # Truncates the length of `:vm_hostname` to 12 characters for
@@ -389,6 +411,12 @@ module Kitchen
         state[:rdp_port] = hash["RDPPort"] if hash["RDPPort"]
       end
 
+      # @return [String] full absolute path to the kitchen cache directory
+      # @api private
+      def local_kitchen_cache
+        @local_kitchen_cache ||= File.expand_path("~/.kitchen/cache")
+      end
+
       # @return [String] full local path to the directory containing the
       #   instance's Vagrantfile
       # @api private

data/lib/kitchen/driver/vagrant_version.rb

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

data/spec/kitchen/driver/vagrant_spec.rb

@@ -147,6 +147,14 @@ describe Kitchen::Driver::Vagrant do
 
   describe "configuration" do
 
+    let(:cache_directory_array) do
+      [
+        File.expand_path("~/.kitchen/cache"),
+        "/tmp/omnibus/cache",
+        "create: true"
+      ]
+    end
+
     %W[centos debian fedora opensuse ubuntu].each do |name|
 
       context "for known bento platform names starting with #{name}" do
@@ -316,8 +324,8 @@ describe Kitchen::Driver::Vagrant do
       expect(driver[:ssh]).to eq(:a => "b", :c => { :d => "e" })
     end
 
-    it "sets :synced_folders to an empty array by default" do
-      expect(driver[:synced_folders]).to eq([])
+    it "sets :synced_folders with the cache_directory by default" do
+      expect(driver[:synced_folders]).to eq([cache_directory_array])
     end
 
     it "sets :synced_folders to a custom value" do
@@ -326,7 +334,11 @@ describe Kitchen::Driver::Vagrant do
       ]
 
       expect(driver[:synced_folders]).to eq([
-        [File.expand_path("/host_path"), "/vm_path", "create: true, type: :nfs"]
+        [
+          File.expand_path("/host_path"),
+          "/vm_path", "create: true, type: :nfs"
+        ],
+        cache_directory_array
       ])
     end
 
@@ -336,7 +348,8 @@ describe Kitchen::Driver::Vagrant do
       ]
 
       expect(driver[:synced_folders]).to eq([
-        [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"]
+        [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"],
+        cache_directory_array
       ])
     end
 
@@ -346,7 +359,8 @@ describe Kitchen::Driver::Vagrant do
       ]
 
       expect(driver[:synced_folders]).to eq([
-        [File.expand_path("/kroot/a"), "/vm_path", "stuff"]
+        [File.expand_path("/kroot/a"), "/vm_path", "stuff"],
+        cache_directory_array
       ])
     end
 
@@ -356,7 +370,8 @@ describe Kitchen::Driver::Vagrant do
       ]
 
       expect(driver[:synced_folders]).to eq([
-        [File.expand_path("/host_path"), "/vm_path", "nil"]
+        [File.expand_path("/host_path"), "/vm_path", "nil"],
+        cache_directory_array
       ])
     end
 
@@ -418,6 +433,14 @@ describe Kitchen::Driver::Vagrant do
 
     context "for windows os_types" do
 
+      let(:win_cache_directory_array) do
+        [
+          File.expand_path("~/.kitchen/cache"),
+          "$env:TEMP\\omnibus\\cache",
+          "create: true"
+        ]
+      end
+
       before { allow(platform).to receive(:os_type).and_return("windows") }
 
       it "sets :vm_hostname to nil by default" do
@@ -429,6 +452,21 @@ describe Kitchen::Driver::Vagrant do
 
         expect(driver[:vm_hostname]).to eq("this-is-a--k")
       end
+
+      it "sets :synced_folders with the cache_directory by default" do
+        expect(driver[:synced_folders]).to eq([win_cache_directory_array])
+      end
+
+      it "replaces %{instance_name} with instance name in :synced_folders" do
+        config[:synced_folders] = [
+          ["/root/%{instance_name}", "/vm_path", "stuff"]
+        ]
+
+        expect(driver[:synced_folders]).to eq([
+          [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"],
+          win_cache_directory_array
+        ])
+      end
     end
   end
 
@@ -1111,7 +1149,8 @@ describe Kitchen::Driver::Vagrant do
       config[:ssh] = {
         :username => %{jdoe},
         :password => %{secret},
-        :private_key_path => %{/key}
+        :private_key_path => %{/key},
+        :insert_key => false
       }
       cmd
 
@@ -1119,6 +1158,7 @@ describe Kitchen::Driver::Vagrant do
         c.ssh.username = "jdoe"
         c.ssh.password = "secret"
         c.ssh.private_key_path = "/key"
+        c.ssh.insert_key = false
       RUBY
     end
 

data/templates/Vagrantfile.erb

@@ -54,7 +54,7 @@ Vagrant.configure("2") do |c|
   c.ssh.private_key_path = "<%= config[:ssh_key] %>"
 <% end %>
 <% config[:ssh].each do |key, value| %>
-  c.ssh.<%= key %> = "<%= value %>"
+  c.ssh.<%= key %> = <%= [true, false].include?(value) ? value : value.inspect %>
 <% end %>
 <% if config[:winrm] %>
   <% config[:winrm].each do |key, value| %>
@@ -142,7 +142,7 @@ Vagrant.configure("2") do |c|
     <% else %>
     p.vmx["<%= key %>"] = "<%= value %>"
     <% end %>
-  <% when "openstack", "cloudstack", "hyperv" %>
+  <% when "openstack", "cloudstack", "hyperv", "ovirt3" %>
     <% if value.is_a? String %>
     p.<%= key %> = "<%= value%>"
     <% else  %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -164,11 +164,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 test_files:
 - spec/kitchen/driver/vagrant_spec.rb
 - spec/spec_helper.rb
-has_rdoc: