generator_files/Vagrantfile.erb in berkshelf-3.1.5 vs generator_files/Vagrantfile.erb in berkshelf-3.2.0

@@ -1,46 +1,46 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
+VAGRANTFILE_API_VERSION = '2'
 
-Vagrant.require_version ">= 1.5.0"
+Vagrant.require_version '>= 1.5.0'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
 
-  config.vm.hostname = "<%= "#{cookbook_name.gsub('_','-')}-berkshelf" %>"
+  config.vm.hostname = '<%= "#{cookbook_name.gsub('_','-')}-berkshelf" %>'
 
   # Set the version of chef to install using the vagrant-omnibus plugin
-<% if berkshelf_config.vagrant.omnibus.enabled -%>
-<% if berkshelf_config.vagrant.omnibus.version == "latest" -%>
-  config.omnibus.chef_version = :latest
-<% else %>
-  config.omnibus.chef_version = "<%= berkshelf_config.vagrant.omnibus.version %>"
-<% end -%>
-<% else %>
-  #config.omnibus.chef_version = :latest
-<% end -%>
+  # NOTE: You will need to install the vagrant-omnibus plugin:
+  #
+  #   $ vagrant plugin install vagrant-omnibus
+  #
+  if Vagrant.has_plugin?
+    config.omnibus.chef_version = '<%= berkshelf_config.vagrant.omnibus.version %>'
+  end
 
   # Every Vagrant virtual environment requires a box to build off of.
-  # If this value is a shorthand to a box in Vagrant Cloud then 
+  # If this value is a shorthand to a box in Vagrant Cloud then
   # config.vm.box_url doesn't need to be specified.
-  config.vm.box = "<%= berkshelf_config.vagrant.vm.box %>"
+  config.vm.box = '<%= berkshelf_config.vagrant.vm.box %>'
 
+<% unless berkshelf_config.vagrant.vm.box_url.nil? -%>
   # The url from where the 'config.vm.box' box will be fetched if it
-  # is not a Vagrant Cloud box and if it doesn't already exist on the 
+  # is not a Vagrant Cloud box and if it doesn't already exist on the
   # user's system.
-  # config.vm.box_url = "<%= berkshelf_config.vagrant.vm.box_url %>"
+  config.vm.box_url = '<%= berkshelf_config.vagrant.vm.box_url %>'
+<% end -%>
 
   # Assign this VM to a host-only network IP, allowing you to access it
   # via the IP. Host-only networks can talk to the host machine as well as
   # any other machines on the same network, but cannot be accessed (through this
   # network interface) by any external networks.
-  config.vm.network :private_network, type: "dhcp"
+  config.vm.network :private_network, type: 'dhcp'
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
 <% berkshelf_config.vagrant.vm.forward_port.each do |guest, host| %>
@@ -81,37 +81,37 @@
 
   # An array of symbols representing groups of cookbook described in the Vagrantfile
   # to skip installing and copying to Vagrant's shelf.
   # config.berkshelf.except = []
 
-<% if berkshelf_config.vagrant.vm.provision == "chef_client" -%>
+<% if berkshelf_config.vagrant.vm.provision == 'chef_client' -%>
   config.vm.provision :chef_client do |chef|
-    chef.chef_server_url        = "<%= berkshelf_config.chef.chef_server_url %>"
-    chef.validation_client_name = "<%= berkshelf_config.chef.validation_client_name %>"
-    chef.validation_key_path    = "<%= berkshelf_config.chef.validation_key_path %>"
+    chef.chef_server_url        = '<%= berkshelf_config.chef.chef_server_url %>'
+    chef.validation_client_name = '<%= berkshelf_config.chef.validation_client_name %>'
+    chef.validation_key_path    = '<%= berkshelf_config.chef.validation_key_path %>'
 
     chef.run_list = [
-  <% if options[:chef_minitest] -%>
-      "recipe[minitest-handler::default]",
-  <% end -%>
-      "recipe[<%= cookbook_name %>::default]"
+<% if options[:chef_minitest] %>
+      'recipe[minitest-handler::default]',
+<% end -%>
+      'recipe[<%= cookbook_name %>::default]'
     ]
   end
-<% elsif berkshelf_config.vagrant.vm.provision == "chef_solo" -%>
+<% elsif berkshelf_config.vagrant.vm.provision == 'chef_solo' -%>
   config.vm.provision :chef_solo do |chef|
     chef.json = {
       mysql: {
         server_root_password: 'rootpass',
         server_debian_password: 'debpass',
         server_repl_password: 'replpass'
       }
     }
 
     chef.run_list = [
-  <% if options[:chef_minitest] -%>
-      "recipe[minitest-handler::default]",
-  <% end -%>
-      "recipe[<%= cookbook_name %>::default]"
+<% if options[:chef_minitest] %>
+      'recipe[minitest-handler::default]',
+<% end -%>
+      'recipe[<%= cookbook_name %>::default]'
     ]
   end
 <% end -%>
 end