Vagrantfile: disk check

Checking if virtual disk already exists when specifying createhd command. Updated unit-tests to replace regex check with substring check. Regex check was too permissive. This commit is based on PR #389

Signed-off-by: Vikram Karve <vikram.karve@progress.com>

spec/kitchen/driver/vagrant_spec.rb

@@ -1391,12 +1391,12 @@ def run_command(_cmd, options = {})
         }
         cmd
 
-        expect(vagrantfile).to match(Regexp.new(<<-RUBY.gsub(/^ {8}/, "").chomp))
-          c.vm.provider :virtualbox do |p|
-            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99-.*"
-            p.customize ["modifyvm", :id, "--audio", "none"]
-            p.customize ["createhd", "--filename", "./d1.vmdk", "--size", 10240]
-          end
+        expect(vagrantfile).to include(<<-RUBY.gsub(/^ {8}/, "").chomp)
+          unless File.file?("./d1.vmdk")
+        RUBY
+
+        expect(vagrantfile).to include(<<-RUBY.gsub(/^ {8}/, "").chomp)
+          p.customize ["createhd", "--filename", "./d1.vmdk", "--size", 10240]
         RUBY
       end
 
@@ -1415,13 +1415,20 @@ def run_command(_cmd, options = {})
         }
         cmd
 
-        expect(vagrantfile).to match(Regexp.new(<<-RUBY.gsub(/^ {8}/, "").chomp))
-          c.vm.provider :virtualbox do |p|
-            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99-.*"
-            p.customize ["modifyvm", :id, "--audio", "none"]
-            p.customize ["createhd", "--filename", "./d1.vmdk", "--size", 10240]
-            p.customize ["createhd", "--filename", "./d2.vmdk", "--size", 20480]
-          end
+        expect(vagrantfile).to include(<<-RUBY.gsub(/^ {8}/, "").chomp)
+          unless File.file?("./d1.vmdk")
+        RUBY
+
+        expect(vagrantfile).to include(<<-RUBY.gsub(/^ {8}/, "").chomp)
+          p.customize ["createhd", "--filename", "./d1.vmdk", "--size", 10240]
+        RUBY
+
+        expect(vagrantfile).to include(<<-RUBY.gsub(/^ {8}/, "").chomp)
+          unless File.file?("./d2.vmdk")
+        RUBY
+
+        expect(vagrantfile).to include(<<-RUBY.gsub(/^ {8}/, "").chomp)
+          p.customize ["createhd", "--filename", "./d2.vmdk", "--size", 20480]
         RUBY
       end
 

templates/Vagrantfile.erb

@@ -173,7 +173,9 @@ Vagrant.configure("2") do |c|
     <% if key == :createhd %>
       <% value = [value] unless value.instance_of?(Array) %>
       <% value.each do |item| %>
-    p.customize ["createhd", "--filename", "<%= item[:filename] %>", "--size", <%= item[:size] %>]
+    unless File.file?("<%= item[:filename] %>")
+      p.customize ["createhd", "--filename", "<%= item[:filename] %>", "--size", <%= item[:size] %>]
+    end
       <% end %>
     <% elsif key == :storageattach || key == :storagectl %>
       <% value = [value] unless value.instance_of?(Array) %>