vagrant 0.5.2 → 0.5.3

data/.gitignore

@@ -0,0 +1,10 @@
+pkg/*
+Vagrantfile
+.vagrant
+.bundle
+cookbooks/*
+_site/*
+!templates/*
+*.org
+.yardoc/
+doc/

data/CHANGELOG.md

@@ -0,0 +1,48 @@
+## 0.5.3 (August 23, 2010)
+
+  - 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.
+
+## 0.5.2 (August 3, 2010)
+
+  - `vagrant up` can be used as a way to resume the VM as well (same as
+    `vagrant resume`). [GH-134]
+  - Sudo uses "-E" flag to preserve environment for chef provisioners.
+    This fixes issues with CentOS. [GH-133]
+  - Added "IdentitiesOnly yes" to options when `vagrant ssh` is run to
+    avoid "Too Many Authentication Failures" error. [GH-131]
+  - Fix regression with `package` not working. [GH-132]
+  - Added ability to specify box url in `init`, which populates the
+    Vagrantfile with the proper `config.vm.box_url`.
+
+## 0.5.1 (July 31, 2010)
+
+  - Allow specifying cookbook paths which exist only on the VM in `config.chef.cookbooks_path`.
+    This is used for specifying cookbook paths when `config.chef.recipe_url` is used. [GH-130]
+    See updated chef solo documentation for more information on this.
+  - No longer show "Disabling host only networks..." if no host only networks
+    are destroyed. Quiets `destroy`, `halt`, etc output a bit.
+  - Updated getting started guide to be more up to date and generic. [GH-125]
+  - Fixed error with doing a `vagrant up` when no Vagrantfile existed. [GH-128]
+  - Fixed NFS erroring when NFS wasn't even enabled if `/etc/exports` doesn't
+    exist. [GH-126]
+  - Fixed `vagrant resume` to properly resume a suspended VM. [GH-122]
+  - Fixed `halt`, `destroy`, `reload` to where they failed if the VM was
+    in a saved state. [GH-123]
+  - Added `config.chef.recipe_url` which allows you to specify a URL to
+    a gzipped tar file for chef solo to download cookbooks. See the
+    [chef-solo docs](http://wiki.opscode.com/display/chef/Chef+Solo#ChefSolo-RunningfromaURL) for more information.
+    [GH-121]
+  - Added `vagrant box repackage` which repackages boxes which have
+    been added. This is useful in case you want to redistribute a base
+    box you have but may have lost the actual "box" file. [GH-120]
+
+## Previous
+
+The changelog began with version 0.5.1 so any changes prior to that
+can be seen by checking the tagged releases and reading git commit
+messages.
+

data/Gemfile

@@ -0,0 +1,16 @@
+source "http://rubygems.org"
+
+gem "vagrant", :path => '.'
+
+# Use the version of virtualbox off of github
+gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
+
+# Gems required for testing only. To install run
+# gem bundle test
+group :test do
+  gem "rake"
+  gem "contest", ">= 0.1.2"
+  gem "mocha"
+  gem "yard"
+  gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
+end

data/Gemfile.lock

@@ -0,0 +1,49 @@
+GIT
+  remote: git://github.com/mitchellh/virtualbox.git
+  revision: 69db76b
+  specs:
+    virtualbox (0.7.5)
+      ffi (>= 0.6.3)
+
+PATH
+  remote: .
+  specs:
+    vagrant (0.5.3)
+      archive-tar-minitar (= 0.5.2)
+      erubis (>= 2.6.6)
+      json (>= 1.4.3)
+      mario (~> 0.0.6)
+      net-scp (>= 1.0.2)
+      net-ssh (>= 2.0.19)
+      virtualbox (~> 0.7.3)
+
+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)
+    mario (0.0.6)
+    mocha (0.9.8)
+      rake
+    net-scp (1.0.3)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.0.23)
+    rake (0.8.7)
+    yard (0.5.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  contest (>= 0.1.2)
+  mocha
+  rake
+  vagrant!
+  virtualbox!
+  yard

data/README.md

@@ -48,9 +48,9 @@ and you're welcome to give it a shot. The following is an example showing how to
 ## Contributing to Vagrant
 
 To hack on vagrant, you'll need [bundler](http://github.com/carlhuda/bundler) which can
-be installed with a simple `gem install bundler`. Afterwords, do the following:
+be installed with a simple `gem install bundler --pre`. Afterwords, do the following:
 
     bundle install
-    bundle exec rake
+    rake
 
 This will run the test suite, which should come back all green! Then you're good to go!

data/Rakefile

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rake/testtask'
+Bundler::GemHelper.install_tasks
+
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = 'test/**/*_test.rb'
+end
+
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new do |t|
+    t.options = ['--main', 'README.md', '--markup', 'markdown']
+    t.options += ['--title', 'Vagrant Developer Documentation']
+  end
+rescue LoadError
+  puts "Yard not available. Install it with: gem install yard"
+  puts "if you wish to be able to generate developer documentation."
+end

data/lib/vagrant/provisioners/chef_solo.rb

@@ -64,7 +64,7 @@ module Vagrant
       end
 
       def folder_path(*args)
-        File.expand_path(args.join("-"), env.config.chef.provisioning_path)
+        File.join(env.config.chef.provisioning_path, args.join("-"))
       end
 
       def folders_path(folders, folder)

data/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

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/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 %>"

data/templates/nfs/exports.erb

@@ -1,3 +1,5 @@
 # VAGRANT-BEGIN: <%= uuid %>
-<% folders.each do |name, opts| %><%= opts[:hostpath] %> <%= ip %><% if opts[:map_uid] %> -mapall=<%= [opts[:map_uid],opts[:map_gid]].compact.join(":") %><% end %><% end %>
-# VAGRANT-END: <%= uuid %>
+<% folders.each do |name, opts| %>
+<%= opts[:hostpath] %> <%= ip %><% if opts[:map_uid] -%> -mapall=<%= [opts[:map_uid],opts[:map_gid]].compact.join(":") %><% end -%>
+<% end %>
+# VAGRANT-END: <%= uuid %>

data/test/test_helper.rb

@@ -0,0 +1,128 @@
+# ruby-debug, not necessary, but useful if we have it
+begin
+  require 'ruby-debug'
+rescue LoadError; end
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'vagrant')
+require 'contest'
+require 'mocha'
+
+# Add this folder to the load path for "test_helper"
+$:.unshift(File.dirname(__FILE__))
+
+class Test::Unit::TestCase
+  # Mocks an environment, setting it up with the given config.
+  def mock_environment
+    environment = Vagrant::Environment.new
+
+    Vagrant::Config.reset!(environment)
+
+    Vagrant::Config.run do |config|
+      config.vagrant.home = '~/.home'
+      config.vagrant.dotfile_name = ".vagrant"
+      config.vagrant.log_output = nil
+      config.vagrant.host = :detect
+
+      config.ssh.username = "foo"
+      config.ssh.host = "baz"
+      config.ssh.port = 22
+      config.ssh.forwarded_port_key = "ssh"
+      config.ssh.max_tries = 10
+      config.ssh.timeout = 10
+      config.ssh.private_key_path = '~/foo'
+
+      config.vm.box = "foo"
+      config.vm.box_url = nil
+      config.vm.box_ovf = "box.ovf"
+      config.vm.base_mac = "42"
+      config.vm.disk_image_format = 'VMDK'
+      config.vm.forward_port("ssh", 22, 2222)
+      config.vm.shared_folder_uid = nil
+      config.vm.shared_folder_gid = nil
+      config.vm.system = :linux
+      config.vm.share_folder("v-root", "/vagrant", ".")
+
+      config.package.name = 'package'
+
+      # Unison
+      config.unison.folder_suffix = ".sync"
+      config.unison.log_file = "foo-%s"
+
+      # Chef
+      config.chef.chef_server_url = "http://localhost:4000"
+      config.chef.validation_key_path = "validation.pem"
+      config.chef.client_key_path = "/zoo/foo/bar.pem"
+      config.chef.node_name = "baz"
+      config.chef.recipe_url = nil
+      config.chef.cookbooks_path = "cookbooks"
+      config.chef.provisioning_path = "/tmp/vagrant-chef"
+      config.chef.log_level = :info
+      config.chef.json = {
+        :recipes => ["vagrant_main"]
+      }
+    end
+
+    if block_given?
+      Vagrant::Config.run do |config|
+        yield config
+      end
+    end
+
+    config = Vagrant::Config.execute!
+
+    environment.instance_variable_set(:@config, config)
+
+    # Setup the logger. We create it then reset it so that subsequent
+    # calls will recreate it for us.
+    environment.load_logger!
+    environment.logger.class.reset_singleton_logger!
+    environment.logger.stubs(:flush_progress)
+    environment.logger.stubs(:cl_reset).returns("")
+
+    environment
+  end
+
+  # Sets up the mocks for a VM
+  def mock_vm(env=nil)
+    env ||= mock_environment
+    vm = Vagrant::VM.new
+    vm.stubs(:env).returns(env)
+    vm.stubs(:ssh).returns(Vagrant::SSH.new(vm.env))
+    vm
+  end
+
+  def mock_action_data
+    app = lambda { |env| }
+    env = Vagrant::Action::Environment.new(mock_environment)
+    env["vagrant.test"] = true
+    [app, env]
+  end
+
+  # Returns a resource logger which is safe for tests
+  def quiet_logger(resource, env=nil)
+    logger = Vagrant::ResourceLogger.new(resource, env)
+    logger.stubs(:flush_progress)
+    logger.stubs(:cl_reset).returns("")
+    logger
+  end
+
+  # Returns a linux system
+  def linux_system(vm)
+    Vagrant::Systems::Linux.new(vm)
+  end
+
+  def stub_default_action_dependecies(mock)
+    mock.stubs(:precedes).returns([])
+    mock.stubs(:follows).returns([])
+  end
+
+  # Sets up the mocks and stubs for a downloader
+  def mock_downloader(downloader_klass)
+    tempfile = mock("tempfile")
+    tempfile.stubs(:write)
+
+    _, env = mock_action_data
+    [downloader_klass.new(env), tempfile]
+  end
+end
+

data/test/vagrant/action/box/destroy_test.rb

@@ -0,0 +1,30 @@
+require "test_helper"
+
+class DestroyBoxActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::Box::Destroy
+    @app, @env = mock_action_data
+
+    @vm = mock("vm")
+    @env["vm"] = @vm
+    @env["box"] = Vagrant::Box.new(mock_environment, "foo")
+
+    @internal_vm = mock("internal")
+    @vm.stubs(:vm).returns(@internal_vm)
+
+    @instance = @klass.new(@app, @env)
+  end
+
+  context "calling" do
+    setup do
+      @env.logger.stubs(:info)
+    end
+
+    should "delete the box directory" do
+      seq = sequence("seq")
+      FileUtils.expects(:rm_rf).with(@env["box"].directory).in_sequence(seq)
+      @app.expects(:call).with(@env).once.in_sequence(seq)
+      @instance.call(@env)
+    end
+  end
+end

data/test/vagrant/action/box/download_test.rb

@@ -0,0 +1,141 @@
+require "test_helper"
+
+class DownloadBoxActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::Box::Download
+    @app, @env = mock_action_data
+
+    @vm = mock("vm")
+    @env["vm"] = @vm
+    @env["box"] = Vagrant::Box.new(mock_environment, "foo")
+    @env["box"].uri = "http://google.com"
+
+    @internal_vm = mock("internal")
+    @vm.stubs(:vm).returns(@internal_vm)
+  end
+
+  context "initializing" do
+    should "initialize download classes" do
+      @klass.new(@app, @env)
+      assert_equal [Vagrant::Downloaders::HTTP, Vagrant::Downloaders::File], @env["download.classes"]
+    end
+  end
+
+  context "with an instance" do
+    setup do
+      @instance = @klass.new(@app, @env)
+    end
+
+    context "calling" do
+      should "call the proper methods in sequence" do
+        seq = sequence("seq")
+        @instance.expects(:instantiate_downloader).in_sequence(seq).returns(true)
+        @instance.expects(:download).in_sequence(seq)
+        @app.expects(:call).with(@env).in_sequence(seq)
+        @instance.expects(:cleanup).in_sequence(seq)
+        @instance.call(@env)
+      end
+
+      should "halt the chain if downloader instantiation fails" do
+        seq = sequence("seq")
+        @env.error!(:foo)
+        @instance.expects(:instantiate_downloader).in_sequence(seq).returns(false)
+        @instance.expects(:download).never
+        @app.expects(:call).with(@env).never
+        @instance.expects(:cleanup).never
+        @instance.call(@env)
+      end
+    end
+
+    context "instantiating downloader" do
+      should "instantiate the proper class" do
+        instance = mock("instance")
+        Vagrant::Downloaders::HTTP.expects(:new).with(@env).returns(instance)
+        instance.expects(:prepare).with(@env["box"].uri).once
+        assert @instance.instantiate_downloader
+      end
+
+      should "error environment if URI is invalid for any downloaders" do
+        @env["box"].uri = "foobar"
+        assert !@instance.instantiate_downloader
+        assert @env.error?
+        assert_equal :box_download_unknown_type, @env.error.first
+      end
+    end
+
+    context "downloading" do
+      setup do
+        @path = "foo"
+
+        @tempfile = mock("tempfile")
+        @tempfile.stubs(:path).returns(@path)
+
+        @instance.stubs(:with_tempfile).yields(@tempfile)
+        @instance.stubs(:download_to)
+      end
+
+      should "make a tempfile and copy the URI contents to it" do
+        @instance.expects(:with_tempfile).yields(@tempfile)
+        @instance.expects(:download_to).with(@tempfile)
+        @instance.download
+      end
+
+      should "save the tempfile path" do
+        @instance.download
+        assert @env.has_key?("download.temp_path")
+        assert_equal @tempfile.path, @env["download.temp_path"]
+        assert_equal @tempfile.path, @instance.temp_path
+      end
+    end
+
+    context "tempfile" do
+      should "create a tempfile in the vagrant tmp directory" do
+        File.expects(:open).with { |name, bitmask|
+          name =~ /#{Vagrant::Action::Box::Download::BASENAME}/ &&  name =~ /#{@env.env.tmp_path}/
+        }.once
+        @instance.with_tempfile
+      end
+
+      should "yield the tempfile object" do
+        @tempfile = mock("tempfile")
+        File.expects(:open).yields(@tempfile)
+
+        @instance.with_tempfile do |otherfile|
+          assert @tempfile.equal?(otherfile)
+        end
+      end
+    end
+
+    context "cleaning up" do
+      setup do
+        @temp_path = "foo"
+        @instance.stubs(:temp_path).returns(@temp_path)
+        File.stubs(:exist?).returns(true)
+      end
+
+      should "delete the temporary file if it exists" do
+        File.expects(:unlink).with(@temp_path).once
+        @instance.cleanup
+      end
+
+      should "not delete anything if it doesn't exist" do
+        File.stubs(:exist?).returns(false)
+        File.expects(:unlink).never
+        @instance.cleanup
+      end
+    end
+
+    context "downloading to" do
+      setup do
+        @downloader = mock("downloader")
+        @instance.instance_variable_set(:@downloader, @downloader)
+      end
+
+      should "call download! on the download with the URI and tempfile" do
+        tempfile = "foo"
+        @downloader.expects(:download!).with(@env["box"].uri, tempfile)
+        @instance.download_to(tempfile)
+      end
+    end
+  end
+end