diff --git a/lib/vagrant.rb b/lib/vagrant.rb index fbee248f8..e3b56fccd 100644 --- a/lib/vagrant.rb +++ b/lib/vagrant.rb @@ -3,7 +3,7 @@ PROJECT_ROOT = File.join(libdir, '..') unless defined?(PROJECT_ROOT) # The libs which must be loaded prior to the rest %w{tempfile open-uri json pathname logger uri net/http virtualbox net/ssh archive/tar/minitar - net/scp fileutils ostruct erb}.each do |lib| + net/scp fileutils}.each do |lib| require lib end diff --git a/lib/vagrant/commands.rb b/lib/vagrant/commands.rb index 23dc8264f..28f67c352 100644 --- a/lib/vagrant/commands.rb +++ b/lib/vagrant/commands.rb @@ -23,7 +23,7 @@ error # Copy over the rootfile template into this directory default_box ||= "base" File.open(rootfile_path, 'w+') do |f| - f.write(TemplateRenderer.render!(Env::ROOTFILE_NAME, :default_box => default_box)) + f.write(Util::TemplateRenderer.render!(Env::ROOTFILE_NAME, :default_box => default_box)) end end diff --git a/lib/vagrant/template_renderer.rb b/lib/vagrant/template_renderer.rb deleted file mode 100644 index f81ecef5b..000000000 --- a/lib/vagrant/template_renderer.rb +++ /dev/null @@ -1,51 +0,0 @@ -module Vagrant - # This class is used to render the ERB templates in the - # `GEM_ROOT/templates` directory. - class TemplateRenderer < OpenStruct - class < box) + Vagrant::Util::TemplateRenderer.expects(:render!).with(Vagrant::Env::ROOTFILE_NAME, :default_box => box) Vagrant::Commands.init(box) end should "use the default `base` if no box is given" do - Vagrant::TemplateRenderer.expects(:render!).with(Vagrant::Env::ROOTFILE_NAME, :default_box => "base") + Vagrant::Util::TemplateRenderer.expects(:render!).with(Vagrant::Env::ROOTFILE_NAME, :default_box => "base") Vagrant::Commands.init end end diff --git a/test/vagrant/template_renderer_test.rb b/test/vagrant/util/template_renderer_test.rb similarity index 70% rename from test/vagrant/template_renderer_test.rb rename to test/vagrant/util/template_renderer_test.rb index a9eb5a46a..963e33a02 100644 --- a/test/vagrant/template_renderer_test.rb +++ b/test/vagrant/util/template_renderer_test.rb @@ -1,14 +1,14 @@ -require File.join(File.dirname(__FILE__), '..', 'test_helper') +require File.join(File.dirname(__FILE__), '..', '..', 'test_helper') -class TemplateRendererTest < Test::Unit::TestCase +class TemplateRendererUtilTest < Test::Unit::TestCase context "initializing" do should "set the template to the given argument" do - r = Vagrant::TemplateRenderer.new("foo") + r = Vagrant::Util::TemplateRenderer.new("foo") assert_equal "foo", r.template end should "set any additional variables" do - r = Vagrant::TemplateRenderer.new("foo", {:bar => :baz}) + r = Vagrant::Util::TemplateRenderer.new("foo", {:bar => :baz}) assert_equal :baz, r.bar end end @@ -16,7 +16,7 @@ class TemplateRendererTest < Test::Unit::TestCase context "rendering" do setup do @template = "foo" - @r = Vagrant::TemplateRenderer.new(@template) + @r = Vagrant::Util::TemplateRenderer.new(@template) @r.stubs(:full_template_path).returns(@template + "!") @contents = "bar" @@ -58,7 +58,7 @@ class TemplateRendererTest < Test::Unit::TestCase context "the full template path" do setup do @template = "foo" - @r = Vagrant::TemplateRenderer.new(@template) + @r = Vagrant::Util::TemplateRenderer.new(@template) end should "be the ERB file in the templates directory" do @@ -70,28 +70,28 @@ class TemplateRendererTest < Test::Unit::TestCase context "class-level render! method" do setup do @template = "foo" - @r = Vagrant::TemplateRenderer.new(@template) + @r = Vagrant::Util::TemplateRenderer.new(@template) @r.stubs(:render) - Vagrant::TemplateRenderer.stubs(:new).with(@template, {}).returns(@r) + Vagrant::Util::TemplateRenderer.stubs(:new).with(@template, {}).returns(@r) end should "use the first argument as the template" do template = "foo" - Vagrant::TemplateRenderer.expects(:new).with(template, {}).returns(@r) - Vagrant::TemplateRenderer.render!(template) + Vagrant::Util::TemplateRenderer.expects(:new).with(template, {}).returns(@r) + Vagrant::Util::TemplateRenderer.render!(template) end should "send in additional argument to the renderer" do template = "foo" data = {:hey => :foo} - Vagrant::TemplateRenderer.expects(:new).with(template, data).returns(@r) - Vagrant::TemplateRenderer.render!(template, data) + Vagrant::Util::TemplateRenderer.expects(:new).with(template, data).returns(@r) + Vagrant::Util::TemplateRenderer.render!(template, data) end should "yield a block if given with the renderer as the argument" do @r.expects(:yielded=).with(true).once - Vagrant::TemplateRenderer.render!(@template) do |r| + Vagrant::Util::TemplateRenderer.render!(@template) do |r| r.yielded = true end end @@ -99,7 +99,7 @@ class TemplateRendererTest < Test::Unit::TestCase should "render the result" do result = mock('result') @r.expects(:render).returns(result) - assert_equal result, Vagrant::TemplateRenderer.render!(@template) + assert_equal result, Vagrant::Util::TemplateRenderer.render!(@template) end end end