kitchen-vagrant 0.17.0.beta.3 → 0.17.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad9a608e086a9198d09b3f11ff112b925c2b1f1
-  data.tar.gz: 2c72bf47c1513c8e85ca0d96464702134275917e
+  metadata.gz: 4d52273cf0a7bb77124d8e8ca51b9f96355cfeb4
+  data.tar.gz: 4444fc53d2b3d18529742fa8d298d94abf9b83eb
 SHA512:
-  metadata.gz: 9c3e8457a349aa2c1544f3ae4cb423a3f1194f1fa933493b156b964e3eca44349c00c67c76b6e519f838ac271618eca764e243ed759d600165aece74c6fa0a06
-  data.tar.gz: 43f71f7c083f9d735f38a3c0c064f69b87f665b299d90315e38aaa2ae411b62636d2b46ac79f750bbcbd57421638c63f3d919ae22d49262a35521f3d363ac8e7
+  metadata.gz: 32daf604ce65340eef8167677a574fbb07b9ddd2b875ac422994a67a8b5edf304aaf70e793f21d54d01c3481ba4f732e12f1dd5c38ec576b93f7c0237ed69fdb
+  data.tar.gz: 1f6f22b60fd7cc265a0d2610765de163d3fd5550138909fc4eb88279e7bfc5202229ca2c3aaf75aa148d4fc8eac7a1d05fa5f3b71fe61198ae478dd0ff61d484

data/CHANGELOG.md

@@ -1,5 +1,18 @@
+## 0.17.0.beta.4 / 2015-03-26
+
+### Bug fixes
+
+* Pull request [#156][]: Use RDPPort value from `vagrant winrm-config` for WinRM Transports. ([@fnichol][])
+
+### Improvements
+
+* Pull request [#152][]: Translate CPU count for VMWare provider. ([@whiteley][])
+
+
 ## 0.17.0.beta.3 / 2015-03-25
 
+### Bug fixes
+
 * Pull request [#155][]: Use the vagrant-winrm Vagrant plugin to resolve VM IP address. See PR for details. ([@fnichol][])
 
 
@@ -256,8 +269,10 @@ The initial release.
 [#147]: https://github.com/test-kitchen/kitchen-vagrant/issues/147
 [#148]: https://github.com/test-kitchen/kitchen-vagrant/issues/148
 [#151]: https://github.com/test-kitchen/kitchen-vagrant/issues/151
+[#152]: https://github.com/test-kitchen/kitchen-vagrant/issues/152
 [#154]: https://github.com/test-kitchen/kitchen-vagrant/issues/154
 [#155]: https://github.com/test-kitchen/kitchen-vagrant/issues/155
+[#156]: https://github.com/test-kitchen/kitchen-vagrant/issues/156
 [@Annih]: https://github.com/Annih
 [@Igorshp]: https://github.com/Igorshp
 [@RobertRehberg]: https://github.com/RobertRehberg
@@ -293,3 +308,4 @@ The initial release.
 [@tknerr]: https://github.com/tknerr
 [@tmatilai]: https://github.com/tmatilai
 [@vinyar]: https://github.com/vinyar
+[@whiteley]: https://github.com/whiteley

data/lib/kitchen/driver/vagrant.rb

@@ -357,6 +357,7 @@ module Kitchen
         state[:password] = hash["Password"] if hash["Password"]
         state[:ssh_key] = hash["IdentityFile"] if hash["IdentityFile"]
         state[:proxy_command] = hash["ProxyCommand"] if hash["ProxyCommand"]
+        state[:rdp_port] = hash["RDPPort"] if hash["RDPPort"]
       end
 
       # @return [String] full local path to the directory containing the

data/lib/kitchen/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "0.17.0.beta.3"
+    VAGRANT_VERSION = "0.17.0.beta.4"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -605,6 +605,7 @@ describe Kitchen::Driver::Vagrant do
               User vagrant
               Password yep
               Port 9999
+              RDPPort 5555
           OUTPUT
         end
 
@@ -637,6 +638,12 @@ describe Kitchen::Driver::Vagrant do
 
           expect(state).to include(:password => "yep")
         end
+
+        it "sets :rdp_port from winrm-config" do
+          cmd
+
+          expect(state).to include(:rdp_port => "5555")
+        end
       end
     end
 
@@ -1263,6 +1270,33 @@ describe Kitchen::Driver::Vagrant do
           end
         RUBY
       end
+
+      it "converts :cpus into :numvcpus" do
+        config[:customize] = {
+          :cpus => "2"
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :vmware_desktop do |p|
+            p.vmx["numvcpus"] = "2"
+          end
+        RUBY
+      end
+
+      it "skips :cpus if key :numvcpus exists" do
+        config[:customize] = {
+          :cpus => "2",
+          :numvcpus => "4"
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :vmware_desktop do |p|
+            p.vmx["numvcpus"] = "4"
+          end
+        RUBY
+      end
     end
 
     context "for managed provider" do

data/templates/Vagrantfile.erb

@@ -96,6 +96,10 @@ Vagrant.configure("2") do |c|
       <% unless config[:customize].include?(:memsize) %>
     p.vmx["memsize"] = "<%= value %>"
       <% end %>
+    <% elsif key == :cpus %>
+      <% unless config[:customize].include?(:numvcpus) %>
+    p.vmx["numvcpus"] = "<%= value %>"
+      <% end %>
     <% else %>
     p.vmx["<%= key %>"] = "<%= value %>"
     <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.17.0.beta.3
+  version: 0.17.0.beta.4
 platform: ruby
 authors:
 - Fletcher Nichol