kitchen-vagrant 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a68efbcb6f53a8948a48797d7f090bc3485ace7
-  data.tar.gz: 3f82aee0f6cda30b19b38b10df0b6c31c6c2d597
+  metadata.gz: 0217562d1cdfdc41b66c913b4fd79cf11719b457
+  data.tar.gz: 6d99a767f3dc6154a3b5019c2bc72cf5525acbb1
 SHA512:
-  metadata.gz: 0e318d5feff607a59c938b6e1f6ab9a848e942b4966f3a4bf9b0cff249ae32aabc0c48653c28eacf2e5e67a3cc4abaddb5325a585f8af4b00c2af9e7aecd8286
-  data.tar.gz: bfd9f9d1dc2f538cab61403d05137f6a63f427e8e3b4ae9cfeb38852b433db827edbcab25e393b0f2c501795ed50feade37cbd533977f069d8681cdf1d4f4bc5
+  metadata.gz: 5fe5750855c7efd561e4643886213a8855d8bbeee9e2755b8bd7fd1c394d60cc677e34dabc403afa14f47b9a93c77d4541dda6fd3b3676b83d9fceaa294ea09d
+  data.tar.gz: f124d452f8d77fec21cb7f2b9ded0ebde8035dc7e30b324325978ebcb4ca02db1912a0e1888229da2f72c35f8f7b8f52e96e2a936769784ddea720bddd21f8b2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.18.0 / 2015-05-07
+
+### Bug fixes
+
+* Pull request [#161][]: Add handling for winrm communicator in username & password handling. ([@atiniir][])
+
+### Improvements
+
+* Pull request [#166][]: Allow a fuzzier match for known Bento box names. ([@fnichol][])
+
+
 ## 0.17.0 / 2015-04-28
 
 (*A selected roll-up of 0.17.0 pre-release changelogs*)
@@ -302,6 +313,8 @@ The initial release.
 [#156]: https://github.com/test-kitchen/kitchen-vagrant/issues/156
 [#157]: https://github.com/test-kitchen/kitchen-vagrant/issues/157
 [#158]: https://github.com/test-kitchen/kitchen-vagrant/issues/158
+[#161]: https://github.com/test-kitchen/kitchen-vagrant/issues/161
+[#166]: https://github.com/test-kitchen/kitchen-vagrant/issues/166
 [@Annih]: https://github.com/Annih
 [@Igorshp]: https://github.com/Igorshp
 [@RobertRehberg]: https://github.com/RobertRehberg
@@ -311,6 +324,7 @@ The initial release.
 [@antonio-osorio]: https://github.com/antonio-osorio
 [@arangamani]: https://github.com/arangamani
 [@ashb]: https://github.com/ashb
+[@atiniir]: https://github.com/atiniir
 [@bdclark]: https://github.com/bdclark
 [@bradleyd]: https://github.com/bradleyd
 [@byggztryng]: https://github.com/byggztryng

data/lib/kitchen/driver/vagrant.rb

@@ -93,7 +93,7 @@ module Kitchen
 
       # @return [String,nil] the Vagrant box for this Instance
       def default_box
-        if bento_boxes.include?(instance.platform.name)
+        if bento_box?(instance.platform.name)
           "opscode-#{instance.platform.name}"
         else
           instance.platform.name
@@ -102,7 +102,7 @@ module Kitchen
 
       # @return [String,nil] the Vagrant box URL for this Instance
       def default_box_url
-        return unless bento_boxes.include?(instance.platform.name)
+        return unless bento_box?(instance.platform.name)
 
         provider = config[:provider]
         provider = "vmware" if config[:provider] =~ /^vmware_(.+)$/
@@ -186,17 +186,15 @@ module Kitchen
         attr_accessor :vagrant_version
       end
 
-      # Retuns a list of Vagrant base boxes produced by the Bento project
+      # Retuns whether or not a platform name could have a correcponding Bento
+      # box produced by the Bento project.
       # (https://github.com/chef/bento).
       #
-      # @return [Arrau<String>] list of Bento box names
+      # @return [TrueClass,FalseClass] whether or not the name could be a Bento
+      #   box
       # @api private
-      def bento_boxes
-        %W[
-          centos-5.11 centos-6.6 centos-7.0 debian-6.0.10 debian-7.8 fedora-20
-          fedora-21 freebsd-9.3 freebsd-10.1 opensuse-13.1 ubuntu-10.04
-          ubuntu-12.04 ubuntu-14.04 ubuntu-14.10
-        ].map { |name| [name, "#{name}-i386"] }.flatten
+      def bento_box?(name)
+        name =~ /^(centos|debian|fedora|freebsd|opensuse|ubuntu)-/
       end
 
       # Renders and writes out a Vagrantfile dedicated to this instance.

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"
+    VAGRANT_VERSION = "0.18.0"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -79,42 +79,45 @@ describe Kitchen::Driver::Vagrant do
 
   describe "configuration" do
 
-    context "for known bento platform names" do
+    %W[centos debian fedora opensuse ubuntu].each do |name|
 
-      before { allow(platform).to receive(:name) { "ubuntu-14.04" } }
+      context "for known bento platform names starting with #{name}" do
 
-      it "sets :box based on the platform name by default" do
-        expect(driver[:box]).to eq("opscode-ubuntu-14.04")
-      end
+        before { allow(platform).to receive(:name) { "#{name}-99.04" } }
 
-      it "sets :box to a custom value" do
-        config[:box] = "booya"
+        it "sets :box based on the platform name by default" do
+          expect(driver[:box]).to eq("opscode-#{name}-99.04")
+        end
 
-        expect(driver[:box]).to eq("booya")
-      end
+        it "sets :box to a custom value" do
+          config[:box] = "booya"
 
-      it "sets :box_url to a bento box URL for a virtualbox provider" do
-        config[:provider] = "virtualbox"
+          expect(driver[:box]).to eq("booya")
+        end
 
-        expect(driver[:box_url]).to eq(
-          "https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/" \
-          "opscode_ubuntu-14.04_chef-provisionerless.box"
-        )
-      end
+        it "sets :box_url to a bento box URL for a virtualbox provider" do
+          config[:provider] = "virtualbox"
 
-      it "sets :box_url to a bento box URL for a vmware-based provider" do
-        config[:provider] = "vmware_awesometown"
+          expect(driver[:box_url]).to eq(
+            "https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/" \
+            "opscode_#{name}-99.04_chef-provisionerless.box"
+          )
+        end
 
-        expect(driver[:box_url]).to eq(
-          "https://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/" \
-          "opscode_ubuntu-14.04_chef-provisionerless.box"
-        )
-      end
+        it "sets :box_url to a bento box URL for a vmware-based provider" do
+          config[:provider] = "vmware_awesometown"
 
-      it "sets :box_url to nil for any other provider" do
-        config[:provider] = "the-next-coolness"
+          expect(driver[:box_url]).to eq(
+            "https://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/" \
+            "opscode_#{name}-99.04_chef-provisionerless.box"
+          )
+        end
 
-        expect(driver[:box_url]).to eq(nil)
+        it "sets :box_url to nil for any other provider" do
+          config[:provider] = "the-next-coolness"
+
+          expect(driver[:box_url]).to eq(nil)
+        end
       end
     end
 
@@ -935,6 +938,22 @@ describe Kitchen::Driver::Vagrant do
       expect(vagrantfile).to match(regexify(%{c.ssh.password = "okay"}))
     end
 
+    it "sets communicator.username if :communicator and :username are set" do
+      config[:communicator] = "wat"
+      config[:username] = "jdoe"
+      cmd
+
+      expect(vagrantfile).to match(regexify(%{c.wat.username = "jdoe"}))
+    end
+
+    it "sets communicator.password if :communicator and :password are set" do
+      config[:communicator] = "wat"
+      config[:password] = "okay"
+      cmd
+
+      expect(vagrantfile).to match(regexify(%{c.wat.password = "okay"}))
+    end
+
     it "sets no ssh.private_key_path if missing" do
       config[:ssh_key] = nil
       cmd

data/templates/Vagrantfile.erb

@@ -30,18 +30,33 @@ Vagrant.configure("2") do |c|
   c.vm.guest = "<%= config[:guest] %>"
 <% end %>
 
-<% if config[:username] %>
-  c.ssh.username = "<%= config[:username] %>"
-<% end %>
-<% if config[:password] %>
-  c.ssh.password = "<%= config[:password] %>"
+<% if config[:communicator] %>
+  <% if config[:username] %>
+    c.<%= config[:communicator] %>.username = "<%= config[:username] %>"
+  <% end %>
+  <% if config[:password] %>
+    c.<%= config[:communicator] %>.password = "<%= config[:password] %>"
+  <% end %>
+<% else %>
+  <% if config[:username] %>
+    c.ssh.username = "<%= config[:username] %>"
+  <% end %>
+  <% if config[:password] %>
+    c.ssh.password = "<%= config[:password] %>"
+  <% end %>
 <% end %>
+
 <% if config[:ssh_key] %>
   c.ssh.private_key_path = "<%= config[:ssh_key] %>"
 <% end %>
 <% config[:ssh].each do |key, value| %>
   c.ssh.<%= key %> = <%= value %>
 <% end %>
+<% if config[:winrm] %>
+  <% config[:winrm].each do |key, value| %>
+    c.winrm.<%= key %> = <%= value %>
+  <% end %>
+<% end %>
 
 <% Array(config[:network]).each do |opts| %>
   c.vm.network(:<%= opts[0] %>, <%= opts[1..-1].join(", ") %>)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen