Fix strange formatting from `vagrant init` [closes GH-142]

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## 0.5.3 (unreleased)
 
+  - Add erubis as a dependency since its rendering of `erb` is sane.
+  - Fixed poorly formatted Vagrantfile after `vagrant init`. [GH-142]
   - Fixed NFS not working properly with multiple NFS folders.
   - Fixed chef solo provision to work on Windows. It was expanding a linux
     path which prepended a drive letter onto it.

Gemfile.lock

@@ -10,6 +10,7 @@ PATH
   specs:
     vagrant (0.5.3.dev)
       archive-tar-minitar (= 0.5.2)
+      erubis (>= 2.6.6)
       json (>= 1.4.3)
       mario (~> 0.0.6)
       net-scp (>= 1.0.2)
@@ -19,8 +20,11 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
     archive-tar-minitar (0.5.2)
     contest (0.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     ffi (0.6.3)
       rake (>= 0.8.7)
     json (1.4.6)

lib/vagrant/util/template_renderer.rb

@@ -1,5 +1,5 @@
 require 'ostruct'
-require 'erb'
+require 'erubis'
 
 module Vagrant
   module Util
@@ -68,7 +68,7 @@ module Vagrant
       #
       # @return [String]
       def render_string
-        ERB.new(template, nil, "%<>-").result(binding)
+        Erubis::Eruby.new(template, :trim => true).result(binding)
       end
 
       # Returns the full path to the template, taking into accoun the gem directory

templates/Vagrantfile.erb

@@ -5,8 +5,8 @@ Vagrant::Config.run do |config|
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "<%= default_box %>"
-
   <% if !default_box_url.nil? -%>
+
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system
   config.vm.box_url = "<%= default_box_url %>"

vagrant.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency("json", ">= 1.4.3")
   s.add_dependency("archive-tar-minitar", "= 0.5.2")
   s.add_dependency("mario", "~> 0.0.6")
+  s.add_dependency("erubis", ">= 2.6.6")
 
   s.add_development_dependency("rake")
   s.add_development_dependency("contest", ">= 0.1.2")